Merge branch 'mergelibs12' into main

844 files changed, 19854 insertions, 94238 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 2de1678d8dd..668b5e1af79 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -54,7 +54,7 @@ elsewhen ($PIE == "yes") {
 }
 
 when ($CLANG16 == "yes") {
-    CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-int -Wno-address-of-packed-member
+    CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-address-of-packed-member
 }
 
 when ($MSAN_TRACK_ORIGIN == "yes") {
@@ -88,7 +88,7 @@ when ($NO_WSHADOW == "yes") {
 #
 # Use -Wno-everything to force warning suppression.
 when ($NO_COMPILER_WARNINGS == "yes") {
-    C_WARNING_OPTS = -w
+    C_WARNING_OPTS = -Wno-everything
     CXX_WARNING_OPTS = -Wno-everything
 }
 when ($NO_OPTIMIZE == "yes") {
diff --git a/build/conf/java.conf b/build/conf/java.conf
index 94e5835ab5f..11b1ec6a39b 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1564,9 +1564,9 @@ UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS=
 ### Transform manifest.mf for UBERJAR() java programs, set attribute
 ###
 ### @see: [UBERJAR](#macro_UBERJAR)
-macro UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE(Key, Value) {
-    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_VALUE $ARGS_DELIM $Key : $Value)
-    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS --manifest-attribute ${Key}:${Value})
+macro UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE(Key, Values...) {
+    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_VALUE $ARGS_DELIM $Key : $Values)
+    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS --manifest-attribute ${Key}:'${Values}')
 }
 
 # tag:java-specific
diff --git a/build/export_generators/hardcoded-cmake/cmake/common.cmake b/build/export_generators/hardcoded-cmake/cmake/common.cmake
index f85875ec405..98313341a5b 100644
--- a/build/export_generators/hardcoded-cmake/cmake/common.cmake
+++ b/build/export_generators/hardcoded-cmake/cmake/common.cmake
@@ -103,7 +103,7 @@ endfunction()
 
 function(generate_enum_serilization Tgt Input)
   set(opts "")
-  set(oneval_args INCLUDE_HEADERS)
+  set(oneval_args INCLUDE_HEADERS GEN_HEADER)
   set(multival_args "")
   cmake_parse_arguments(ENUM_SERIALIZATION_ARGS
     "${opts}"
@@ -116,7 +116,7 @@ function(generate_enum_serilization Tgt Input)
 
   get_filename_component(BaseName ${Input} NAME)
   add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp ${ENUM_SERIALIZATION_ARGS_GEN_HEADER}
     COMMAND
       ${enum_parser_bin}
       ${Input}
@@ -124,6 +124,9 @@ function(generate_enum_serilization Tgt Input)
       --output ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp
     DEPENDS ${Input} ${enum_parser_dependency}
   )
+  if (ENUM_SERIALIZATION_ARGS_GEN_HEADER)
+    set_property(SOURCE ${ENUM_SERIALIZATION_ARGS_GEN_HEADER} PROPERTY GENERATED On)
+  endif()
   target_sources(${Tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp)
 endfunction()
 
diff --git a/build/export_generators/hardcoded-cmake/cmake/conan.cmake b/build/export_generators/hardcoded-cmake/cmake/conan.cmake
index 9a5dee5d813..a8e812acbd1 100644
--- a/build/export_generators/hardcoded-cmake/cmake/conan.cmake
+++ b/build/export_generators/hardcoded-cmake/cmake/conan.cmake
@@ -92,10 +92,12 @@ macro(_conan_check_system_name)
         set(CONAN_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
         if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
             set(CONAN_SYSTEM_NAME Macos)
+            message(STATUS "CMake-Conan: cmake_osx_deployment_target=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            set(_CONAN_SETTING_OS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
         endif()
         if(${CMAKE_SYSTEM_NAME} STREQUAL "QNX")
             set(CONAN_SYSTEM_NAME Neutrino)
-        endif()        
+        endif()
         set(CONAN_SUPPORTED_PLATFORMS Windows Linux Macos Android iOS FreeBSD WindowsStore WindowsCE watchOS tvOS FreeBSD SunOS AIX Arduino Emscripten Neutrino)
         list (FIND CONAN_SUPPORTED_PLATFORMS "${CONAN_SYSTEM_NAME}" _index)
         if (${_index} GREATER -1)
@@ -279,7 +281,7 @@ function(conan_cmake_settings result)
     endforeach()
 
     if(NOT _SETTINGS OR ARGUMENTS_PROFILE_AUTO STREQUAL "ALL")
-        set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
+        set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version
                                    compiler.runtime compiler.libcxx compiler.toolset)
     endif()
 
@@ -288,7 +290,7 @@ function(conan_cmake_settings result)
         string(REGEX MATCH "[^=]*" MANUAL_SETTING "${ARG}")
         message(STATUS "Conan: ${MANUAL_SETTING} was added as an argument. Not using the autodetected one.")
         list(REMOVE_ITEM ARGUMENTS_PROFILE_AUTO "${MANUAL_SETTING}")
-    endforeach()    
+    endforeach()
 
     # Automatic from CMake
     foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
@@ -407,7 +409,7 @@ function(conan_cmake_detect_vs_runtime result)
         string(TOUPPER "${build_type}" build_type)
     endif()
 
-    if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) 
+    if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
         if(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreaded)
             set(${result} "MT" PARENT_SCOPE)
         elseif(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreadedDebug)
@@ -455,7 +457,7 @@ function(conan_cmake_detect_vs_runtime result)
 endfunction()
 
 function(_collect_settings result)
-    set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
+    set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version
                             compiler.runtime compiler.libcxx compiler.toolset
                             compiler.cppstd)
     foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
@@ -649,12 +651,12 @@ function(conan_cmake_install)
         set(NO_IMPORTS --no-imports)
     endif()
     set(install_args install ${PATH_OR_REFERENCE} ${REFERENCE} ${UPDATE} ${NO_IMPORTS} ${REMOTE} ${LOCKFILE} ${LOCKFILE_OUT} ${LOCKFILE_NODE_ID} ${INSTALL_FOLDER}
-                                ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD} 
+                                ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD}
                                 ${PROFILE} ${PROFILE_HOST} ${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD} ${CONF})
 
     string(REPLACE ";" " " _install_args "${install_args}")
     message(STATUS "Conan executing: ${CONAN_CMD} ${_install_args}")
-    
+
     if(ARGS_OUTPUT_QUIET)
       set(OUTPUT_OPT OUTPUT_QUIET)
     endif()
@@ -771,7 +773,7 @@ endmacro()
 
 macro(conan_cmake_run)
     conan_parse_arguments(${ARGV})
-    
+
     if(ARGUMENTS_CONFIGURATION_TYPES AND NOT CMAKE_CONFIGURATION_TYPES)
         message(WARNING "CONFIGURATION_TYPES should only be specified for multi-configuration generators")
     elseif(ARGUMENTS_CONFIGURATION_TYPES AND ARGUMENTS_BUILD_TYPE)
@@ -849,7 +851,7 @@ macro(conan_check)
     if(NOT "${return_code}" STREQUAL "0")
       message(FATAL_ERROR "Conan --version failed='${return_code}'")
     endif()
-              
+
     if(NOT CONAN_DETECT_QUIET)
         string(STRIP "${CONAN_VERSION_OUTPUT}" _CONAN_VERSION_OUTPUT)
         message(STATUS "Conan: Version found ${_CONAN_VERSION_OUTPUT}")
diff --git a/build/export_generators/hardcoded-cmake/cmake/global_flags.compiler.gnu.march.cmake b/build/export_generators/hardcoded-cmake/cmake/global_flags.compiler.gnu.march.cmake
index a81af88c707..a9c619efc67 100644
--- a/build/export_generators/hardcoded-cmake/cmake/global_flags.compiler.gnu.march.cmake
+++ b/build/export_generators/hardcoded-cmake/cmake/global_flags.compiler.gnu.march.cmake
@@ -29,6 +29,13 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i686|x86_64|AMD64)$")
   if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     string(APPEND _GNU_MARCH_C_CXX_FLAGS " -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE")
   endif()
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
+  if (CMAKE_SYSTEM_NAME MATCHES "^(Darwin|Linux)$")
+    # Clang 13+ generates outline atomics by default if '-rtlib=compiler_rt' is specified or system's
+    # libgcc version is >= 9.3.1 : https://github.com/llvm/llvm-project/commit/c5e7e649d537067dec7111f3de1430d0fc8a4d11
+    # Disable this behaviour because our build links with contrib/libs/cxxsupp/builtins that does not contain outline atomics yet
+    string(APPEND _GNU_MARCH_C_CXX_FLAGS " -mno-outline-atomics")
+  endif()
 elseif (ANDROID AND (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a"))
   string(APPEND _GNU_MARCH_C_CXX_FLAGS " -mfloat-abi=softfp")
 endif()
diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index 1b4e5fc087b..71377438c0b 100644
--- a/build/external_resources/ymake/public.resources.json
+++ b/build/external_resources/ymake/public.resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:5690811210"
+            "uri": "sbr:5731297588"
         },
         "darwin-arm64": {
-            "uri": "sbr:5690798649"
+            "uri": "sbr:5731298012"
         },
         "linux": {
-            "uri": "sbr:5690801853"
+            "uri": "sbr:5731298871"
         },
         "linux-aarch64": {
-            "uri": "sbr:5690800663"
+            "uri": "sbr:5731297073"
         },
         "win32-clang-cl": {
-            "uri": "sbr:5690801745"
+            "uri": "sbr:5731299437"
         }
     }
 }
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index 291af7a1cf4..beaed0393ab 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:5690784885"
+            "uri": "sbr:5731292752"
         },
         "darwin-arm64": {
-            "uri": "sbr:5690783084"
+            "uri": "sbr:5731292924"
         },
         "linux": {
-            "uri": "sbr:5690790317"
+            "uri": "sbr:5731294947"
         },
         "linux-aarch64": {
-            "uri": "sbr:5690793726"
+            "uri": "sbr:5731296385"
         },
         "win32-clang-cl": {
-            "uri": "sbr:5690795911"
+            "uri": "sbr:5731295134"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index d931e3d12a5..af9b5b22970 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -178,6 +178,7 @@
         "5622651213": "https://devtools-registry.s3.yandex.net/5622651213",
         "5647706426": "https://devtools-registry.s3.yandex.net/5647706426",
         "5690811210": "https://devtools-registry.s3.yandex.net/5690811210",
+        "5731297588": "https://devtools-registry.s3.yandex.net/5731297588",
         "5476891477": "https://devtools-registry.s3.yandex.net/5476891477",
         "5509369518": "https://devtools-registry.s3.yandex.net/5509369518",
         "5550838146": "https://devtools-registry.s3.yandex.net/5550838146",
@@ -185,6 +186,7 @@
         "5622657921": "https://devtools-registry.s3.yandex.net/5622657921",
         "5647706238": "https://devtools-registry.s3.yandex.net/5647706238",
         "5690798649": "https://devtools-registry.s3.yandex.net/5690798649",
+        "5731298012": "https://devtools-registry.s3.yandex.net/5731298012",
         "5476896849": "https://devtools-registry.s3.yandex.net/5476896849",
         "5509364024": "https://devtools-registry.s3.yandex.net/5509364024",
         "5550826871": "https://devtools-registry.s3.yandex.net/5550826871",
@@ -192,6 +194,7 @@
         "5622653964": "https://devtools-registry.s3.yandex.net/5622653964",
         "5647708831": "https://devtools-registry.s3.yandex.net/5647708831",
         "5690801853": "https://devtools-registry.s3.yandex.net/5690801853",
+        "5731298871": "https://devtools-registry.s3.yandex.net/5731298871",
         "5476895322": "https://devtools-registry.s3.yandex.net/5476895322",
         "5509360013": "https://devtools-registry.s3.yandex.net/5509360013",
         "5550843115": "https://devtools-registry.s3.yandex.net/5550843115",
@@ -199,6 +202,7 @@
         "5622652638": "https://devtools-registry.s3.yandex.net/5622652638",
         "5647716154": "https://devtools-registry.s3.yandex.net/5647716154",
         "5690800663": "https://devtools-registry.s3.yandex.net/5690800663",
+        "5731297073": "https://devtools-registry.s3.yandex.net/5731297073",
         "5476896707": "https://devtools-registry.s3.yandex.net/5476896707",
         "5509388614": "https://devtools-registry.s3.yandex.net/5509388614",
         "5550838970": "https://devtools-registry.s3.yandex.net/5550838970",
@@ -206,6 +210,7 @@
         "5622653810": "https://devtools-registry.s3.yandex.net/5622653810",
         "5647712429": "https://devtools-registry.s3.yandex.net/5647712429",
         "5690801745": "https://devtools-registry.s3.yandex.net/5690801745",
+        "5731299437": "https://devtools-registry.s3.yandex.net/5731299437",
         "2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
         "5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
     },
@@ -387,6 +392,7 @@
         "5622651213": "ymake for darwin",
         "5647706426": "ymake for darwin",
         "5690811210": "ymake for darwin",
+        "5731297588": "ymake for darwin",
         "5476891477": "ymake for darwin-arm64",
         "5509369518": "ymake for darwin-arm64",
         "5550838146": "ymake for darwin-arm64",
@@ -394,6 +400,7 @@
         "5622657921": "ymake for darwin-arm64",
         "5647706238": "ymake for darwin-arm64",
         "5690798649": "ymake for darwin-arm64",
+        "5731298012": "ymake for darwin-arm64",
         "5476896849": "ymake for linux",
         "5509364024": "ymake for linux",
         "5550826871": "ymake for linux",
@@ -401,6 +408,7 @@
         "5622653964": "ymake for linux",
         "5647708831": "ymake for linux",
         "5690801853": "ymake for linux",
+        "5731298871": "ymake for linux",
         "5476895322": "ymake for linux-aarch64",
         "5509360013": "ymake for linux-aarch64",
         "5550843115": "ymake for linux-aarch64",
@@ -408,6 +416,7 @@
         "5622652638": "ymake for linux-aarch64",
         "5647716154": "ymake for linux-aarch64",
         "5690800663": "ymake for linux-aarch64",
+        "5731297073": "ymake for linux-aarch64",
         "5476896707": "ymake.exe for win32-clang-cl",
         "5509388614": "ymake.exe for win32-clang-cl",
         "5550838970": "ymake.exe for win32-clang-cl",
@@ -415,6 +424,7 @@
         "5622653810": "ymake.exe for win32-clang-cl",
         "5647712429": "ymake.exe for win32-clang-cl",
         "5690801745": "ymake.exe for win32-clang-cl",
+        "5731299437": "ymake.exe for win32-clang-cl",
         "2980468199": "ytexec for linux",
         "5562224408": "ytexec for linux"
     },
diff --git a/build/scripts/link_exe.py b/build/scripts/link_exe.py
index 980ac05d7e6..4650315b89b 100644
--- a/build/scripts/link_exe.py
+++ b/build/scripts/link_exe.py
@@ -52,6 +52,11 @@ def prune_cuda_libraries(cmd, prune_arches, nvprune_exe, build_root):
         _, ver = arch.split('_', 1)
         return 'compute_{}'.format(ver)
 
+    libs_to_prune = set(CUDA_LIBRARIES)
+
+    # does not contain device code, nothing to prune
+    libs_to_prune.remove('-lcudart_static')
+
     tmp_names_gen = name_generator('cuda_pruned_libs')
 
     arch_args = []
@@ -62,10 +67,10 @@ def prune_cuda_libraries(cmd, prune_arches, nvprune_exe, build_root):
     flags = []
     cuda_deps = set()
     for flag in reversed(cmd):
-        if flag in CUDA_LIBRARIES:
+        if flag in libs_to_prune:
             cuda_deps.add('lib' + flag[2:] + '.a')
             flag += '_pruned'
-        elif flag.startswith('-L') and any(f in cuda_deps for f in os.listdir(flag[2:])):
+        elif flag.startswith('-L') and os.path.exists(flag[2:]) and os.path.isdir(flag[2:]) and any(f in cuda_deps for f in os.listdir(flag[2:])):
             from_dirpath = flag[2:]
             from_deps = list(cuda_deps & set(os.listdir(from_dirpath)))
 
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index c0c2a070f50..0cbf22b6a0a 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1166,7 +1166,8 @@ CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:
                 && target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE \
                 && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
                 && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
-                && target_compile_options PRIVATE $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW
+                && target_compile_options PRIVATE $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW \
+                && target_sources PRIVATE ${MODULE_EXPLICIT_HEADERS}
 ### @usage: PROGRAM([progname])
 ###
 ### Regular program module.
@@ -1778,7 +1779,8 @@ CPP_LIBRARY_SEM=add_library ${MODDIR} $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:A
                 && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
                 && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW \
                 && target_link_options INTERFACE $LDFLAGS_GLOBAL_RAW \
-                && add_language C && add_language CXX
+                && add_language C && add_language CXX \
+                && target_sources PRIVATE ${MODULE_EXPLICIT_HEADERS}
 CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:CMAKE_TARGET_NAME} $CMAKE_TARGET_NAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
                 && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
                 && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
diff --git a/cmake/common.cmake b/cmake/common.cmake
index f85875ec405..98313341a5b 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -103,7 +103,7 @@ endfunction()
 
 function(generate_enum_serilization Tgt Input)
   set(opts "")
-  set(oneval_args INCLUDE_HEADERS)
+  set(oneval_args INCLUDE_HEADERS GEN_HEADER)
   set(multival_args "")
   cmake_parse_arguments(ENUM_SERIALIZATION_ARGS
     "${opts}"
@@ -116,7 +116,7 @@ function(generate_enum_serilization Tgt Input)
 
   get_filename_component(BaseName ${Input} NAME)
   add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp ${ENUM_SERIALIZATION_ARGS_GEN_HEADER}
     COMMAND
       ${enum_parser_bin}
       ${Input}
@@ -124,6 +124,9 @@ function(generate_enum_serilization Tgt Input)
       --output ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp
     DEPENDS ${Input} ${enum_parser_dependency}
   )
+  if (ENUM_SERIALIZATION_ARGS_GEN_HEADER)
+    set_property(SOURCE ${ENUM_SERIALIZATION_ARGS_GEN_HEADER} PROPERTY GENERATED On)
+  endif()
   target_sources(${Tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${BaseName}_serialized.cpp)
 endfunction()
 
diff --git a/cmake/conan.cmake b/cmake/conan.cmake
index 9a5dee5d813..a8e812acbd1 100644
--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
@@ -92,10 +92,12 @@ macro(_conan_check_system_name)
         set(CONAN_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
         if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
             set(CONAN_SYSTEM_NAME Macos)
+            message(STATUS "CMake-Conan: cmake_osx_deployment_target=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            set(_CONAN_SETTING_OS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
         endif()
         if(${CMAKE_SYSTEM_NAME} STREQUAL "QNX")
             set(CONAN_SYSTEM_NAME Neutrino)
-        endif()        
+        endif()
         set(CONAN_SUPPORTED_PLATFORMS Windows Linux Macos Android iOS FreeBSD WindowsStore WindowsCE watchOS tvOS FreeBSD SunOS AIX Arduino Emscripten Neutrino)
         list (FIND CONAN_SUPPORTED_PLATFORMS "${CONAN_SYSTEM_NAME}" _index)
         if (${_index} GREATER -1)
@@ -279,7 +281,7 @@ function(conan_cmake_settings result)
     endforeach()
 
     if(NOT _SETTINGS OR ARGUMENTS_PROFILE_AUTO STREQUAL "ALL")
-        set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
+        set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version
                                    compiler.runtime compiler.libcxx compiler.toolset)
     endif()
 
@@ -288,7 +290,7 @@ function(conan_cmake_settings result)
         string(REGEX MATCH "[^=]*" MANUAL_SETTING "${ARG}")
         message(STATUS "Conan: ${MANUAL_SETTING} was added as an argument. Not using the autodetected one.")
         list(REMOVE_ITEM ARGUMENTS_PROFILE_AUTO "${MANUAL_SETTING}")
-    endforeach()    
+    endforeach()
 
     # Automatic from CMake
     foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
@@ -407,7 +409,7 @@ function(conan_cmake_detect_vs_runtime result)
         string(TOUPPER "${build_type}" build_type)
     endif()
 
-    if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) 
+    if (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
         if(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreaded)
             set(${result} "MT" PARENT_SCOPE)
         elseif(${CMAKE_MSVC_RUNTIME_LIBRARY} STREQUAL MultiThreadedDebug)
@@ -455,7 +457,7 @@ function(conan_cmake_detect_vs_runtime result)
 endfunction()
 
 function(_collect_settings result)
-    set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
+    set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version
                             compiler.runtime compiler.libcxx compiler.toolset
                             compiler.cppstd)
     foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
@@ -649,12 +651,12 @@ function(conan_cmake_install)
         set(NO_IMPORTS --no-imports)
     endif()
     set(install_args install ${PATH_OR_REFERENCE} ${REFERENCE} ${UPDATE} ${NO_IMPORTS} ${REMOTE} ${LOCKFILE} ${LOCKFILE_OUT} ${LOCKFILE_NODE_ID} ${INSTALL_FOLDER}
-                                ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD} 
+                                ${GENERATOR} ${BUILD} ${ENV} ${ENV_HOST} ${ENV_BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD}
                                 ${PROFILE} ${PROFILE_HOST} ${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD} ${CONF})
 
     string(REPLACE ";" " " _install_args "${install_args}")
     message(STATUS "Conan executing: ${CONAN_CMD} ${_install_args}")
-    
+
     if(ARGS_OUTPUT_QUIET)
       set(OUTPUT_OPT OUTPUT_QUIET)
     endif()
@@ -771,7 +773,7 @@ endmacro()
 
 macro(conan_cmake_run)
     conan_parse_arguments(${ARGV})
-    
+
     if(ARGUMENTS_CONFIGURATION_TYPES AND NOT CMAKE_CONFIGURATION_TYPES)
         message(WARNING "CONFIGURATION_TYPES should only be specified for multi-configuration generators")
     elseif(ARGUMENTS_CONFIGURATION_TYPES AND ARGUMENTS_BUILD_TYPE)
@@ -849,7 +851,7 @@ macro(conan_check)
     if(NOT "${return_code}" STREQUAL "0")
       message(FATAL_ERROR "Conan --version failed='${return_code}'")
     endif()
-              
+
     if(NOT CONAN_DETECT_QUIET)
         string(STRIP "${CONAN_VERSION_OUTPUT}" _CONAN_VERSION_OUTPUT)
         message(STATUS "Conan: Version found ${_CONAN_VERSION_OUTPUT}")
diff --git a/cmake/global_flags.compiler.gnu.march.cmake b/cmake/global_flags.compiler.gnu.march.cmake
index a81af88c707..a9c619efc67 100644
--- a/cmake/global_flags.compiler.gnu.march.cmake
+++ b/cmake/global_flags.compiler.gnu.march.cmake
@@ -29,6 +29,13 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i686|x86_64|AMD64)$")
   if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     string(APPEND _GNU_MARCH_C_CXX_FLAGS " -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE")
   endif()
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
+  if (CMAKE_SYSTEM_NAME MATCHES "^(Darwin|Linux)$")
+    # Clang 13+ generates outline atomics by default if '-rtlib=compiler_rt' is specified or system's
+    # libgcc version is >= 9.3.1 : https://github.com/llvm/llvm-project/commit/c5e7e649d537067dec7111f3de1430d0fc8a4d11
+    # Disable this behaviour because our build links with contrib/libs/cxxsupp/builtins that does not contain outline atomics yet
+    string(APPEND _GNU_MARCH_C_CXX_FLAGS " -mno-outline-atomics")
+  endif()
 elseif (ANDROID AND (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a"))
   string(APPEND _GNU_MARCH_C_CXX_FLAGS " -mfloat-abi=softfp")
 endif()
diff --git a/contrib/go/_std_1.21/src/archive/zip/ya.make b/contrib/go/_std_1.21/src/archive/zip/ya.make
index 868af6f449e..9345858bfa5 100644
--- a/contrib/go/_std_1.21/src/archive/zip/ya.make
+++ b/contrib/go/_std_1.21/src/archive/zip/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		reader.go
-		register.go
-		struct.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		register.go
-		struct.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		reader.go
 		register.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		struct.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		reader.go
 		register.go
 		struct.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		reader.go
 		register.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		struct.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		register.go
-		struct.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		reader.go
-		register.go
-		struct.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/bufio/ya.make b/contrib/go/_std_1.21/src/bufio/ya.make
index d470a370f01..e9fe3cec386 100644
--- a/contrib/go/_std_1.21/src/bufio/ya.make
+++ b/contrib/go/_std_1.21/src/bufio/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bufio.go
-		scan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bufio.go
-		scan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bufio.go
 		scan.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		bufio.go
 		scan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bufio.go
 		scan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bufio.go
 		scan.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		bufio.go
 		scan.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bufio.go
-		scan.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bufio.go
-		scan.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/bytes/ya.make b/contrib/go/_std_1.21/src/bytes/ya.make
index 5832573e188..1c398e9f98b 100644
--- a/contrib/go/_std_1.21/src/bytes/ya.make
+++ b/contrib/go/_std_1.21/src/bytes/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		buffer.go
-		bytes.go
-		reader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		buffer.go
-		bytes.go
-		reader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		buffer.go
 		bytes.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		bytes.go
 		reader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		buffer.go
 		bytes.go
 		reader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		buffer.go
 		bytes.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		bytes.go
 		reader.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		buffer.go
-		bytes.go
-		reader.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		buffer.go
-		bytes.go
-		reader.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/cmp/ya.make b/contrib/go/_std_1.21/src/cmp/ya.make
index 0d62320adb3..1d08a8c4f69 100644
--- a/contrib/go/_std_1.21/src/cmp/ya.make
+++ b/contrib/go/_std_1.21/src/cmp/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cmp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cmp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cmp.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		cmp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cmp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cmp.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		cmp.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cmp.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cmp.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/compress/flate/ya.make b/contrib/go/_std_1.21/src/compress/flate/ya.make
index eae68c2f087..b3eb834650f 100644
--- a/contrib/go/_std_1.21/src/compress/flate/ya.make
+++ b/contrib/go/_std_1.21/src/compress/flate/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		deflate.go
-		deflatefast.go
-		dict_decoder.go
-		huffman_bit_writer.go
-		huffman_code.go
-		inflate.go
-		token.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		deflate.go
-		deflatefast.go
-		dict_decoder.go
-		huffman_bit_writer.go
-		huffman_code.go
-		inflate.go
-		token.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		deflate.go
 		deflatefast.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		inflate.go
 		token.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		deflate.go
 		deflatefast.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		inflate.go
 		token.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		deflate.go
 		deflatefast.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		inflate.go
 		token.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		deflate.go
-		deflatefast.go
-		dict_decoder.go
-		huffman_bit_writer.go
-		huffman_code.go
-		inflate.go
-		token.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		deflate.go
-		deflatefast.go
-		dict_decoder.go
-		huffman_bit_writer.go
-		huffman_code.go
-		inflate.go
-		token.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/compress/gzip/ya.make b/contrib/go/_std_1.21/src/compress/gzip/ya.make
index e80e9081562..e20fb09ea4e 100644
--- a/contrib/go/_std_1.21/src/compress/gzip/ya.make
+++ b/contrib/go/_std_1.21/src/compress/gzip/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		gunzip.go
-		gzip.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		gunzip.go
-		gzip.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		gunzip.go
 		gzip.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		gunzip.go
 		gzip.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		gunzip.go
 		gzip.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		gunzip.go
 		gzip.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		gunzip.go
 		gzip.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		gunzip.go
-		gzip.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		gunzip.go
-		gzip.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/compress/zlib/ya.make b/contrib/go/_std_1.21/src/compress/zlib/ya.make
index 8526ee5f3b9..917154adbfe 100644
--- a/contrib/go/_std_1.21/src/compress/zlib/ya.make
+++ b/contrib/go/_std_1.21/src/compress/zlib/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		reader.go
 		writer.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		reader.go
 		writer.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		reader.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/container/heap/ya.make b/contrib/go/_std_1.21/src/container/heap/ya.make
index 3917d782310..a0b93ba37ba 100644
--- a/contrib/go/_std_1.21/src/container/heap/ya.make
+++ b/contrib/go/_std_1.21/src/container/heap/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		heap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		heap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		heap.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		heap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		heap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		heap.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		heap.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		heap.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		heap.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/container/list/ya.make b/contrib/go/_std_1.21/src/container/list/ya.make
index 20a6df25476..3a5e0627678 100644
--- a/contrib/go/_std_1.21/src/container/list/ya.make
+++ b/contrib/go/_std_1.21/src/container/list/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		list.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		list.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		list.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		list.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		list.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		list.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		list.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		list.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		list.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/context/ya.make b/contrib/go/_std_1.21/src/context/ya.make
index 53e0f9d12b2..55ab546313c 100644
--- a/contrib/go/_std_1.21/src/context/ya.make
+++ b/contrib/go/_std_1.21/src/context/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		context.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		context.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		context.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		context.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		context.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		context.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		context.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		context.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		context.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/aes/ya.make b/contrib/go/_std_1.21/src/crypto/aes/ya.make
index 1182f71222a..cd7e7f58d83 100644
--- a/contrib/go/_std_1.21/src/crypto/aes/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/aes/ya.make
@@ -1,30 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		aes_gcm.go
-		asm_amd64.s
-		block.go
-		cipher.go
-		cipher_asm.go
-		const.go
-		gcm_amd64.s
-		modes.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		aes_gcm.go
-		asm_arm64.s
-		block.go
-		cipher.go
-		cipher_asm.go
-		const.go
-		gcm_arm64.s
-		modes.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		aes_gcm.go
 		asm_arm64.s
@@ -46,7 +21,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		gcm_amd64.s
 		modes.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		aes_gcm.go
 		asm_arm64.s
@@ -57,15 +32,15 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		gcm_arm64.s
 		modes.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		aes_gcm.go
-		asm_arm64.s
+		asm_amd64.s
 		block.go
 		cipher.go
 		cipher_asm.go
 		const.go
-		gcm_arm64.s
+		gcm_amd64.s
 		modes.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -79,27 +54,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		gcm_amd64.s
 		modes.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		aes_gcm.go
-		asm_arm64.s
-		block.go
-		cipher.go
-		cipher_asm.go
-		const.go
-		gcm_arm64.s
-		modes.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		aes_gcm.go
-		asm_arm64.s
-		block.go
-		cipher.go
-		cipher_asm.go
-		const.go
-		gcm_arm64.s
-		modes.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/cipher/ya.make b/contrib/go/_std_1.21/src/crypto/cipher/ya.make
index 12c720606f2..fef0aa84797 100644
--- a/contrib/go/_std_1.21/src/crypto/cipher/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/cipher/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/des/ya.make b/contrib/go/_std_1.21/src/crypto/des/ya.make
index fed8887ea1b..6092d714a5e 100644
--- a/contrib/go/_std_1.21/src/crypto/des/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/des/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		block.go
-		cipher.go
-		const.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		block.go
-		cipher.go
-		const.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		block.go
 		cipher.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		cipher.go
 		const.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		block.go
 		cipher.go
 		const.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		block.go
 		cipher.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		cipher.go
 		const.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		block.go
-		cipher.go
-		const.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		block.go
-		cipher.go
-		const.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/dsa/ya.make b/contrib/go/_std_1.21/src/crypto/dsa/ya.make
index 4364896dc4d..4df078c314d 100644
--- a/contrib/go/_std_1.21/src/crypto/dsa/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/dsa/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		dsa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		dsa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		dsa.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		dsa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		dsa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		dsa.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		dsa.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		dsa.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		dsa.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/ecdh/ya.make b/contrib/go/_std_1.21/src/crypto/ecdh/ya.make
index 32c4363efc6..0c5a000c8c9 100644
--- a/contrib/go/_std_1.21/src/crypto/ecdh/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/ecdh/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ecdh.go
-		nist.go
-		x25519.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ecdh.go
-		nist.go
-		x25519.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ecdh.go
 		nist.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		nist.go
 		x25519.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ecdh.go
 		nist.go
 		x25519.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ecdh.go
 		nist.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		nist.go
 		x25519.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ecdh.go
-		nist.go
-		x25519.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ecdh.go
-		nist.go
-		x25519.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/ecdsa/ya.make b/contrib/go/_std_1.21/src/crypto/ecdsa/ya.make
index 102981b8035..34b8cf9b4f4 100644
--- a/contrib/go/_std_1.21/src/crypto/ecdsa/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/ecdsa/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ecdsa.go
-		ecdsa_legacy.go
-		ecdsa_noasm.go
-		notboring.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ecdsa.go
-		ecdsa_legacy.go
-		ecdsa_noasm.go
-		notboring.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ecdsa.go
 		ecdsa_legacy.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		ecdsa_noasm.go
 		notboring.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ecdsa.go
 		ecdsa_legacy.go
 		ecdsa_noasm.go
 		notboring.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ecdsa.go
 		ecdsa_legacy.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		ecdsa_noasm.go
 		notboring.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ecdsa.go
-		ecdsa_legacy.go
-		ecdsa_noasm.go
-		notboring.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ecdsa.go
-		ecdsa_legacy.go
-		ecdsa_noasm.go
-		notboring.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/ed25519/ya.make b/contrib/go/_std_1.21/src/crypto/ed25519/ya.make
index cf648ccf235..d3a150deb69 100644
--- a/contrib/go/_std_1.21/src/crypto/ed25519/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/ed25519/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ed25519.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ed25519.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ed25519.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		ed25519.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ed25519.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ed25519.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		ed25519.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ed25519.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ed25519.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/elliptic/ya.make b/contrib/go/_std_1.21/src/crypto/elliptic/ya.make
index 202d3a7b706..f6f7e6020de 100644
--- a/contrib/go/_std_1.21/src/crypto/elliptic/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/elliptic/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		elliptic.go
-		nistec.go
-		nistec_p256.go
-		params.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		elliptic.go
-		nistec.go
-		nistec_p256.go
-		params.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		elliptic.go
 		nistec.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		nistec_p256.go
 		params.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		elliptic.go
 		nistec.go
 		nistec_p256.go
 		params.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		elliptic.go
 		nistec.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		nistec_p256.go
 		params.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		elliptic.go
-		nistec.go
-		nistec_p256.go
-		params.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		elliptic.go
-		nistec.go
-		nistec_p256.go
-		params.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/hmac/ya.make b/contrib/go/_std_1.21/src/crypto/hmac/ya.make
index edbf066bb47..ebd9b9e91b6 100644
--- a/contrib/go/_std_1.21/src/crypto/hmac/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/hmac/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		hmac.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		hmac.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		hmac.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		hmac.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		hmac.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		hmac.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		hmac.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		hmac.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		hmac.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/alias/ya.make b/contrib/go/_std_1.21/src/crypto/internal/alias/ya.make
index 2af7fd4551e..80830f4c9b5 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/alias/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/alias/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		alias.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		alias.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/bigmod/ya.make b/contrib/go/_std_1.21/src/crypto/internal/bigmod/ya.make
index ae122c35125..4f162fda3c7 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/bigmod/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/bigmod/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		nat.go
-		nat_amd64.s
-		nat_asm.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		nat.go
-		nat_arm64.s
-		nat_asm.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		nat.go
 		nat_arm64.s
@@ -26,16 +11,16 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		nat_amd64.s
 		nat_asm.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		nat.go
 		nat_arm64.s
 		nat_asm.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		nat.go
-		nat_arm64.s
+		nat_amd64.s
 		nat_asm.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		nat_amd64.s
 		nat_asm.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		nat.go
-		nat_arm64.s
-		nat_asm.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		nat.go
-		nat_arm64.s
-		nat_asm.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/internal/boring/bbig/ya.make b/contrib/go/_std_1.21/src/crypto/internal/boring/bbig/ya.make
index abdeae0b291..e01405b04c3 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/boring/bbig/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/boring/bbig/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		big.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		big.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		big.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		big.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		big.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		big.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		big.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		big.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		big.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/boring/bcache/ya.make b/contrib/go/_std_1.21/src/crypto/internal/boring/bcache/ya.make
index d40b86492f9..9482a33ce85 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/boring/bcache/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/boring/bcache/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cache.go
-		stub.s
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cache.go
-		stub.s
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cache.go
 		stub.s
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		cache.go
 		stub.s
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cache.go
 		stub.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cache.go
 		stub.s
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		cache.go
 		stub.s
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cache.go
-		stub.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cache.go
-		stub.s
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/boring/sig/ya.make b/contrib/go/_std_1.21/src/crypto/internal/boring/sig/ya.make
index 1f065bec13f..1331586f611 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/boring/sig/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/boring/sig/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		sig.go
-		sig_amd64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		sig.go
-		sig_other.s
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		sig.go
 		sig_other.s
@@ -22,30 +9,20 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sig.go
 		sig_amd64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		sig.go
 		sig_other.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		sig.go
-		sig_other.s
+		sig_amd64.s
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		sig.go
 		sig_amd64.s
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		sig.go
-		sig_other.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		sig.go
-		sig_other.s
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/boring/ya.make b/contrib/go/_std_1.21/src/crypto/internal/boring/ya.make
index 121540a0537..f5b2fe82bb2 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/boring/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/boring/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		notboring.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		notboring.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		notboring.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		doc.go
 		notboring.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		notboring.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		notboring.go
@@ -37,16 +24,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		doc.go
 		notboring.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		notboring.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-		notboring.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/internal/edwards25519/field/ya.make b/contrib/go/_std_1.21/src/crypto/internal/edwards25519/field/ya.make
index 55a250e3adb..ef2a810680f 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/edwards25519/field/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/edwards25519/field/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		fe.go
-		fe_amd64.go
-		fe_amd64.s
-		fe_arm64_noasm.go
-		fe_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		fe.go
-		fe_amd64_noasm.go
-		fe_arm64.go
-		fe_arm64.s
-		fe_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		fe.go
 		fe_amd64_noasm.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		fe_arm64_noasm.go
 		fe_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		fe.go
 		fe_amd64_noasm.go
@@ -42,12 +23,12 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		fe_arm64.s
 		fe_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		fe.go
-		fe_amd64_noasm.go
-		fe_arm64.go
-		fe_arm64.s
+		fe_amd64.go
+		fe_amd64.s
+		fe_arm64_noasm.go
 		fe_generic.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -58,22 +39,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		fe_arm64_noasm.go
 		fe_generic.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		fe.go
-		fe_amd64_noasm.go
-		fe_arm64.go
-		fe_arm64.s
-		fe_generic.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		fe.go
-		fe_amd64_noasm.go
-		fe_arm64.go
-		fe_arm64.s
-		fe_generic.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/internal/edwards25519/ya.make b/contrib/go/_std_1.21/src/crypto/internal/edwards25519/ya.make
index 212853da3c7..fa58666d660 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/edwards25519/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/edwards25519/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		edwards25519.go
-		scalar.go
-		scalar_fiat.go
-		scalarmult.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		edwards25519.go
-		scalar.go
-		scalar_fiat.go
-		scalarmult.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		edwards25519.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		scalarmult.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		edwards25519.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		scalarmult.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		edwards25519.go
@@ -65,24 +44,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		scalarmult.go
 		tables.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		edwards25519.go
-		scalar.go
-		scalar_fiat.go
-		scalarmult.go
-		tables.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-		edwards25519.go
-		scalar.go
-		scalar_fiat.go
-		scalarmult.go
-		tables.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/internal/nistec/fiat/ya.make b/contrib/go/_std_1.21/src/crypto/internal/nistec/fiat/ya.make
index e17ddb7e4b0..acbd24df21e 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/nistec/fiat/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/nistec/fiat/ya.make
@@ -1,38 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		p224.go
-		p224_fiat64.go
-		p224_invert.go
-		p256.go
-		p256_fiat64.go
-		p256_invert.go
-		p384.go
-		p384_fiat64.go
-		p384_invert.go
-		p521.go
-		p521_fiat64.go
-		p521_invert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		p224.go
-		p224_fiat64.go
-		p224_invert.go
-		p256.go
-		p256_fiat64.go
-		p256_invert.go
-		p384.go
-		p384_fiat64.go
-		p384_invert.go
-		p521.go
-		p521_fiat64.go
-		p521_invert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		p224.go
 		p224_fiat64.go
@@ -62,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		p521_fiat64.go
 		p521_invert.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		p224.go
 		p224_fiat64.go
@@ -77,7 +44,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		p521_fiat64.go
 		p521_invert.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		p224.go
 		p224_fiat64.go
@@ -107,35 +74,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		p521_fiat64.go
 		p521_invert.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		p224.go
-		p224_fiat64.go
-		p224_invert.go
-		p256.go
-		p256_fiat64.go
-		p256_invert.go
-		p384.go
-		p384_fiat64.go
-		p384_invert.go
-		p521.go
-		p521_fiat64.go
-		p521_invert.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		p224.go
-		p224_fiat64.go
-		p224_invert.go
-		p256.go
-		p256_fiat64.go
-		p256_invert.go
-		p384.go
-		p384_fiat64.go
-		p384_invert.go
-		p521.go
-		p521_fiat64.go
-		p521_invert.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/internal/nistec/ya.make b/contrib/go/_std_1.21/src/crypto/internal/nistec/ya.make
index 24053e723a6..228501c6052 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/nistec/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/nistec/ya.make
@@ -1,34 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		nistec.go
-		p224.go
-		p224_sqrt.go
-		p256_asm.go
-		p256_asm_amd64.s
-		p256_ordinv.go
-		p384.go
-		p521.go
-    )
-    
-    GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		nistec.go
-		p224.go
-		p224_sqrt.go
-		p256_asm.go
-		p256_asm_arm64.s
-		p256_ordinv.go
-		p384.go
-		p521.go
-    )
-    
-    GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		nistec.go
 		p224.go
@@ -54,7 +25,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     )
     
     GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		nistec.go
 		p224.go
@@ -67,13 +38,13 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
     )
     
     GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		nistec.go
 		p224.go
 		p224_sqrt.go
 		p256_asm.go
-		p256_asm_arm64.s
+		p256_asm_amd64.s
 		p256_ordinv.go
 		p384.go
 		p521.go
@@ -93,32 +64,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     )
     
     GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		nistec.go
-		p224.go
-		p224_sqrt.go
-		p256_asm.go
-		p256_asm_arm64.s
-		p256_ordinv.go
-		p384.go
-		p521.go
-    )
-    
-    GO_EMBED_PATTERN(p256_asm_table.bin)
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		nistec.go
-		p224.go
-		p224_sqrt.go
-		p256_asm.go
-		p256_asm_arm64.s
-		p256_ordinv.go
-		p384.go
-		p521.go
-    )
-    
-    GO_EMBED_PATTERN(p256_asm_table.bin)
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/internal/randutil/ya.make b/contrib/go/_std_1.21/src/crypto/internal/randutil/ya.make
index 931334b6366..996474e440c 100644
--- a/contrib/go/_std_1.21/src/crypto/internal/randutil/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/internal/randutil/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		randutil.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		randutil.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		randutil.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		randutil.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		randutil.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		randutil.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		randutil.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		randutil.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		randutil.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/md5/ya.make b/contrib/go/_std_1.21/src/crypto/md5/ya.make
index e593f8d0776..ac72581228c 100644
--- a/contrib/go/_std_1.21/src/crypto/md5/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/md5/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		md5.go
-		md5block.go
-		md5block_amd64.s
-		md5block_decl.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		md5.go
-		md5block.go
-		md5block_arm64.s
-		md5block_decl.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		md5.go
 		md5block.go
@@ -30,18 +13,18 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		md5block_amd64.s
 		md5block_decl.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		md5.go
 		md5block.go
 		md5block_arm64.s
 		md5block_decl.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		md5.go
 		md5block.go
-		md5block_arm64.s
+		md5block_amd64.s
 		md5block_decl.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		md5block_amd64.s
 		md5block_decl.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		md5.go
-		md5block.go
-		md5block_arm64.s
-		md5block_decl.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		md5.go
-		md5block.go
-		md5block_arm64.s
-		md5block_decl.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/rand/ya.make b/contrib/go/_std_1.21/src/crypto/rand/ya.make
index dec39ab791c..e5aeb691d33 100644
--- a/contrib/go/_std_1.21/src/crypto/rand/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/rand/ya.make
@@ -1,25 +1,8 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		rand.go
-		rand_getrandom.go
-		rand_unix.go
-		util.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		rand.go
-		rand_getrandom.go
-		rand_unix.go
-		util.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		rand.go
-		rand_getrandom.go
+		rand_getentropy.go
 		rand_unix.go
 		util.go
     )
@@ -30,17 +13,17 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		rand_unix.go
 		util.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		rand.go
-		rand_getentropy.go
+		rand_getrandom.go
 		rand_unix.go
 		util.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		rand.go
-		rand_getentropy.go
+		rand_getrandom.go
 		rand_unix.go
 		util.go
     )
@@ -50,17 +33,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		rand_windows.go
 		util.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		rand.go
-		rand_windows.go
-		util.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		rand.go
-		rand_windows.go
-		util.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/rc4/ya.make b/contrib/go/_std_1.21/src/crypto/rc4/ya.make
index e7e36364f19..dedd644e60c 100644
--- a/contrib/go/_std_1.21/src/crypto/rc4/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/rc4/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		rc4.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		rc4.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		rc4.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		rc4.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		rc4.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		rc4.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		rc4.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		rc4.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		rc4.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/rsa/ya.make b/contrib/go/_std_1.21/src/crypto/rsa/ya.make
index 3ee14e7a5dc..9306d10bb37 100644
--- a/contrib/go/_std_1.21/src/crypto/rsa/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/rsa/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		notboring.go
-		pkcs1v15.go
-		pss.go
-		rsa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		notboring.go
-		pkcs1v15.go
-		pss.go
-		rsa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		notboring.go
 		pkcs1v15.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		pss.go
 		rsa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		notboring.go
 		pkcs1v15.go
 		pss.go
 		rsa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		notboring.go
 		pkcs1v15.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		pss.go
 		rsa.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		notboring.go
-		pkcs1v15.go
-		pss.go
-		rsa.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		notboring.go
-		pkcs1v15.go
-		pss.go
-		rsa.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/sha256/ya.make b/contrib/go/_std_1.21/src/crypto/sha256/ya.make
index d9c63f5d0c2..2ad76cefe45 100644
--- a/contrib/go/_std_1.21/src/crypto/sha256/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/sha256/ya.make
@@ -1,23 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		sha256.go
-		sha256block.go
-		sha256block_amd64.go
-		sha256block_amd64.s
-		sha256block_decl.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		sha256.go
-		sha256block.go
-		sha256block_arm64.go
-		sha256block_arm64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		sha256.go
 		sha256block.go
@@ -32,19 +14,20 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sha256block_amd64.s
 		sha256block_decl.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		sha256.go
 		sha256block.go
 		sha256block_arm64.go
 		sha256block_arm64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		sha256.go
 		sha256block.go
-		sha256block_arm64.go
-		sha256block_arm64.s
+		sha256block_amd64.go
+		sha256block_amd64.s
+		sha256block_decl.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -54,19 +37,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sha256block_amd64.s
 		sha256block_decl.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		sha256.go
-		sha256block.go
-		sha256block_arm64.go
-		sha256block_arm64.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		sha256.go
-		sha256block.go
-		sha256block_arm64.go
-		sha256block_arm64.s
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/sha512/ya.make b/contrib/go/_std_1.21/src/crypto/sha512/ya.make
index 4ab05e965e4..4f27c59d6e7 100644
--- a/contrib/go/_std_1.21/src/crypto/sha512/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/sha512/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		sha512.go
-		sha512block.go
-		sha512block_amd64.go
-		sha512block_amd64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		sha512.go
-		sha512block.go
-		sha512block_arm64.go
-		sha512block_arm64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		sha512.go
 		sha512block.go
@@ -30,19 +13,19 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sha512block_amd64.go
 		sha512block_amd64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		sha512.go
 		sha512block.go
 		sha512block_arm64.go
 		sha512block_arm64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		sha512.go
 		sha512block.go
-		sha512block_arm64.go
-		sha512block_arm64.s
+		sha512block_amd64.go
+		sha512block_amd64.s
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sha512block_amd64.go
 		sha512block_amd64.s
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		sha512.go
-		sha512block.go
-		sha512block_arm64.go
-		sha512block_arm64.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		sha512.go
-		sha512block.go
-		sha512block_arm64.go
-		sha512block_arm64.s
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/subtle/ya.make b/contrib/go/_std_1.21/src/crypto/subtle/ya.make
index 71a48c89ccd..bb2d3d0ddb9 100644
--- a/contrib/go/_std_1.21/src/crypto/subtle/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/subtle/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		constant_time.go
-		xor.go
-		xor_amd64.go
-		xor_amd64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		constant_time.go
-		xor.go
-		xor_arm64.go
-		xor_arm64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		constant_time.go
 		xor.go
@@ -30,19 +13,19 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		xor_amd64.go
 		xor_amd64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		constant_time.go
 		xor.go
 		xor_arm64.go
 		xor_arm64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		constant_time.go
 		xor.go
-		xor_arm64.go
-		xor_arm64.s
+		xor_amd64.go
+		xor_amd64.s
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		xor_amd64.go
 		xor_amd64.s
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		constant_time.go
-		xor.go
-		xor_arm64.go
-		xor_arm64.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		constant_time.go
-		xor.go
-		xor_arm64.go
-		xor_arm64.s
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/tls/ya.make b/contrib/go/_std_1.21/src/crypto/tls/ya.make
index d149a98160f..e78e1be59cf 100644
--- a/contrib/go/_std_1.21/src/crypto/tls/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/tls/ya.make
@@ -1,52 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		alert.go
-		auth.go
-		cache.go
-		cipher_suites.go
-		common.go
-		common_string.go
-		conn.go
-		handshake_client.go
-		handshake_client_tls13.go
-		handshake_messages.go
-		handshake_server.go
-		handshake_server_tls13.go
-		key_agreement.go
-		key_schedule.go
-		notboring.go
-		prf.go
-		quic.go
-		ticket.go
-		tls.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		alert.go
-		auth.go
-		cache.go
-		cipher_suites.go
-		common.go
-		common_string.go
-		conn.go
-		handshake_client.go
-		handshake_client_tls13.go
-		handshake_messages.go
-		handshake_server.go
-		handshake_server_tls13.go
-		key_agreement.go
-		key_schedule.go
-		notboring.go
-		prf.go
-		quic.go
-		ticket.go
-		tls.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		alert.go
 		auth.go
@@ -90,7 +43,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		ticket.go
 		tls.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		alert.go
 		auth.go
@@ -112,7 +65,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		ticket.go
 		tls.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		alert.go
 		auth.go
@@ -156,50 +109,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		ticket.go
 		tls.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		alert.go
-		auth.go
-		cache.go
-		cipher_suites.go
-		common.go
-		common_string.go
-		conn.go
-		handshake_client.go
-		handshake_client_tls13.go
-		handshake_messages.go
-		handshake_server.go
-		handshake_server_tls13.go
-		key_agreement.go
-		key_schedule.go
-		notboring.go
-		prf.go
-		quic.go
-		ticket.go
-		tls.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		alert.go
-		auth.go
-		cache.go
-		cipher_suites.go
-		common.go
-		common_string.go
-		conn.go
-		handshake_client.go
-		handshake_client_tls13.go
-		handshake_messages.go
-		handshake_server.go
-		handshake_server_tls13.go
-		key_agreement.go
-		key_schedule.go
-		notboring.go
-		prf.go
-		quic.go
-		ticket.go
-		tls.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/x509/internal/macos/ya.make b/contrib/go/_std_1.21/src/crypto/x509/internal/macos/ya.make
index 1c9ad3665c3..33ff1ff9d9b 100644
--- a/contrib/go/_std_1.21/src/crypto/x509/internal/macos/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/x509/internal/macos/ya.make
@@ -1,22 +1,12 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		corefoundation.go
-		corefoundation.s
-		security.go
-		security.s
-    )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		corefoundation.go
 		corefoundation.s
 		security.go
 		security.s
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		corefoundation.go
 		corefoundation.s
diff --git a/contrib/go/_std_1.21/src/crypto/x509/pkix/ya.make b/contrib/go/_std_1.21/src/crypto/x509/pkix/ya.make
index 65a12b26e09..a7c49207594 100644
--- a/contrib/go/_std_1.21/src/crypto/x509/pkix/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/x509/pkix/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		pkix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		pkix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		pkix.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		pkix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		pkix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		pkix.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		pkix.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		pkix.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		pkix.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/crypto/x509/ya.make b/contrib/go/_std_1.21/src/crypto/x509/ya.make
index 38c6e32c591..e13e312a1ac 100644
--- a/contrib/go/_std_1.21/src/crypto/x509/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/x509/ya.make
@@ -1,8 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cert_pool.go
 		notboring.go
@@ -11,13 +8,12 @@ ELSEIF (OS_LINUX AND ARCH_X86_64)
 		pkcs1.go
 		pkcs8.go
 		root.go
-		root_linux.go
-		root_unix.go
+		root_darwin.go
 		sec1.go
 		verify.go
 		x509.go
     )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		cert_pool.go
 		notboring.go
@@ -26,8 +22,7 @@ ELSEIF (OS_LINUX AND ARCH_ARM64)
 		pkcs1.go
 		pkcs8.go
 		root.go
-		root_linux.go
-		root_unix.go
+		root_darwin.go
 		sec1.go
 		verify.go
 		x509.go
@@ -47,35 +42,7 @@ ELSEIF (OS_LINUX AND ARCH_AARCH64)
 		verify.go
 		x509.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		cert_pool.go
-		notboring.go
-		parser.go
-		pem_decrypt.go
-		pkcs1.go
-		pkcs8.go
-		root.go
-		root_darwin.go
-		sec1.go
-		verify.go
-		x509.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		cert_pool.go
-		notboring.go
-		parser.go
-		pem_decrypt.go
-		pkcs1.go
-		pkcs8.go
-		root.go
-		root_darwin.go
-		sec1.go
-		verify.go
-		x509.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cert_pool.go
 		notboring.go
@@ -84,7 +51,8 @@ ELSEIF (OS_DARWIN AND ARCH_AARCH64)
 		pkcs1.go
 		pkcs8.go
 		root.go
-		root_darwin.go
+		root_linux.go
+		root_unix.go
 		sec1.go
 		verify.go
 		x509.go
@@ -103,34 +71,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		verify.go
 		x509.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cert_pool.go
-		notboring.go
-		parser.go
-		pem_decrypt.go
-		pkcs1.go
-		pkcs8.go
-		root.go
-		root_windows.go
-		sec1.go
-		verify.go
-		x509.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cert_pool.go
-		notboring.go
-		parser.go
-		pem_decrypt.go
-		pkcs1.go
-		pkcs8.go
-		root.go
-		root_windows.go
-		sec1.go
-		verify.go
-		x509.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/crypto/ya.make b/contrib/go/_std_1.21/src/crypto/ya.make
index b4d37f2e7fd..11bc07140b5 100644
--- a/contrib/go/_std_1.21/src/crypto/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		crypto.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		crypto.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		crypto.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		crypto.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		crypto.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		crypto.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		crypto.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		crypto.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		crypto.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/database/sql/driver/ya.make b/contrib/go/_std_1.21/src/database/sql/driver/ya.make
index 3da0bea1588..d79ab8f05cf 100644
--- a/contrib/go/_std_1.21/src/database/sql/driver/ya.make
+++ b/contrib/go/_std_1.21/src/database/sql/driver/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		driver.go
-		types.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		driver.go
-		types.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		driver.go
 		types.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		driver.go
 		types.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		driver.go
 		types.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		driver.go
 		types.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		driver.go
 		types.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		driver.go
-		types.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		driver.go
-		types.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/debug/dwarf/ya.make b/contrib/go/_std_1.21/src/debug/dwarf/ya.make
index aa7cf9ee34c..d41f57886d1 100644
--- a/contrib/go/_std_1.21/src/debug/dwarf/ya.make
+++ b/contrib/go/_std_1.21/src/debug/dwarf/ya.make
@@ -1,36 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		attr_string.go
-		buf.go
-		class_string.go
-		const.go
-		entry.go
-		line.go
-		open.go
-		tag_string.go
-		type.go
-		typeunit.go
-		unit.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		attr_string.go
-		buf.go
-		class_string.go
-		const.go
-		entry.go
-		line.go
-		open.go
-		tag_string.go
-		type.go
-		typeunit.go
-		unit.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		attr_string.go
 		buf.go
@@ -58,7 +27,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		typeunit.go
 		unit.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		attr_string.go
 		buf.go
@@ -72,7 +41,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		typeunit.go
 		unit.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		attr_string.go
 		buf.go
@@ -100,33 +69,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		typeunit.go
 		unit.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		attr_string.go
-		buf.go
-		class_string.go
-		const.go
-		entry.go
-		line.go
-		open.go
-		tag_string.go
-		type.go
-		typeunit.go
-		unit.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		attr_string.go
-		buf.go
-		class_string.go
-		const.go
-		entry.go
-		line.go
-		open.go
-		tag_string.go
-		type.go
-		typeunit.go
-		unit.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/debug/elf/ya.make b/contrib/go/_std_1.21/src/debug/elf/ya.make
index 7a6a42dac2e..076bad38a98 100644
--- a/contrib/go/_std_1.21/src/debug/elf/ya.make
+++ b/contrib/go/_std_1.21/src/debug/elf/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		elf.go
-		file.go
-		reader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		elf.go
-		file.go
-		reader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		elf.go
 		file.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		file.go
 		reader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		elf.go
 		file.go
 		reader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		elf.go
 		file.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		file.go
 		reader.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		elf.go
-		file.go
-		reader.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		elf.go
-		file.go
-		reader.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/embed/ya.make b/contrib/go/_std_1.21/src/embed/ya.make
index 7b3aa9bb3c4..e1fea1f0596 100644
--- a/contrib/go/_std_1.21/src/embed/ya.make
+++ b/contrib/go/_std_1.21/src/embed/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		embed.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		embed.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		embed.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		embed.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		embed.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		embed.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		embed.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		embed.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		embed.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/encoding/ascii85/ya.make b/contrib/go/_std_1.21/src/encoding/ascii85/ya.make
index 5f954656d1c..46011c99328 100644
--- a/contrib/go/_std_1.21/src/encoding/ascii85/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/ascii85/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ascii85.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ascii85.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ascii85.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		ascii85.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ascii85.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ascii85.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		ascii85.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ascii85.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ascii85.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/asn1/ya.make b/contrib/go/_std_1.21/src/encoding/asn1/ya.make
index 6ed79e19cda..e6b92b50774 100644
--- a/contrib/go/_std_1.21/src/encoding/asn1/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/asn1/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		asn1.go
-		common.go
-		marshal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-		common.go
-		marshal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		asn1.go
 		common.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		common.go
 		marshal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		asn1.go
 		common.go
 		marshal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		asn1.go
 		common.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		common.go
 		marshal.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-		common.go
-		marshal.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		asn1.go
-		common.go
-		marshal.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/base32/ya.make b/contrib/go/_std_1.21/src/encoding/base32/ya.make
index df093e7c834..10b87904dff 100644
--- a/contrib/go/_std_1.21/src/encoding/base32/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/base32/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		base32.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		base32.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		base32.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		base32.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		base32.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		base32.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		base32.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		base32.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		base32.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/base64/ya.make b/contrib/go/_std_1.21/src/encoding/base64/ya.make
index 3dd64109245..f2d34b905e4 100644
--- a/contrib/go/_std_1.21/src/encoding/base64/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/base64/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		base64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		base64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		base64.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		base64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		base64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		base64.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		base64.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		base64.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		base64.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/binary/ya.make b/contrib/go/_std_1.21/src/encoding/binary/ya.make
index 6ca351d38d6..4fb5c67382a 100644
--- a/contrib/go/_std_1.21/src/encoding/binary/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/binary/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		binary.go
-		native_endian_little.go
-		varint.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		binary.go
-		native_endian_little.go
-		varint.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		binary.go
 		native_endian_little.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		native_endian_little.go
 		varint.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		binary.go
 		native_endian_little.go
 		varint.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		binary.go
 		native_endian_little.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		native_endian_little.go
 		varint.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		binary.go
-		native_endian_little.go
-		varint.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		binary.go
-		native_endian_little.go
-		varint.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/csv/ya.make b/contrib/go/_std_1.21/src/encoding/csv/ya.make
index 8526ee5f3b9..917154adbfe 100644
--- a/contrib/go/_std_1.21/src/encoding/csv/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/csv/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		reader.go
 		writer.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		reader.go
 		writer.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		reader.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/gob/ya.make b/contrib/go/_std_1.21/src/encoding/gob/ya.make
index 6b093063c6a..15977ca550f 100644
--- a/contrib/go/_std_1.21/src/encoding/gob/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/gob/ya.make
@@ -1,32 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		dec_helpers.go
-		decode.go
-		decoder.go
-		doc.go
-		enc_helpers.go
-		encode.go
-		encoder.go
-		error.go
-		type.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		dec_helpers.go
-		decode.go
-		decoder.go
-		doc.go
-		enc_helpers.go
-		encode.go
-		encoder.go
-		error.go
-		type.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		dec_helpers.go
 		decode.go
@@ -50,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		error.go
 		type.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		dec_helpers.go
 		decode.go
@@ -62,7 +35,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		error.go
 		type.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		dec_helpers.go
 		decode.go
@@ -86,29 +59,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		error.go
 		type.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		dec_helpers.go
-		decode.go
-		decoder.go
-		doc.go
-		enc_helpers.go
-		encode.go
-		encoder.go
-		error.go
-		type.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		dec_helpers.go
-		decode.go
-		decoder.go
-		doc.go
-		enc_helpers.go
-		encode.go
-		encoder.go
-		error.go
-		type.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/hex/ya.make b/contrib/go/_std_1.21/src/encoding/hex/ya.make
index d5d8da6e10f..8ef2027e6c0 100644
--- a/contrib/go/_std_1.21/src/encoding/hex/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/hex/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		hex.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		hex.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		hex.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		hex.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		hex.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		hex.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		hex.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		hex.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		hex.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/json/ya.make b/contrib/go/_std_1.21/src/encoding/json/ya.make
index e34fdfffc70..8d6e1eefc15 100644
--- a/contrib/go/_std_1.21/src/encoding/json/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/json/ya.make
@@ -1,30 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		decode.go
-		encode.go
-		fold.go
-		indent.go
-		scanner.go
-		stream.go
-		tables.go
-		tags.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		decode.go
-		encode.go
-		fold.go
-		indent.go
-		scanner.go
-		stream.go
-		tables.go
-		tags.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		decode.go
 		encode.go
@@ -46,7 +21,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		tables.go
 		tags.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		decode.go
 		encode.go
@@ -57,7 +32,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		tables.go
 		tags.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		decode.go
 		encode.go
@@ -79,27 +54,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		tables.go
 		tags.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		decode.go
-		encode.go
-		fold.go
-		indent.go
-		scanner.go
-		stream.go
-		tables.go
-		tags.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		decode.go
-		encode.go
-		fold.go
-		indent.go
-		scanner.go
-		stream.go
-		tables.go
-		tags.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/pem/ya.make b/contrib/go/_std_1.21/src/encoding/pem/ya.make
index 2316f36bbef..2d6a4b3aca3 100644
--- a/contrib/go/_std_1.21/src/encoding/pem/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/pem/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		pem.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		pem.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		pem.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		pem.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		pem.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		pem.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		pem.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		pem.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		pem.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/xml/ya.make b/contrib/go/_std_1.21/src/encoding/xml/ya.make
index a4d86d7125f..6ecefafcde6 100644
--- a/contrib/go/_std_1.21/src/encoding/xml/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/xml/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		marshal.go
-		read.go
-		typeinfo.go
-		xml.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		marshal.go
-		read.go
-		typeinfo.go
-		xml.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		marshal.go
 		read.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		typeinfo.go
 		xml.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		marshal.go
 		read.go
 		typeinfo.go
 		xml.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		marshal.go
 		read.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		typeinfo.go
 		xml.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		marshal.go
-		read.go
-		typeinfo.go
-		xml.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		marshal.go
-		read.go
-		typeinfo.go
-		xml.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/encoding/ya.make b/contrib/go/_std_1.21/src/encoding/ya.make
index 7f94b74bab5..b8ca3eb4740 100644
--- a/contrib/go/_std_1.21/src/encoding/ya.make
+++ b/contrib/go/_std_1.21/src/encoding/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encoding.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encoding.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encoding.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		encoding.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encoding.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encoding.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		encoding.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encoding.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encoding.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/errors/ya.make b/contrib/go/_std_1.21/src/errors/ya.make
index 609f0a1dd74..cfb34e36691 100644
--- a/contrib/go/_std_1.21/src/errors/ya.make
+++ b/contrib/go/_std_1.21/src/errors/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		errors.go
-		join.go
-		wrap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		errors.go
-		join.go
-		wrap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		errors.go
 		join.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		join.go
 		wrap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		errors.go
 		join.go
 		wrap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		errors.go
 		join.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		join.go
 		wrap.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		errors.go
-		join.go
-		wrap.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		errors.go
-		join.go
-		wrap.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/flag/ya.make b/contrib/go/_std_1.21/src/flag/ya.make
index 6190fe23a06..9840e68001a 100644
--- a/contrib/go/_std_1.21/src/flag/ya.make
+++ b/contrib/go/_std_1.21/src/flag/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		flag.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		flag.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		flag.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		flag.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		flag.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		flag.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		flag.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		flag.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		flag.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/fmt/ya.make b/contrib/go/_std_1.21/src/fmt/ya.make
index e9d15398ba1..6fae98f1574 100644
--- a/contrib/go/_std_1.21/src/fmt/ya.make
+++ b/contrib/go/_std_1.21/src/fmt/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		errors.go
-		format.go
-		print.go
-		scan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		errors.go
-		format.go
-		print.go
-		scan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		errors.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		print.go
 		scan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		errors.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		print.go
 		scan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		errors.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		print.go
 		scan.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		errors.go
-		format.go
-		print.go
-		scan.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-		errors.go
-		format.go
-		print.go
-		scan.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/ast/ya.make b/contrib/go/_std_1.21/src/go/ast/ya.make
index 0e176b4afd4..2a6a6c778d9 100644
--- a/contrib/go/_std_1.21/src/go/ast/ya.make
+++ b/contrib/go/_std_1.21/src/go/ast/ya.make
@@ -1,30 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ast.go
-		commentmap.go
-		filter.go
-		import.go
-		print.go
-		resolve.go
-		scope.go
-		walk.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ast.go
-		commentmap.go
-		filter.go
-		import.go
-		print.go
-		resolve.go
-		scope.go
-		walk.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ast.go
 		commentmap.go
@@ -46,7 +21,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		scope.go
 		walk.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ast.go
 		commentmap.go
@@ -57,7 +32,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		scope.go
 		walk.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ast.go
 		commentmap.go
@@ -79,27 +54,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		scope.go
 		walk.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ast.go
-		commentmap.go
-		filter.go
-		import.go
-		print.go
-		resolve.go
-		scope.go
-		walk.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ast.go
-		commentmap.go
-		filter.go
-		import.go
-		print.go
-		resolve.go
-		scope.go
-		walk.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/build/constraint/ya.make b/contrib/go/_std_1.21/src/go/build/constraint/ya.make
index b1b5b76a7d5..e0da92fba7b 100644
--- a/contrib/go/_std_1.21/src/go/build/constraint/ya.make
+++ b/contrib/go/_std_1.21/src/go/build/constraint/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		expr.go
-		vers.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		expr.go
-		vers.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		expr.go
 		vers.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		expr.go
 		vers.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		expr.go
 		vers.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		expr.go
 		vers.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		expr.go
 		vers.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		expr.go
-		vers.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		expr.go
-		vers.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/build/ya.make b/contrib/go/_std_1.21/src/go/build/ya.make
index 3db73a6ebd8..65430fae426 100644
--- a/contrib/go/_std_1.21/src/go/build/ya.make
+++ b/contrib/go/_std_1.21/src/go/build/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		build.go
-		doc.go
-		gc.go
-		read.go
-		syslist.go
-		zcgo.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		build.go
-		doc.go
-		gc.go
-		read.go
-		syslist.go
-		zcgo.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		build.go
 		doc.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		syslist.go
 		zcgo.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		build.go
 		doc.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		syslist.go
 		zcgo.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		build.go
 		doc.go
@@ -65,24 +44,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		syslist.go
 		zcgo.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		build.go
-		doc.go
-		gc.go
-		read.go
-		syslist.go
-		zcgo.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		build.go
-		doc.go
-		gc.go
-		read.go
-		syslist.go
-		zcgo.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/go/constant/ya.make b/contrib/go/_std_1.21/src/go/constant/ya.make
index af4fe9204b3..798b600154c 100644
--- a/contrib/go/_std_1.21/src/go/constant/ya.make
+++ b/contrib/go/_std_1.21/src/go/constant/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		kind_string.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		kind_string.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		kind_string.go
 		value.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		kind_string.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		kind_string.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		kind_string.go
 		value.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		kind_string.go
 		value.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		kind_string.go
-		value.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		kind_string.go
-		value.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/doc/comment/ya.make b/contrib/go/_std_1.21/src/go/doc/comment/ya.make
index a5457e4b1f1..fe8b6b96327 100644
--- a/contrib/go/_std_1.21/src/go/doc/comment/ya.make
+++ b/contrib/go/_std_1.21/src/go/doc/comment/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		html.go
-		markdown.go
-		parse.go
-		print.go
-		std.go
-		text.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		html.go
-		markdown.go
-		parse.go
-		print.go
-		std.go
-		text.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		html.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		std.go
 		text.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		html.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		std.go
 		text.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		html.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		std.go
 		text.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		html.go
-		markdown.go
-		parse.go
-		print.go
-		std.go
-		text.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-		html.go
-		markdown.go
-		parse.go
-		print.go
-		std.go
-		text.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/doc/ya.make b/contrib/go/_std_1.21/src/go/doc/ya.make
index dae1d9dc68c..81bb608660d 100644
--- a/contrib/go/_std_1.21/src/go/doc/ya.make
+++ b/contrib/go/_std_1.21/src/go/doc/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		comment.go
-		doc.go
-		example.go
-		exports.go
-		filter.go
-		reader.go
-		synopsis.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		comment.go
-		doc.go
-		example.go
-		exports.go
-		filter.go
-		reader.go
-		synopsis.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		comment.go
 		doc.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		reader.go
 		synopsis.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		comment.go
 		doc.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		reader.go
 		synopsis.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		comment.go
 		doc.go
@@ -72,26 +49,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		reader.go
 		synopsis.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		comment.go
-		doc.go
-		example.go
-		exports.go
-		filter.go
-		reader.go
-		synopsis.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		comment.go
-		doc.go
-		example.go
-		exports.go
-		filter.go
-		reader.go
-		synopsis.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/go/format/ya.make b/contrib/go/_std_1.21/src/go/format/ya.make
index 111ca5077b9..b33618937a6 100644
--- a/contrib/go/_std_1.21/src/go/format/ya.make
+++ b/contrib/go/_std_1.21/src/go/format/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		format.go
-		internal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		format.go
-		internal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		format.go
 		internal.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		format.go
 		internal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		format.go
 		internal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		format.go
 		internal.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		format.go
 		internal.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		format.go
-		internal.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		format.go
-		internal.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/importer/ya.make b/contrib/go/_std_1.21/src/go/importer/ya.make
index cb6c2ff5096..a725b771139 100644
--- a/contrib/go/_std_1.21/src/go/importer/ya.make
+++ b/contrib/go/_std_1.21/src/go/importer/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		importer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		importer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		importer.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		importer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		importer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		importer.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		importer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		importer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		importer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/internal/gccgoimporter/ya.make b/contrib/go/_std_1.21/src/go/internal/gccgoimporter/ya.make
index b77c100d032..6d4063f5904 100644
--- a/contrib/go/_std_1.21/src/go/internal/gccgoimporter/ya.make
+++ b/contrib/go/_std_1.21/src/go/internal/gccgoimporter/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ar.go
-		gccgoinstallation.go
-		importer.go
-		parser.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ar.go
-		gccgoinstallation.go
-		importer.go
-		parser.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ar.go
 		gccgoinstallation.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		importer.go
 		parser.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ar.go
 		gccgoinstallation.go
 		importer.go
 		parser.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ar.go
 		gccgoinstallation.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		importer.go
 		parser.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ar.go
-		gccgoinstallation.go
-		importer.go
-		parser.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ar.go
-		gccgoinstallation.go
-		importer.go
-		parser.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/internal/gcimporter/ya.make b/contrib/go/_std_1.21/src/go/internal/gcimporter/ya.make
index f42548d257c..f1843bf1590 100644
--- a/contrib/go/_std_1.21/src/go/internal/gcimporter/ya.make
+++ b/contrib/go/_std_1.21/src/go/internal/gcimporter/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exportdata.go
-		gcimporter.go
-		iimport.go
-		support.go
-		ureader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exportdata.go
-		gcimporter.go
-		iimport.go
-		support.go
-		ureader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exportdata.go
 		gcimporter.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		support.go
 		ureader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exportdata.go
 		gcimporter.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		support.go
 		ureader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exportdata.go
 		gcimporter.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		support.go
 		ureader.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exportdata.go
-		gcimporter.go
-		iimport.go
-		support.go
-		ureader.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exportdata.go
-		gcimporter.go
-		iimport.go
-		support.go
-		ureader.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/internal/srcimporter/ya.make b/contrib/go/_std_1.21/src/go/internal/srcimporter/ya.make
index a57253e82e6..71345d63efb 100644
--- a/contrib/go/_std_1.21/src/go/internal/srcimporter/ya.make
+++ b/contrib/go/_std_1.21/src/go/internal/srcimporter/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		srcimporter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		srcimporter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		srcimporter.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		srcimporter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		srcimporter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		srcimporter.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		srcimporter.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		srcimporter.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		srcimporter.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/internal/typeparams/ya.make b/contrib/go/_std_1.21/src/go/internal/typeparams/ya.make
index 4713a33722a..40df6c1ef80 100644
--- a/contrib/go/_std_1.21/src/go/internal/typeparams/ya.make
+++ b/contrib/go/_std_1.21/src/go/internal/typeparams/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		typeparams.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		typeparams.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		typeparams.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		typeparams.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		typeparams.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		typeparams.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		typeparams.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		typeparams.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		typeparams.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/parser/ya.make b/contrib/go/_std_1.21/src/go/parser/ya.make
index 3ed24dae759..733115901ad 100644
--- a/contrib/go/_std_1.21/src/go/parser/ya.make
+++ b/contrib/go/_std_1.21/src/go/parser/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		interface.go
-		parser.go
-		resolver.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		interface.go
-		parser.go
-		resolver.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		interface.go
 		parser.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		parser.go
 		resolver.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		interface.go
 		parser.go
 		resolver.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		interface.go
 		parser.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		parser.go
 		resolver.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		interface.go
-		parser.go
-		resolver.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		interface.go
-		parser.go
-		resolver.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/printer/ya.make b/contrib/go/_std_1.21/src/go/printer/ya.make
index b8a7c3eeb5f..e9cdc6b56a9 100644
--- a/contrib/go/_std_1.21/src/go/printer/ya.make
+++ b/contrib/go/_std_1.21/src/go/printer/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		comment.go
-		gobuild.go
-		nodes.go
-		printer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		comment.go
-		gobuild.go
-		nodes.go
-		printer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		comment.go
 		gobuild.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		nodes.go
 		printer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		comment.go
 		gobuild.go
 		nodes.go
 		printer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		comment.go
 		gobuild.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		nodes.go
 		printer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		comment.go
-		gobuild.go
-		nodes.go
-		printer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		comment.go
-		gobuild.go
-		nodes.go
-		printer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/scanner/ya.make b/contrib/go/_std_1.21/src/go/scanner/ya.make
index 34ae0ae8d7f..30160589896 100644
--- a/contrib/go/_std_1.21/src/go/scanner/ya.make
+++ b/contrib/go/_std_1.21/src/go/scanner/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		errors.go
-		scanner.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		errors.go
-		scanner.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		errors.go
 		scanner.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		errors.go
 		scanner.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		errors.go
 		scanner.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		errors.go
 		scanner.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		errors.go
 		scanner.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		errors.go
-		scanner.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		errors.go
-		scanner.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/token/ya.make b/contrib/go/_std_1.21/src/go/token/ya.make
index 3ee7b8e67fb..eac682f433c 100644
--- a/contrib/go/_std_1.21/src/go/token/ya.make
+++ b/contrib/go/_std_1.21/src/go/token/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		position.go
-		serialize.go
-		token.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		position.go
-		serialize.go
-		token.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		position.go
 		serialize.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		serialize.go
 		token.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		position.go
 		serialize.go
 		token.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		position.go
 		serialize.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		serialize.go
 		token.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		position.go
-		serialize.go
-		token.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		position.go
-		serialize.go
-		token.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/go/types/ya.make b/contrib/go/_std_1.21/src/go/types/ya.make
index 1329d2ddcb4..d204d2abe65 100644
--- a/contrib/go/_std_1.21/src/go/types/ya.make
+++ b/contrib/go/_std_1.21/src/go/types/ya.make
@@ -1,136 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		api.go
-		array.go
-		assignments.go
-		basic.go
-		builtins.go
-		call.go
-		chan.go
-		check.go
-		const.go
-		context.go
-		conversions.go
-		decl.go
-		errors.go
-		eval.go
-		expr.go
-		exprstring.go
-		gccgosizes.go
-		generate.go
-		index.go
-		infer.go
-		initorder.go
-		instantiate.go
-		interface.go
-		labels.go
-		lookup.go
-		map.go
-		methodset.go
-		mono.go
-		named.go
-		object.go
-		objset.go
-		operand.go
-		package.go
-		pointer.go
-		predicates.go
-		resolver.go
-		return.go
-		scope.go
-		selection.go
-		signature.go
-		sizes.go
-		slice.go
-		stmt.go
-		struct.go
-		subst.go
-		termlist.go
-		tuple.go
-		type.go
-		typelists.go
-		typeparam.go
-		typeset.go
-		typestring.go
-		typeterm.go
-		typexpr.go
-		under.go
-		unify.go
-		union.go
-		universe.go
-		util.go
-		validtype.go
-		version.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		api.go
-		array.go
-		assignments.go
-		basic.go
-		builtins.go
-		call.go
-		chan.go
-		check.go
-		const.go
-		context.go
-		conversions.go
-		decl.go
-		errors.go
-		eval.go
-		expr.go
-		exprstring.go
-		gccgosizes.go
-		generate.go
-		index.go
-		infer.go
-		initorder.go
-		instantiate.go
-		interface.go
-		labels.go
-		lookup.go
-		map.go
-		methodset.go
-		mono.go
-		named.go
-		object.go
-		objset.go
-		operand.go
-		package.go
-		pointer.go
-		predicates.go
-		resolver.go
-		return.go
-		scope.go
-		selection.go
-		signature.go
-		sizes.go
-		slice.go
-		stmt.go
-		struct.go
-		subst.go
-		termlist.go
-		tuple.go
-		type.go
-		typelists.go
-		typeparam.go
-		typeset.go
-		typestring.go
-		typeterm.go
-		typexpr.go
-		under.go
-		unify.go
-		union.go
-		universe.go
-		util.go
-		validtype.go
-		version.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		api.go
 		array.go
@@ -258,7 +127,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		validtype.go
 		version.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		api.go
 		array.go
@@ -322,7 +191,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		validtype.go
 		version.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		api.go
 		array.go
@@ -450,133 +319,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		validtype.go
 		version.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		api.go
-		array.go
-		assignments.go
-		basic.go
-		builtins.go
-		call.go
-		chan.go
-		check.go
-		const.go
-		context.go
-		conversions.go
-		decl.go
-		errors.go
-		eval.go
-		expr.go
-		exprstring.go
-		gccgosizes.go
-		generate.go
-		index.go
-		infer.go
-		initorder.go
-		instantiate.go
-		interface.go
-		labels.go
-		lookup.go
-		map.go
-		methodset.go
-		mono.go
-		named.go
-		object.go
-		objset.go
-		operand.go
-		package.go
-		pointer.go
-		predicates.go
-		resolver.go
-		return.go
-		scope.go
-		selection.go
-		signature.go
-		sizes.go
-		slice.go
-		stmt.go
-		struct.go
-		subst.go
-		termlist.go
-		tuple.go
-		type.go
-		typelists.go
-		typeparam.go
-		typeset.go
-		typestring.go
-		typeterm.go
-		typexpr.go
-		under.go
-		unify.go
-		union.go
-		universe.go
-		util.go
-		validtype.go
-		version.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		api.go
-		array.go
-		assignments.go
-		basic.go
-		builtins.go
-		call.go
-		chan.go
-		check.go
-		const.go
-		context.go
-		conversions.go
-		decl.go
-		errors.go
-		eval.go
-		expr.go
-		exprstring.go
-		gccgosizes.go
-		generate.go
-		index.go
-		infer.go
-		initorder.go
-		instantiate.go
-		interface.go
-		labels.go
-		lookup.go
-		map.go
-		methodset.go
-		mono.go
-		named.go
-		object.go
-		objset.go
-		operand.go
-		package.go
-		pointer.go
-		predicates.go
-		resolver.go
-		return.go
-		scope.go
-		selection.go
-		signature.go
-		sizes.go
-		slice.go
-		stmt.go
-		struct.go
-		subst.go
-		termlist.go
-		tuple.go
-		type.go
-		typelists.go
-		typeparam.go
-		typeset.go
-		typestring.go
-		typeterm.go
-		typexpr.go
-		under.go
-		unify.go
-		union.go
-		universe.go
-		util.go
-		validtype.go
-		version.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/adler32/ya.make b/contrib/go/_std_1.21/src/hash/adler32/ya.make
index 17b91589bbf..2131c538749 100644
--- a/contrib/go/_std_1.21/src/hash/adler32/ya.make
+++ b/contrib/go/_std_1.21/src/hash/adler32/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		adler32.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		adler32.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		adler32.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		adler32.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		adler32.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		adler32.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		adler32.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		adler32.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		adler32.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/crc32/ya.make b/contrib/go/_std_1.21/src/hash/crc32/ya.make
index c07bbbe9197..7b84dd1c2bd 100644
--- a/contrib/go/_std_1.21/src/hash/crc32/ya.make
+++ b/contrib/go/_std_1.21/src/hash/crc32/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		crc32.go
-		crc32_amd64.go
-		crc32_amd64.s
-		crc32_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		crc32.go
-		crc32_arm64.go
-		crc32_arm64.s
-		crc32_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		crc32.go
 		crc32_arm64.go
@@ -30,18 +13,18 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		crc32_amd64.s
 		crc32_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		crc32.go
 		crc32_arm64.go
 		crc32_arm64.s
 		crc32_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		crc32.go
-		crc32_arm64.go
-		crc32_arm64.s
+		crc32_amd64.go
+		crc32_amd64.s
 		crc32_generic.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		crc32_amd64.s
 		crc32_generic.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		crc32.go
-		crc32_arm64.go
-		crc32_arm64.s
-		crc32_generic.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		crc32.go
-		crc32_arm64.go
-		crc32_arm64.s
-		crc32_generic.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/crc64/ya.make b/contrib/go/_std_1.21/src/hash/crc64/ya.make
index 3eff48604bd..a9262bebac4 100644
--- a/contrib/go/_std_1.21/src/hash/crc64/ya.make
+++ b/contrib/go/_std_1.21/src/hash/crc64/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		crc64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		crc64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		crc64.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		crc64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		crc64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		crc64.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		crc64.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		crc64.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		crc64.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/fnv/ya.make b/contrib/go/_std_1.21/src/hash/fnv/ya.make
index a818380bf15..579b61daa57 100644
--- a/contrib/go/_std_1.21/src/hash/fnv/ya.make
+++ b/contrib/go/_std_1.21/src/hash/fnv/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		fnv.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		fnv.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		fnv.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		fnv.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		fnv.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		fnv.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		fnv.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		fnv.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		fnv.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/maphash/ya.make b/contrib/go/_std_1.21/src/hash/maphash/ya.make
index c1810a6bb07..cb9ff4f50a3 100644
--- a/contrib/go/_std_1.21/src/hash/maphash/ya.make
+++ b/contrib/go/_std_1.21/src/hash/maphash/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		maphash.go
-		maphash_runtime.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		maphash.go
-		maphash_runtime.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		maphash.go
 		maphash_runtime.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		maphash.go
 		maphash_runtime.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		maphash.go
 		maphash_runtime.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		maphash.go
 		maphash_runtime.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		maphash.go
 		maphash_runtime.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		maphash.go
-		maphash_runtime.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		maphash.go
-		maphash_runtime.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/hash/ya.make b/contrib/go/_std_1.21/src/hash/ya.make
index 3cfec455def..d06206ac4ba 100644
--- a/contrib/go/_std_1.21/src/hash/ya.make
+++ b/contrib/go/_std_1.21/src/hash/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		hash.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		hash.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		hash.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		hash.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		hash.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		hash.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		hash.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		hash.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		hash.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/html/template/ya.make b/contrib/go/_std_1.21/src/html/template/ya.make
index 1a9190a0b5d..fcb64adde5c 100644
--- a/contrib/go/_std_1.21/src/html/template/ya.make
+++ b/contrib/go/_std_1.21/src/html/template/ya.make
@@ -1,50 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		attr.go
-		attr_string.go
-		content.go
-		context.go
-		css.go
-		delim_string.go
-		doc.go
-		element_string.go
-		error.go
-		escape.go
-		html.go
-		js.go
-		jsctx_string.go
-		state_string.go
-		template.go
-		transition.go
-		url.go
-		urlpart_string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		attr.go
-		attr_string.go
-		content.go
-		context.go
-		css.go
-		delim_string.go
-		doc.go
-		element_string.go
-		error.go
-		escape.go
-		html.go
-		js.go
-		jsctx_string.go
-		state_string.go
-		template.go
-		transition.go
-		url.go
-		urlpart_string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		attr.go
 		attr_string.go
@@ -86,7 +41,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		url.go
 		urlpart_string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		attr.go
 		attr_string.go
@@ -107,7 +62,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		url.go
 		urlpart_string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		attr.go
 		attr_string.go
@@ -149,47 +104,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		url.go
 		urlpart_string.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		attr.go
-		attr_string.go
-		content.go
-		context.go
-		css.go
-		delim_string.go
-		doc.go
-		element_string.go
-		error.go
-		escape.go
-		html.go
-		js.go
-		jsctx_string.go
-		state_string.go
-		template.go
-		transition.go
-		url.go
-		urlpart_string.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		attr.go
-		attr_string.go
-		content.go
-		context.go
-		css.go
-		delim_string.go
-		doc.go
-		element_string.go
-		error.go
-		escape.go
-		html.go
-		js.go
-		jsctx_string.go
-		state_string.go
-		template.go
-		transition.go
-		url.go
-		urlpart_string.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/html/ya.make b/contrib/go/_std_1.21/src/html/ya.make
index bb9f0f8ed01..837669ff785 100644
--- a/contrib/go/_std_1.21/src/html/ya.make
+++ b/contrib/go/_std_1.21/src/html/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		entity.go
-		escape.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		entity.go
-		escape.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		entity.go
 		escape.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		entity.go
 		escape.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		entity.go
 		escape.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		entity.go
 		escape.go
@@ -37,16 +24,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		entity.go
 		escape.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		entity.go
-		escape.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		entity.go
-		escape.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/internal/abi/ya.make b/contrib/go/_std_1.21/src/internal/abi/ya.make
index a9c33ffe7a1..a2d0b67b1ae 100644
--- a/contrib/go/_std_1.21/src/internal/abi/ya.make
+++ b/contrib/go/_std_1.21/src/internal/abi/ya.make
@@ -1,36 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		abi.go
-		abi_amd64.go
-		abi_test.s
-		compiletype.go
-		funcpc.go
-		map.go
-		stack.go
-		stub.s
-		symtab.go
-		type.go
-		unsafestring_go120.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		abi.go
-		abi_arm64.go
-		abi_test.s
-		compiletype.go
-		funcpc.go
-		map.go
-		stack.go
-		stub.s
-		symtab.go
-		type.go
-		unsafestring_go120.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		abi.go
 		abi_arm64.go
@@ -58,7 +27,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		type.go
 		unsafestring_go120.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		abi.go
 		abi_arm64.go
@@ -72,10 +41,10 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		type.go
 		unsafestring_go120.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		abi.go
-		abi_arm64.go
+		abi_amd64.go
 		abi_test.s
 		compiletype.go
 		funcpc.go
@@ -100,33 +69,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		type.go
 		unsafestring_go120.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		abi.go
-		abi_arm64.go
-		abi_test.s
-		compiletype.go
-		funcpc.go
-		map.go
-		stack.go
-		stub.s
-		symtab.go
-		type.go
-		unsafestring_go120.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		abi.go
-		abi_arm64.go
-		abi_test.s
-		compiletype.go
-		funcpc.go
-		map.go
-		stack.go
-		stub.s
-		symtab.go
-		type.go
-		unsafestring_go120.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/bisect/ya.make b/contrib/go/_std_1.21/src/internal/bisect/ya.make
index 8670dbcd949..2ce7958a20e 100644
--- a/contrib/go/_std_1.21/src/internal/bisect/ya.make
+++ b/contrib/go/_std_1.21/src/internal/bisect/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bisect.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bisect.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bisect.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		bisect.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bisect.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bisect.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		bisect.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bisect.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bisect.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/buildcfg/ya.make b/contrib/go/_std_1.21/src/internal/buildcfg/ya.make
index 3b89f23a911..28879780de3 100644
--- a/contrib/go/_std_1.21/src/internal/buildcfg/ya.make
+++ b/contrib/go/_std_1.21/src/internal/buildcfg/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cfg.go
-		exp.go
-		zbootstrap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cfg.go
-		exp.go
-		zbootstrap.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cfg.go
 		exp.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		exp.go
 		zbootstrap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cfg.go
 		exp.go
 		zbootstrap.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cfg.go
 		exp.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		exp.go
 		zbootstrap.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cfg.go
-		exp.go
-		zbootstrap.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cfg.go
-		exp.go
-		zbootstrap.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/bytealg/ya.make b/contrib/go/_std_1.21/src/internal/bytealg/ya.make
index 8739cef5c6b..54a9f632a62 100644
--- a/contrib/go/_std_1.21/src/internal/bytealg/ya.make
+++ b/contrib/go/_std_1.21/src/internal/bytealg/ya.make
@@ -1,40 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bytealg.go
-		compare_amd64.s
-		compare_native.go
-		count_amd64.s
-		count_native.go
-		equal_amd64.s
-		equal_generic.go
-		equal_native.go
-		index_amd64.go
-		index_amd64.s
-		index_native.go
-		indexbyte_amd64.s
-		indexbyte_native.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bytealg.go
-		compare_arm64.s
-		compare_native.go
-		count_arm64.s
-		count_native.go
-		equal_arm64.s
-		equal_generic.go
-		equal_native.go
-		index_arm64.go
-		index_arm64.s
-		index_native.go
-		indexbyte_arm64.s
-		indexbyte_native.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bytealg.go
 		compare_arm64.s
@@ -66,7 +31,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		indexbyte_amd64.s
 		indexbyte_native.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bytealg.go
 		compare_arm64.s
@@ -82,20 +47,20 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		indexbyte_arm64.s
 		indexbyte_native.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bytealg.go
-		compare_arm64.s
+		compare_amd64.s
 		compare_native.go
-		count_arm64.s
+		count_amd64.s
 		count_native.go
-		equal_arm64.s
+		equal_amd64.s
 		equal_generic.go
 		equal_native.go
-		index_arm64.go
-		index_arm64.s
+		index_amd64.go
+		index_amd64.s
 		index_native.go
-		indexbyte_arm64.s
+		indexbyte_amd64.s
 		indexbyte_native.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -114,37 +79,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		indexbyte_amd64.s
 		indexbyte_native.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bytealg.go
-		compare_arm64.s
-		compare_native.go
-		count_arm64.s
-		count_native.go
-		equal_arm64.s
-		equal_generic.go
-		equal_native.go
-		index_arm64.go
-		index_arm64.s
-		index_native.go
-		indexbyte_arm64.s
-		indexbyte_native.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bytealg.go
-		compare_arm64.s
-		compare_native.go
-		count_arm64.s
-		count_native.go
-		equal_arm64.s
-		equal_generic.go
-		equal_native.go
-		index_arm64.go
-		index_arm64.s
-		index_native.go
-		indexbyte_arm64.s
-		indexbyte_native.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/calloc/ya.make b/contrib/go/_std_1.21/src/internal/coverage/calloc/ya.make
index bab9306060a..4dd6c4f61e5 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/calloc/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/calloc/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		batchcounteralloc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		batchcounteralloc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		batchcounteralloc.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		batchcounteralloc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		batchcounteralloc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		batchcounteralloc.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		batchcounteralloc.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		batchcounteralloc.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		batchcounteralloc.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/cformat/ya.make b/contrib/go/_std_1.21/src/internal/coverage/cformat/ya.make
index 3b1ec6e0208..b63c869d62f 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/cformat/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/cformat/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		format.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		format.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		format.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		format.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		format.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		format.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		format.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		format.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		format.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/cmerge/ya.make b/contrib/go/_std_1.21/src/internal/coverage/cmerge/ya.make
index aa462840d33..7e430d769ce 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/cmerge/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/cmerge/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		merge.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		merge.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		merge.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		merge.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		merge.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		merge.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		merge.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		merge.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		merge.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/decodecounter/ya.make b/contrib/go/_std_1.21/src/internal/coverage/decodecounter/ya.make
index ae151058b6b..f4f645af118 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/decodecounter/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/decodecounter/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		decodecounterfile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		decodecounterfile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		decodecounterfile.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		decodecounterfile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		decodecounterfile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		decodecounterfile.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		decodecounterfile.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		decodecounterfile.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		decodecounterfile.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/decodemeta/ya.make b/contrib/go/_std_1.21/src/internal/coverage/decodemeta/ya.make
index 232427c0813..ed4726e613b 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/decodemeta/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/decodemeta/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		decode.go
-		decodefile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		decode.go
-		decodefile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		decode.go
 		decodefile.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		decode.go
 		decodefile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		decode.go
 		decodefile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		decode.go
 		decodefile.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		decode.go
 		decodefile.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		decode.go
-		decodefile.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		decode.go
-		decodefile.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/encodecounter/ya.make b/contrib/go/_std_1.21/src/internal/coverage/encodecounter/ya.make
index 1f729b34635..54fd36fec76 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/encodecounter/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/encodecounter/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encode.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		encode.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encode.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encode.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		encode.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encode.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encode.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/encodemeta/ya.make b/contrib/go/_std_1.21/src/internal/coverage/encodemeta/ya.make
index 6660cfa5a60..b5c4d8335b2 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/encodemeta/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/encodemeta/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encode.go
-		encodefile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		encodefile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encode.go
 		encodefile.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		encode.go
 		encodefile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encode.go
 		encodefile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encode.go
 		encodefile.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		encode.go
 		encodefile.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		encodefile.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encode.go
-		encodefile.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/pods/ya.make b/contrib/go/_std_1.21/src/internal/coverage/pods/ya.make
index 692d991bd8e..94ea30121ec 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/pods/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/pods/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		pods.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		pods.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		pods.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		pods.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		pods.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		pods.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		pods.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		pods.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		pods.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/rtcov/ya.make b/contrib/go/_std_1.21/src/internal/coverage/rtcov/ya.make
index 87b9e5d2f87..6936ebf777e 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/rtcov/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/rtcov/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		rtcov.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		rtcov.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		rtcov.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		rtcov.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		rtcov.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		rtcov.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		rtcov.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		rtcov.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		rtcov.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/slicereader/ya.make b/contrib/go/_std_1.21/src/internal/coverage/slicereader/ya.make
index d6dbecb5876..96777d26e53 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/slicereader/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/slicereader/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		slicereader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		slicereader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		slicereader.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		slicereader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		slicereader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		slicereader.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		slicereader.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		slicereader.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		slicereader.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/slicewriter/ya.make b/contrib/go/_std_1.21/src/internal/coverage/slicewriter/ya.make
index 5691f874aa5..42cf877d52a 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/slicewriter/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/slicewriter/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		slicewriter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		slicewriter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		slicewriter.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		slicewriter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		slicewriter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		slicewriter.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		slicewriter.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		slicewriter.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		slicewriter.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/stringtab/ya.make b/contrib/go/_std_1.21/src/internal/coverage/stringtab/ya.make
index e8ed75ca210..3614be5508d 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/stringtab/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/stringtab/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		stringtab.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		stringtab.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		stringtab.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		stringtab.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		stringtab.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		stringtab.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		stringtab.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		stringtab.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		stringtab.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/uleb128/ya.make b/contrib/go/_std_1.21/src/internal/coverage/uleb128/ya.make
index 13f14f64dce..89124dfce46 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/uleb128/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/uleb128/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		uleb128.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		uleb128.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		uleb128.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		uleb128.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		uleb128.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		uleb128.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		uleb128.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		uleb128.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		uleb128.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/coverage/ya.make b/contrib/go/_std_1.21/src/internal/coverage/ya.make
index e80211fc8fb..d4dd93f2d48 100644
--- a/contrib/go/_std_1.21/src/internal/coverage/ya.make
+++ b/contrib/go/_std_1.21/src/internal/coverage/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cmddefs.go
-		defs.go
-		pkid.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cmddefs.go
-		defs.go
-		pkid.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cmddefs.go
 		defs.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		defs.go
 		pkid.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cmddefs.go
 		defs.go
 		pkid.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cmddefs.go
 		defs.go
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		defs.go
 		pkid.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cmddefs.go
-		defs.go
-		pkid.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cmddefs.go
-		defs.go
-		pkid.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/internal/cpu/ya.make b/contrib/go/_std_1.21/src/internal/cpu/ya.make
index c5908e914f2..b78d82e739a 100644
--- a/contrib/go/_std_1.21/src/internal/cpu/ya.make
+++ b/contrib/go/_std_1.21/src/internal/cpu/ya.make
@@ -1,32 +1,11 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cpu.go
-		cpu.s
-		cpu_x86.go
-		cpu_x86.s
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cpu.go
 		cpu.s
 		cpu_arm64.go
 		cpu_arm64.s
-		cpu_arm64_hwcap.go
-		cpu_arm64_linux.go
-		cpu_no_name.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		cpu.go
-		cpu.s
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_arm64_hwcap.go
-		cpu_arm64_linux.go
+		cpu_arm64_darwin.go
 		cpu_no_name.go
     )
 ELSEIF (OS_DARWIN AND ARCH_X86_64)
@@ -36,23 +15,22 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		cpu_x86.go
 		cpu_x86.s
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cpu.go
 		cpu.s
 		cpu_arm64.go
 		cpu_arm64.s
-		cpu_arm64_darwin.go
+		cpu_arm64_hwcap.go
+		cpu_arm64_linux.go
 		cpu_no_name.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cpu.go
 		cpu.s
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_arm64_darwin.go
-		cpu_no_name.go
+		cpu_x86.go
+		cpu_x86.s
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -61,23 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		cpu_x86.go
 		cpu_x86.s
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cpu.go
-		cpu.s
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_arm64_other.go
-		cpu_no_name.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cpu.go
-		cpu.s
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_arm64_other.go
-		cpu_no_name.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/fmtsort/ya.make b/contrib/go/_std_1.21/src/internal/fmtsort/ya.make
index 1495e17bbe5..f3f17b9e1e1 100644
--- a/contrib/go/_std_1.21/src/internal/fmtsort/ya.make
+++ b/contrib/go/_std_1.21/src/internal/fmtsort/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		sort.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		sort.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		sort.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		sort.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		sort.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		sort.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		sort.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		sort.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		sort.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/fuzz/ya.make b/contrib/go/_std_1.21/src/internal/fuzz/ya.make
index da45aaa1a63..4dd7f49d8bb 100644
--- a/contrib/go/_std_1.21/src/internal/fuzz/ya.make
+++ b/contrib/go/_std_1.21/src/internal/fuzz/ya.make
@@ -1,40 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		counters_supported.go
-		coverage.go
-		encoding.go
-		fuzz.go
-		mem.go
-		minimize.go
-		mutator.go
-		mutators_byteslice.go
-		pcg.go
-		queue.go
-		sys_posix.go
-		trace.go
-		worker.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		counters_supported.go
-		coverage.go
-		encoding.go
-		fuzz.go
-		mem.go
-		minimize.go
-		mutator.go
-		mutators_byteslice.go
-		pcg.go
-		queue.go
-		sys_posix.go
-		trace.go
-		worker.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		counters_supported.go
 		coverage.go
@@ -66,7 +31,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		trace.go
 		worker.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		counters_supported.go
 		coverage.go
@@ -82,7 +47,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		trace.go
 		worker.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		counters_supported.go
 		coverage.go
@@ -114,37 +79,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		trace.go
 		worker.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		counters_supported.go
-		coverage.go
-		encoding.go
-		fuzz.go
-		mem.go
-		minimize.go
-		mutator.go
-		mutators_byteslice.go
-		pcg.go
-		queue.go
-		sys_windows.go
-		trace.go
-		worker.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		counters_supported.go
-		coverage.go
-		encoding.go
-		fuzz.go
-		mem.go
-		minimize.go
-		mutator.go
-		mutators_byteslice.go
-		pcg.go
-		queue.go
-		sys_windows.go
-		trace.go
-		worker.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/goarch/ya.make b/contrib/go/_std_1.21/src/internal/goarch/ya.make
index 178aec34f94..a92619ee483 100644
--- a/contrib/go/_std_1.21/src/internal/goarch/ya.make
+++ b/contrib/go/_std_1.21/src/internal/goarch/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		goarch.go
-		goarch_amd64.go
-		zgoarch_amd64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		goarch.go
-		goarch_arm64.go
-		zgoarch_arm64.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		goarch.go
 		goarch_arm64.go
@@ -26,17 +11,17 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		goarch_amd64.go
 		zgoarch_amd64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		goarch.go
 		goarch_arm64.go
 		zgoarch_arm64.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		goarch.go
-		goarch_arm64.go
-		zgoarch_arm64.go
+		goarch_amd64.go
+		zgoarch_amd64.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		goarch_amd64.go
 		zgoarch_amd64.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		goarch.go
-		goarch_arm64.go
-		zgoarch_arm64.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		goarch.go
-		goarch_arm64.go
-		zgoarch_arm64.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/godebug/ya.make b/contrib/go/_std_1.21/src/internal/godebug/ya.make
index b8a43b97166..17990fc219e 100644
--- a/contrib/go/_std_1.21/src/internal/godebug/ya.make
+++ b/contrib/go/_std_1.21/src/internal/godebug/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		godebug.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		godebug.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		godebug.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		godebug.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		godebug.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		godebug.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		godebug.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		godebug.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		godebug.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/godebugs/ya.make b/contrib/go/_std_1.21/src/internal/godebugs/ya.make
index f0e8c277e39..efce5680d30 100644
--- a/contrib/go/_std_1.21/src/internal/godebugs/ya.make
+++ b/contrib/go/_std_1.21/src/internal/godebugs/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		table.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		table.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		table.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		table.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		table.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		table.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		table.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		table.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		table.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/goexperiment/ya.make b/contrib/go/_std_1.21/src/internal/goexperiment/ya.make
index f2c87180604..1e72b9b0536 100644
--- a/contrib/go/_std_1.21/src/internal/goexperiment/ya.make
+++ b/contrib/go/_std_1.21/src/internal/goexperiment/ya.make
@@ -1,42 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exp_arenas_off.go
-		exp_boringcrypto_off.go
-		exp_cacheprog_off.go
-		exp_cgocheck2_off.go
-		exp_coverageredesign_off.go
-		exp_fieldtrack_off.go
-		exp_heapminimum512kib_off.go
-		exp_loopvar_off.go
-		exp_pagetrace_off.go
-		exp_preemptibleloops_off.go
-		exp_regabiargs_off.go
-		exp_regabiwrappers_off.go
-		exp_staticlockranking_off.go
-		flags.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exp_arenas_off.go
-		exp_boringcrypto_off.go
-		exp_cacheprog_off.go
-		exp_cgocheck2_off.go
-		exp_coverageredesign_off.go
-		exp_fieldtrack_off.go
-		exp_heapminimum512kib_off.go
-		exp_loopvar_off.go
-		exp_pagetrace_off.go
-		exp_preemptibleloops_off.go
-		exp_regabiargs_off.go
-		exp_regabiwrappers_off.go
-		exp_staticlockranking_off.go
-		flags.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exp_arenas_off.go
 		exp_boringcrypto_off.go
@@ -70,7 +33,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		exp_staticlockranking_off.go
 		flags.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exp_arenas_off.go
 		exp_boringcrypto_off.go
@@ -87,7 +50,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		exp_staticlockranking_off.go
 		flags.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exp_arenas_off.go
 		exp_boringcrypto_off.go
@@ -121,39 +84,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		exp_staticlockranking_off.go
 		flags.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exp_arenas_off.go
-		exp_boringcrypto_off.go
-		exp_cacheprog_off.go
-		exp_cgocheck2_off.go
-		exp_coverageredesign_off.go
-		exp_fieldtrack_off.go
-		exp_heapminimum512kib_off.go
-		exp_loopvar_off.go
-		exp_pagetrace_off.go
-		exp_preemptibleloops_off.go
-		exp_regabiargs_off.go
-		exp_regabiwrappers_off.go
-		exp_staticlockranking_off.go
-		flags.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exp_arenas_off.go
-		exp_boringcrypto_off.go
-		exp_cacheprog_off.go
-		exp_cgocheck2_off.go
-		exp_coverageredesign_off.go
-		exp_fieldtrack_off.go
-		exp_heapminimum512kib_off.go
-		exp_loopvar_off.go
-		exp_pagetrace_off.go
-		exp_preemptibleloops_off.go
-		exp_regabiargs_off.go
-		exp_regabiwrappers_off.go
-		exp_staticlockranking_off.go
-		flags.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/goos/ya.make b/contrib/go/_std_1.21/src/internal/goos/ya.make
index bec3f865cba..2714d1876da 100644
--- a/contrib/go/_std_1.21/src/internal/goos/ya.make
+++ b/contrib/go/_std_1.21/src/internal/goos/ya.make
@@ -1,24 +1,9 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		goos.go
-		unix.go
-		zgoos_linux.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		goos.go
 		unix.go
-		zgoos_linux.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		goos.go
-		unix.go
-		zgoos_linux.go
+		zgoos_darwin.go
     )
 ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
@@ -26,17 +11,17 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		unix.go
 		zgoos_darwin.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		goos.go
 		unix.go
-		zgoos_darwin.go
+		zgoos_linux.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		goos.go
 		unix.go
-		zgoos_darwin.go
+		zgoos_linux.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		nonunix.go
 		zgoos_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		goos.go
-		nonunix.go
-		zgoos_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		goos.go
-		nonunix.go
-		zgoos_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/goroot/ya.make b/contrib/go/_std_1.21/src/internal/goroot/ya.make
index 227620fbe87..70b30a55734 100644
--- a/contrib/go/_std_1.21/src/internal/goroot/ya.make
+++ b/contrib/go/_std_1.21/src/internal/goroot/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		gc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		gc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		gc.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		gc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		gc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		gc.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		gc.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		gc.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		gc.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/goversion/ya.make b/contrib/go/_std_1.21/src/internal/goversion/ya.make
index 0fbbf521bc5..4282916c6e6 100644
--- a/contrib/go/_std_1.21/src/internal/goversion/ya.make
+++ b/contrib/go/_std_1.21/src/internal/goversion/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		goversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		goversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		goversion.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		goversion.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		goversion.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		goversion.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		goversion.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		goversion.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		goversion.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/intern/ya.make b/contrib/go/_std_1.21/src/internal/intern/ya.make
index c98cc0fb104..cc3f09f8f08 100644
--- a/contrib/go/_std_1.21/src/internal/intern/ya.make
+++ b/contrib/go/_std_1.21/src/internal/intern/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		intern.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		intern.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		intern.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		intern.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		intern.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		intern.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		intern.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		intern.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		intern.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/itoa/ya.make b/contrib/go/_std_1.21/src/internal/itoa/ya.make
index 32d50fbaa7e..c5a6e4a0538 100644
--- a/contrib/go/_std_1.21/src/internal/itoa/ya.make
+++ b/contrib/go/_std_1.21/src/internal/itoa/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		itoa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		itoa.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		itoa.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		itoa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		itoa.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		itoa.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		itoa.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		itoa.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		itoa.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/lazyregexp/ya.make b/contrib/go/_std_1.21/src/internal/lazyregexp/ya.make
index 69c60313643..9a39f1b7de4 100644
--- a/contrib/go/_std_1.21/src/internal/lazyregexp/ya.make
+++ b/contrib/go/_std_1.21/src/internal/lazyregexp/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		lazyre.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		lazyre.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		lazyre.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		lazyre.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		lazyre.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		lazyre.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		lazyre.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		lazyre.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		lazyre.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/nettrace/ya.make b/contrib/go/_std_1.21/src/internal/nettrace/ya.make
index 8ee75860d33..02f39268e7a 100644
--- a/contrib/go/_std_1.21/src/internal/nettrace/ya.make
+++ b/contrib/go/_std_1.21/src/internal/nettrace/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		nettrace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		nettrace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		nettrace.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		nettrace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		nettrace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		nettrace.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		nettrace.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		nettrace.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		nettrace.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/oserror/ya.make b/contrib/go/_std_1.21/src/internal/oserror/ya.make
index 2111b9cd9b1..dba287473f4 100644
--- a/contrib/go/_std_1.21/src/internal/oserror/ya.make
+++ b/contrib/go/_std_1.21/src/internal/oserror/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		errors.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		errors.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		errors.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		errors.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		errors.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		errors.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		errors.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		errors.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		errors.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/pkgbits/ya.make b/contrib/go/_std_1.21/src/internal/pkgbits/ya.make
index 49ebcf4ede2..b09ada8de99 100644
--- a/contrib/go/_std_1.21/src/internal/pkgbits/ya.make
+++ b/contrib/go/_std_1.21/src/internal/pkgbits/ya.make
@@ -1,32 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		codes.go
-		decoder.go
-		doc.go
-		encoder.go
-		flags.go
-		reloc.go
-		support.go
-		sync.go
-		syncmarker_string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		codes.go
-		decoder.go
-		doc.go
-		encoder.go
-		flags.go
-		reloc.go
-		support.go
-		sync.go
-		syncmarker_string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		codes.go
 		decoder.go
@@ -50,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sync.go
 		syncmarker_string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		codes.go
 		decoder.go
@@ -62,7 +35,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		sync.go
 		syncmarker_string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		codes.go
 		decoder.go
@@ -86,29 +59,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sync.go
 		syncmarker_string.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		codes.go
-		decoder.go
-		doc.go
-		encoder.go
-		flags.go
-		reloc.go
-		support.go
-		sync.go
-		syncmarker_string.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		codes.go
-		decoder.go
-		doc.go
-		encoder.go
-		flags.go
-		reloc.go
-		support.go
-		sync.go
-		syncmarker_string.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/platform/ya.make b/contrib/go/_std_1.21/src/internal/platform/ya.make
index 5bafe357942..66560d68366 100644
--- a/contrib/go/_std_1.21/src/internal/platform/ya.make
+++ b/contrib/go/_std_1.21/src/internal/platform/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		supported.go
-		zosarch.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		supported.go
-		zosarch.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		supported.go
 		zosarch.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		supported.go
 		zosarch.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		supported.go
 		zosarch.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		supported.go
 		zosarch.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		supported.go
 		zosarch.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		supported.go
-		zosarch.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		supported.go
-		zosarch.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/poll/ya.make b/contrib/go/_std_1.21/src/internal/poll/ya.make
index d52f4cff59d..6dbd41f797c 100644
--- a/contrib/go/_std_1.21/src/internal/poll/ya.make
+++ b/contrib/go/_std_1.21/src/internal/poll/ya.make
@@ -1,53 +1,44 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
-		copy_file_range_linux.go
 		errno_unix.go
 		fd.go
-		fd_fsync_posix.go
+		fd_fsync_darwin.go
 		fd_mutex.go
+		fd_opendir_darwin.go
 		fd_poll_runtime.go
 		fd_posix.go
 		fd_unix.go
 		fd_unixjs.go
-		fd_writev_unix.go
-		hook_cloexec.go
+		fd_writev_libc.go
 		hook_unix.go
 		iovec_unix.go
-		sendfile_linux.go
-		sock_cloexec.go
+		sendfile_bsd.go
 		sockopt.go
-		sockopt_linux.go
 		sockopt_unix.go
 		sockoptip.go
-		splice_linux.go
+		sys_cloexec.go
 		writev.go
     )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
-		copy_file_range_linux.go
 		errno_unix.go
 		fd.go
-		fd_fsync_posix.go
+		fd_fsync_darwin.go
 		fd_mutex.go
+		fd_opendir_darwin.go
 		fd_poll_runtime.go
 		fd_posix.go
 		fd_unix.go
 		fd_unixjs.go
-		fd_writev_unix.go
-		hook_cloexec.go
+		fd_writev_libc.go
 		hook_unix.go
 		iovec_unix.go
-		sendfile_linux.go
-		sock_cloexec_accept.go
+		sendfile_bsd.go
 		sockopt.go
-		sockopt_linux.go
 		sockopt_unix.go
 		sockoptip.go
-		splice_linux.go
+		sys_cloexec.go
 		writev.go
     )
 ELSEIF (OS_LINUX AND ARCH_AARCH64)
@@ -74,67 +65,28 @@ ELSEIF (OS_LINUX AND ARCH_AARCH64)
 		splice_linux.go
 		writev.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		errno_unix.go
-		fd.go
-		fd_fsync_darwin.go
-		fd_mutex.go
-		fd_opendir_darwin.go
-		fd_poll_runtime.go
-		fd_posix.go
-		fd_unix.go
-		fd_unixjs.go
-		fd_writev_libc.go
-		hook_unix.go
-		iovec_unix.go
-		sendfile_bsd.go
-		sockopt.go
-		sockopt_unix.go
-		sockoptip.go
-		sys_cloexec.go
-		writev.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		errno_unix.go
-		fd.go
-		fd_fsync_darwin.go
-		fd_mutex.go
-		fd_opendir_darwin.go
-		fd_poll_runtime.go
-		fd_posix.go
-		fd_unix.go
-		fd_unixjs.go
-		fd_writev_libc.go
-		hook_unix.go
-		iovec_unix.go
-		sendfile_bsd.go
-		sockopt.go
-		sockopt_unix.go
-		sockoptip.go
-		sys_cloexec.go
-		writev.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
+		copy_file_range_linux.go
 		errno_unix.go
 		fd.go
-		fd_fsync_darwin.go
+		fd_fsync_posix.go
 		fd_mutex.go
-		fd_opendir_darwin.go
 		fd_poll_runtime.go
 		fd_posix.go
 		fd_unix.go
 		fd_unixjs.go
-		fd_writev_libc.go
+		fd_writev_unix.go
+		hook_cloexec.go
 		hook_unix.go
 		iovec_unix.go
-		sendfile_bsd.go
+		sendfile_linux.go
+		sock_cloexec.go
 		sockopt.go
+		sockopt_linux.go
 		sockopt_unix.go
 		sockoptip.go
-		sys_cloexec.go
+		splice_linux.go
 		writev.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -152,35 +104,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sockopt_windows.go
 		sockoptip.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		errno_windows.go
-		fd.go
-		fd_fsync_windows.go
-		fd_mutex.go
-		fd_poll_runtime.go
-		fd_posix.go
-		fd_windows.go
-		hook_windows.go
-		sendfile_windows.go
-		sockopt.go
-		sockopt_windows.go
-		sockoptip.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		errno_windows.go
-		fd.go
-		fd_fsync_windows.go
-		fd_mutex.go
-		fd_poll_runtime.go
-		fd_posix.go
-		fd_windows.go
-		hook_windows.go
-		sendfile_windows.go
-		sockopt.go
-		sockopt_windows.go
-		sockoptip.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/profile/ya.make b/contrib/go/_std_1.21/src/internal/profile/ya.make
index 1021a68a50c..ea9a4a6d609 100644
--- a/contrib/go/_std_1.21/src/internal/profile/ya.make
+++ b/contrib/go/_std_1.21/src/internal/profile/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encode.go
-		filter.go
-		legacy_profile.go
-		merge.go
-		profile.go
-		proto.go
-		prune.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		filter.go
-		legacy_profile.go
-		merge.go
-		profile.go
-		proto.go
-		prune.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encode.go
 		filter.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		proto.go
 		prune.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encode.go
 		filter.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		proto.go
 		prune.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encode.go
 		filter.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		proto.go
 		prune.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		filter.go
-		legacy_profile.go
-		merge.go
-		profile.go
-		proto.go
-		prune.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encode.go
-		filter.go
-		legacy_profile.go
-		merge.go
-		profile.go
-		proto.go
-		prune.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/reflectlite/ya.make b/contrib/go/_std_1.21/src/internal/reflectlite/ya.make
index 873be220207..ba8bb67087c 100644
--- a/contrib/go/_std_1.21/src/internal/reflectlite/ya.make
+++ b/contrib/go/_std_1.21/src/internal/reflectlite/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		asm.s
-		swapper.go
-		type.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		asm.s
-		swapper.go
-		type.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		asm.s
 		swapper.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		type.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		asm.s
 		swapper.go
 		type.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		asm.s
 		swapper.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		type.go
 		value.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		asm.s
-		swapper.go
-		type.go
-		value.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		asm.s
-		swapper.go
-		type.go
-		value.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/safefilepath/ya.make b/contrib/go/_std_1.21/src/internal/safefilepath/ya.make
index 6c9824fa371..7210f9a7962 100644
--- a/contrib/go/_std_1.21/src/internal/safefilepath/ya.make
+++ b/contrib/go/_std_1.21/src/internal/safefilepath/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		path.go
-		path_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		path.go
-		path_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		path.go
 		path_other.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		path.go
 		path_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		path.go
 		path_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		path.go
 		path_other.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		path.go
 		path_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		path.go
-		path_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		path.go
-		path_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/saferio/ya.make b/contrib/go/_std_1.21/src/internal/saferio/ya.make
index 42c67907f1d..ff5b76b6049 100644
--- a/contrib/go/_std_1.21/src/internal/saferio/ya.make
+++ b/contrib/go/_std_1.21/src/internal/saferio/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		io.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		io.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		io.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		io.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		io.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		io.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		io.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		io.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		io.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/singleflight/ya.make b/contrib/go/_std_1.21/src/internal/singleflight/ya.make
index b3cfccd747c..20e591a0e4a 100644
--- a/contrib/go/_std_1.21/src/internal/singleflight/ya.make
+++ b/contrib/go/_std_1.21/src/internal/singleflight/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		singleflight.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		singleflight.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		singleflight.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		singleflight.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		singleflight.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		singleflight.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		singleflight.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		singleflight.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		singleflight.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/syscall/execenv/ya.make b/contrib/go/_std_1.21/src/internal/syscall/execenv/ya.make
index 7a312616882..f3e0986c125 100644
--- a/contrib/go/_std_1.21/src/internal/syscall/execenv/ya.make
+++ b/contrib/go/_std_1.21/src/internal/syscall/execenv/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		execenv_default.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		execenv_default.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		execenv_default.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		execenv_default.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		execenv_default.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		execenv_default.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		execenv_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		execenv_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		execenv_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/sysinfo/ya.make b/contrib/go/_std_1.21/src/internal/sysinfo/ya.make
index 183820f3f94..760dbe8178a 100644
--- a/contrib/go/_std_1.21/src/internal/sysinfo/ya.make
+++ b/contrib/go/_std_1.21/src/internal/sysinfo/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		sysinfo.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		sysinfo.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		sysinfo.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		sysinfo.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		sysinfo.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		sysinfo.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		sysinfo.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		sysinfo.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		sysinfo.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/testlog/ya.make b/contrib/go/_std_1.21/src/internal/testlog/ya.make
index e88ed95a2a2..5aeba79df6d 100644
--- a/contrib/go/_std_1.21/src/internal/testlog/ya.make
+++ b/contrib/go/_std_1.21/src/internal/testlog/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exit.go
-		log.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exit.go
-		log.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exit.go
 		log.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		exit.go
 		log.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exit.go
 		log.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exit.go
 		log.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		exit.go
 		log.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exit.go
-		log.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exit.go
-		log.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/types/errors/ya.make b/contrib/go/_std_1.21/src/internal/types/errors/ya.make
index 975f2b96f28..0fcb8c72926 100644
--- a/contrib/go/_std_1.21/src/internal/types/errors/ya.make
+++ b/contrib/go/_std_1.21/src/internal/types/errors/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		code_string.go
-		codes.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		code_string.go
-		codes.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		code_string.go
 		codes.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		code_string.go
 		codes.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		code_string.go
 		codes.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		code_string.go
 		codes.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		code_string.go
 		codes.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		code_string.go
-		codes.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		code_string.go
-		codes.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/unsafeheader/ya.make b/contrib/go/_std_1.21/src/internal/unsafeheader/ya.make
index c675a0f76b1..36399c2d293 100644
--- a/contrib/go/_std_1.21/src/internal/unsafeheader/ya.make
+++ b/contrib/go/_std_1.21/src/internal/unsafeheader/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		unsafeheader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		unsafeheader.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		unsafeheader.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		unsafeheader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		unsafeheader.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		unsafeheader.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		unsafeheader.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		unsafeheader.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		unsafeheader.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/xcoff/ya.make b/contrib/go/_std_1.21/src/internal/xcoff/ya.make
index becc5b6c14a..8ad472a24d7 100644
--- a/contrib/go/_std_1.21/src/internal/xcoff/ya.make
+++ b/contrib/go/_std_1.21/src/internal/xcoff/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ar.go
-		file.go
-		xcoff.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ar.go
-		file.go
-		xcoff.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ar.go
 		file.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		file.go
 		xcoff.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ar.go
 		file.go
 		xcoff.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ar.go
 		file.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		file.go
 		xcoff.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ar.go
-		file.go
-		xcoff.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ar.go
-		file.go
-		xcoff.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/internal/zstd/ya.make b/contrib/go/_std_1.21/src/internal/zstd/ya.make
index 2929d41ca66..980cc19f307 100644
--- a/contrib/go/_std_1.21/src/internal/zstd/ya.make
+++ b/contrib/go/_std_1.21/src/internal/zstd/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bits.go
-		block.go
-		fse.go
-		huff.go
-		literals.go
-		xxhash.go
-		zstd.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bits.go
-		block.go
-		fse.go
-		huff.go
-		literals.go
-		xxhash.go
-		zstd.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bits.go
 		block.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		xxhash.go
 		zstd.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bits.go
 		block.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		xxhash.go
 		zstd.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bits.go
 		block.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		xxhash.go
 		zstd.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bits.go
-		block.go
-		fse.go
-		huff.go
-		literals.go
-		xxhash.go
-		zstd.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bits.go
-		block.go
-		fse.go
-		huff.go
-		literals.go
-		xxhash.go
-		zstd.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/io/fs/ya.make b/contrib/go/_std_1.21/src/io/fs/ya.make
index 59bf9f1b950..0c59cfd0af7 100644
--- a/contrib/go/_std_1.21/src/io/fs/ya.make
+++ b/contrib/go/_std_1.21/src/io/fs/ya.make
@@ -1,30 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		format.go
-		fs.go
-		glob.go
-		readdir.go
-		readfile.go
-		stat.go
-		sub.go
-		walk.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		format.go
-		fs.go
-		glob.go
-		readdir.go
-		readfile.go
-		stat.go
-		sub.go
-		walk.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		format.go
 		fs.go
@@ -46,7 +21,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sub.go
 		walk.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		format.go
 		fs.go
@@ -57,7 +32,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		sub.go
 		walk.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		format.go
 		fs.go
@@ -79,27 +54,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sub.go
 		walk.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		format.go
-		fs.go
-		glob.go
-		readdir.go
-		readfile.go
-		stat.go
-		sub.go
-		walk.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		format.go
-		fs.go
-		glob.go
-		readdir.go
-		readfile.go
-		stat.go
-		sub.go
-		walk.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/io/ioutil/ya.make b/contrib/go/_std_1.21/src/io/ioutil/ya.make
index 8dbd6013e5b..08d4de45d0d 100644
--- a/contrib/go/_std_1.21/src/io/ioutil/ya.make
+++ b/contrib/go/_std_1.21/src/io/ioutil/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ioutil.go
-		tempfile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ioutil.go
-		tempfile.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ioutil.go
 		tempfile.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		ioutil.go
 		tempfile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ioutil.go
 		tempfile.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ioutil.go
 		tempfile.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		ioutil.go
 		tempfile.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ioutil.go
-		tempfile.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ioutil.go
-		tempfile.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/io/ya.make b/contrib/go/_std_1.21/src/io/ya.make
index 1e797e814de..8088b842aae 100644
--- a/contrib/go/_std_1.21/src/io/ya.make
+++ b/contrib/go/_std_1.21/src/io/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		io.go
-		multi.go
-		pipe.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		io.go
-		multi.go
-		pipe.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		io.go
 		multi.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		multi.go
 		pipe.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		io.go
 		multi.go
 		pipe.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		io.go
 		multi.go
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		multi.go
 		pipe.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		io.go
-		multi.go
-		pipe.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		io.go
-		multi.go
-		pipe.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/log/internal/ya.make b/contrib/go/_std_1.21/src/log/internal/ya.make
index 7c50112ee9d..55f44526f91 100644
--- a/contrib/go/_std_1.21/src/log/internal/ya.make
+++ b/contrib/go/_std_1.21/src/log/internal/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		internal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		internal.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		internal.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		internal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		internal.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		internal.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		internal.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		internal.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		internal.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/log/slog/internal/benchmarks/ya.make b/contrib/go/_std_1.21/src/log/slog/internal/benchmarks/ya.make
index 6fa46f8e845..4c5ed013acd 100644
--- a/contrib/go/_std_1.21/src/log/slog/internal/benchmarks/ya.make
+++ b/contrib/go/_std_1.21/src/log/slog/internal/benchmarks/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		benchmarks.go
-		handlers.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		benchmarks.go
-		handlers.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		benchmarks.go
 		handlers.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		benchmarks.go
 		handlers.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		benchmarks.go
 		handlers.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		benchmarks.go
 		handlers.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		benchmarks.go
 		handlers.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		benchmarks.go
-		handlers.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		benchmarks.go
-		handlers.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/log/slog/internal/buffer/ya.make b/contrib/go/_std_1.21/src/log/slog/internal/buffer/ya.make
index 313fb054549..5d57d61a391 100644
--- a/contrib/go/_std_1.21/src/log/slog/internal/buffer/ya.make
+++ b/contrib/go/_std_1.21/src/log/slog/internal/buffer/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		buffer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		buffer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		buffer.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		buffer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		buffer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		buffer.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		buffer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		buffer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		buffer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/log/slog/internal/slogtest/ya.make b/contrib/go/_std_1.21/src/log/slog/internal/slogtest/ya.make
index b9c4d7c6f0e..92233a470a4 100644
--- a/contrib/go/_std_1.21/src/log/slog/internal/slogtest/ya.make
+++ b/contrib/go/_std_1.21/src/log/slog/internal/slogtest/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		slogtest.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		slogtest.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		slogtest.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		slogtest.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		slogtest.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		slogtest.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		slogtest.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		slogtest.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		slogtest.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/log/slog/internal/ya.make b/contrib/go/_std_1.21/src/log/slog/internal/ya.make
index 88a2c8dea5a..f040efe248a 100644
--- a/contrib/go/_std_1.21/src/log/slog/internal/ya.make
+++ b/contrib/go/_std_1.21/src/log/slog/internal/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		ignorepc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		ignorepc.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		ignorepc.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		ignorepc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		ignorepc.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		ignorepc.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		ignorepc.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		ignorepc.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		ignorepc.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/log/slog/ya.make b/contrib/go/_std_1.21/src/log/slog/ya.make
index a604e68b5b7..fc359e0b7aa 100644
--- a/contrib/go/_std_1.21/src/log/slog/ya.make
+++ b/contrib/go/_std_1.21/src/log/slog/ya.make
@@ -1,32 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		attr.go
-		doc.go
-		handler.go
-		json_handler.go
-		level.go
-		logger.go
-		record.go
-		text_handler.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		attr.go
-		doc.go
-		handler.go
-		json_handler.go
-		level.go
-		logger.go
-		record.go
-		text_handler.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		attr.go
 		doc.go
@@ -50,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		text_handler.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		attr.go
 		doc.go
@@ -62,7 +35,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		text_handler.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		attr.go
 		doc.go
@@ -86,30 +59,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		text_handler.go
 		value.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		attr.go
-		doc.go
-		handler.go
-		json_handler.go
-		level.go
-		logger.go
-		record.go
-		text_handler.go
-		value.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		attr.go
-		doc.go
-		handler.go
-		json_handler.go
-		level.go
-		logger.go
-		record.go
-		text_handler.go
-		value.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/log/syslog/ya.make b/contrib/go/_std_1.21/src/log/syslog/ya.make
index 8bb8b49b552..557af6f60a5 100644
--- a/contrib/go/_std_1.21/src/log/syslog/ya.make
+++ b/contrib/go/_std_1.21/src/log/syslog/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		syslog.go
-		syslog_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		syslog.go
-		syslog_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		syslog.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		syslog.go
 		syslog_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		syslog.go
 		syslog_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		syslog.go
@@ -42,13 +27,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		doc.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/log/ya.make b/contrib/go/_std_1.21/src/log/ya.make
index 6751aec2ebf..47342cb8637 100644
--- a/contrib/go/_std_1.21/src/log/ya.make
+++ b/contrib/go/_std_1.21/src/log/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		log.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		log.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		log.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		log.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		log.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		log.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		log.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		log.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		log.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/math/big/ya.make b/contrib/go/_std_1.21/src/math/big/ya.make
index aead06c0591..cb4d61a19af 100644
--- a/contrib/go/_std_1.21/src/math/big/ya.make
+++ b/contrib/go/_std_1.21/src/math/big/ya.make
@@ -1,59 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		accuracy_string.go
-		arith.go
-		arith_amd64.go
-		arith_amd64.s
-		arith_decl.go
-		decimal.go
-		doc.go
-		float.go
-		floatconv.go
-		floatmarsh.go
-		ftoa.go
-		int.go
-		intconv.go
-		intmarsh.go
-		nat.go
-		natconv.go
-		natdiv.go
-		prime.go
-		rat.go
-		ratconv.go
-		ratmarsh.go
-		roundingmode_string.go
-		sqrt.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		accuracy_string.go
-		arith.go
-		arith_arm64.s
-		arith_decl.go
-		decimal.go
-		doc.go
-		float.go
-		floatconv.go
-		floatmarsh.go
-		ftoa.go
-		int.go
-		intconv.go
-		intmarsh.go
-		nat.go
-		natconv.go
-		natdiv.go
-		prime.go
-		rat.go
-		ratconv.go
-		ratmarsh.go
-		roundingmode_string.go
-		sqrt.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		accuracy_string.go
 		arith.go
@@ -104,7 +50,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		roundingmode_string.go
 		sqrt.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		accuracy_string.go
 		arith.go
@@ -129,11 +75,12 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		roundingmode_string.go
 		sqrt.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		accuracy_string.go
 		arith.go
-		arith_arm64.s
+		arith_amd64.go
+		arith_amd64.s
 		arith_decl.go
 		decimal.go
 		doc.go
@@ -180,55 +127,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		roundingmode_string.go
 		sqrt.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		accuracy_string.go
-		arith.go
-		arith_arm64.s
-		arith_decl.go
-		decimal.go
-		doc.go
-		float.go
-		floatconv.go
-		floatmarsh.go
-		ftoa.go
-		int.go
-		intconv.go
-		intmarsh.go
-		nat.go
-		natconv.go
-		natdiv.go
-		prime.go
-		rat.go
-		ratconv.go
-		ratmarsh.go
-		roundingmode_string.go
-		sqrt.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		accuracy_string.go
-		arith.go
-		arith_arm64.s
-		arith_decl.go
-		decimal.go
-		doc.go
-		float.go
-		floatconv.go
-		floatmarsh.go
-		ftoa.go
-		int.go
-		intconv.go
-		intmarsh.go
-		nat.go
-		natconv.go
-		natdiv.go
-		prime.go
-		rat.go
-		ratconv.go
-		ratmarsh.go
-		roundingmode_string.go
-		sqrt.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/math/bits/ya.make b/contrib/go/_std_1.21/src/math/bits/ya.make
index 43dd531dfcb..75a29b9642f 100644
--- a/contrib/go/_std_1.21/src/math/bits/ya.make
+++ b/contrib/go/_std_1.21/src/math/bits/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bits.go
-		bits_errors.go
-		bits_tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bits.go
-		bits_errors.go
-		bits_tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bits.go
 		bits_errors.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		bits_errors.go
 		bits_tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bits.go
 		bits_errors.go
 		bits_tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bits.go
 		bits_errors.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		bits_errors.go
 		bits_tables.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bits.go
-		bits_errors.go
-		bits_tables.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bits.go
-		bits_errors.go
-		bits_tables.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/math/cmplx/ya.make b/contrib/go/_std_1.21/src/math/cmplx/ya.make
index 4dd1401d3ff..396fdf4ac94 100644
--- a/contrib/go/_std_1.21/src/math/cmplx/ya.make
+++ b/contrib/go/_std_1.21/src/math/cmplx/ya.make
@@ -1,42 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		abs.go
-		asin.go
-		conj.go
-		exp.go
-		isinf.go
-		isnan.go
-		log.go
-		phase.go
-		polar.go
-		pow.go
-		rect.go
-		sin.go
-		sqrt.go
-		tan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		abs.go
-		asin.go
-		conj.go
-		exp.go
-		isinf.go
-		isnan.go
-		log.go
-		phase.go
-		polar.go
-		pow.go
-		rect.go
-		sin.go
-		sqrt.go
-		tan.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		abs.go
 		asin.go
@@ -70,7 +33,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sqrt.go
 		tan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		abs.go
 		asin.go
@@ -87,7 +50,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		sqrt.go
 		tan.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		abs.go
 		asin.go
@@ -121,39 +84,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sqrt.go
 		tan.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		abs.go
-		asin.go
-		conj.go
-		exp.go
-		isinf.go
-		isnan.go
-		log.go
-		phase.go
-		polar.go
-		pow.go
-		rect.go
-		sin.go
-		sqrt.go
-		tan.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		abs.go
-		asin.go
-		conj.go
-		exp.go
-		isinf.go
-		isnan.go
-		log.go
-		phase.go
-		polar.go
-		pow.go
-		rect.go
-		sin.go
-		sqrt.go
-		tan.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/math/rand/ya.make b/contrib/go/_std_1.21/src/math/rand/ya.make
index c00405f972f..8cfd099f94a 100644
--- a/contrib/go/_std_1.21/src/math/rand/ya.make
+++ b/contrib/go/_std_1.21/src/math/rand/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exp.go
-		normal.go
-		rand.go
-		rng.go
-		zipf.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exp.go
-		normal.go
-		rand.go
-		rng.go
-		zipf.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exp.go
 		normal.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		rng.go
 		zipf.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exp.go
 		normal.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		rng.go
 		zipf.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exp.go
 		normal.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		rng.go
 		zipf.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exp.go
-		normal.go
-		rand.go
-		rng.go
-		zipf.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exp.go
-		normal.go
-		rand.go
-		rng.go
-		zipf.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/math/ya.make b/contrib/go/_std_1.21/src/math/ya.make
index 1c0499d95da..6a668294698 100644
--- a/contrib/go/_std_1.21/src/math/ya.make
+++ b/contrib/go/_std_1.21/src/math/ya.make
@@ -1,130 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		abs.go
-		acosh.go
-		asin.go
-		asinh.go
-		atan.go
-		atan2.go
-		atanh.go
-		bits.go
-		cbrt.go
-		const.go
-		copysign.go
-		dim.go
-		dim_amd64.s
-		dim_asm.go
-		erf.go
-		erfinv.go
-		exp.go
-		exp2_noasm.go
-		exp_amd64.go
-		exp_amd64.s
-		exp_asm.go
-		expm1.go
-		floor.go
-		floor_amd64.s
-		floor_asm.go
-		fma.go
-		frexp.go
-		gamma.go
-		hypot.go
-		hypot_amd64.s
-		hypot_asm.go
-		j0.go
-		j1.go
-		jn.go
-		ldexp.go
-		lgamma.go
-		log.go
-		log10.go
-		log1p.go
-		log_amd64.s
-		log_asm.go
-		logb.go
-		mod.go
-		modf.go
-		modf_noasm.go
-		nextafter.go
-		pow.go
-		pow10.go
-		remainder.go
-		signbit.go
-		sin.go
-		sincos.go
-		sinh.go
-		sqrt.go
-		stubs.go
-		tan.go
-		tanh.go
-		trig_reduce.go
-		unsafe.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		abs.go
-		acosh.go
-		asin.go
-		asinh.go
-		atan.go
-		atan2.go
-		atanh.go
-		bits.go
-		cbrt.go
-		const.go
-		copysign.go
-		dim.go
-		dim_arm64.s
-		dim_asm.go
-		erf.go
-		erfinv.go
-		exp.go
-		exp2_asm.go
-		exp_arm64.s
-		exp_asm.go
-		expm1.go
-		floor.go
-		floor_arm64.s
-		floor_asm.go
-		fma.go
-		frexp.go
-		gamma.go
-		hypot.go
-		hypot_noasm.go
-		j0.go
-		j1.go
-		jn.go
-		ldexp.go
-		lgamma.go
-		log.go
-		log10.go
-		log1p.go
-		log_stub.go
-		logb.go
-		mod.go
-		modf.go
-		modf_arm64.s
-		modf_asm.go
-		nextafter.go
-		pow.go
-		pow10.go
-		remainder.go
-		signbit.go
-		sin.go
-		sincos.go
-		sinh.go
-		sqrt.go
-		stubs.go
-		tan.go
-		tanh.go
-		trig_reduce.go
-		unsafe.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		abs.go
 		acosh.go
@@ -246,7 +121,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		trig_reduce.go
 		unsafe.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		abs.go
 		acosh.go
@@ -306,7 +181,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		trig_reduce.go
 		unsafe.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		abs.go
 		acosh.go
@@ -320,23 +195,25 @@ ELSEIF (OS_DARWIN AND ARCH_AARCH64)
 		const.go
 		copysign.go
 		dim.go
-		dim_arm64.s
+		dim_amd64.s
 		dim_asm.go
 		erf.go
 		erfinv.go
 		exp.go
-		exp2_asm.go
-		exp_arm64.s
+		exp2_noasm.go
+		exp_amd64.go
+		exp_amd64.s
 		exp_asm.go
 		expm1.go
 		floor.go
-		floor_arm64.s
+		floor_amd64.s
 		floor_asm.go
 		fma.go
 		frexp.go
 		gamma.go
 		hypot.go
-		hypot_noasm.go
+		hypot_amd64.s
+		hypot_asm.go
 		j0.go
 		j1.go
 		jn.go
@@ -345,12 +222,12 @@ ELSEIF (OS_DARWIN AND ARCH_AARCH64)
 		log.go
 		log10.go
 		log1p.go
-		log_stub.go
+		log_amd64.s
+		log_asm.go
 		logb.go
 		mod.go
 		modf.go
-		modf_arm64.s
-		modf_asm.go
+		modf_noasm.go
 		nextafter.go
 		pow.go
 		pow10.go
@@ -428,126 +305,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		trig_reduce.go
 		unsafe.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		abs.go
-		acosh.go
-		asin.go
-		asinh.go
-		atan.go
-		atan2.go
-		atanh.go
-		bits.go
-		cbrt.go
-		const.go
-		copysign.go
-		dim.go
-		dim_arm64.s
-		dim_asm.go
-		erf.go
-		erfinv.go
-		exp.go
-		exp2_asm.go
-		exp_arm64.s
-		exp_asm.go
-		expm1.go
-		floor.go
-		floor_arm64.s
-		floor_asm.go
-		fma.go
-		frexp.go
-		gamma.go
-		hypot.go
-		hypot_noasm.go
-		j0.go
-		j1.go
-		jn.go
-		ldexp.go
-		lgamma.go
-		log.go
-		log10.go
-		log1p.go
-		log_stub.go
-		logb.go
-		mod.go
-		modf.go
-		modf_arm64.s
-		modf_asm.go
-		nextafter.go
-		pow.go
-		pow10.go
-		remainder.go
-		signbit.go
-		sin.go
-		sincos.go
-		sinh.go
-		sqrt.go
-		stubs.go
-		tan.go
-		tanh.go
-		trig_reduce.go
-		unsafe.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		abs.go
-		acosh.go
-		asin.go
-		asinh.go
-		atan.go
-		atan2.go
-		atanh.go
-		bits.go
-		cbrt.go
-		const.go
-		copysign.go
-		dim.go
-		dim_arm64.s
-		dim_asm.go
-		erf.go
-		erfinv.go
-		exp.go
-		exp2_asm.go
-		exp_arm64.s
-		exp_asm.go
-		expm1.go
-		floor.go
-		floor_arm64.s
-		floor_asm.go
-		fma.go
-		frexp.go
-		gamma.go
-		hypot.go
-		hypot_noasm.go
-		j0.go
-		j1.go
-		jn.go
-		ldexp.go
-		lgamma.go
-		log.go
-		log10.go
-		log1p.go
-		log_stub.go
-		logb.go
-		mod.go
-		modf.go
-		modf_arm64.s
-		modf_asm.go
-		nextafter.go
-		pow.go
-		pow10.go
-		remainder.go
-		signbit.go
-		sin.go
-		sincos.go
-		sinh.go
-		sqrt.go
-		stubs.go
-		tan.go
-		tanh.go
-		trig_reduce.go
-		unsafe.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/mime/multipart/ya.make b/contrib/go/_std_1.21/src/mime/multipart/ya.make
index de833b290da..d5cb01f7304 100644
--- a/contrib/go/_std_1.21/src/mime/multipart/ya.make
+++ b/contrib/go/_std_1.21/src/mime/multipart/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		formdata.go
-		multipart.go
-		readmimeheader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		formdata.go
-		multipart.go
-		readmimeheader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		formdata.go
 		multipart.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		readmimeheader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		formdata.go
 		multipart.go
 		readmimeheader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		formdata.go
 		multipart.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		readmimeheader.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		formdata.go
-		multipart.go
-		readmimeheader.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		formdata.go
-		multipart.go
-		readmimeheader.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/mime/quotedprintable/ya.make b/contrib/go/_std_1.21/src/mime/quotedprintable/ya.make
index 8526ee5f3b9..917154adbfe 100644
--- a/contrib/go/_std_1.21/src/mime/quotedprintable/ya.make
+++ b/contrib/go/_std_1.21/src/mime/quotedprintable/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		reader.go
 		writer.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		reader.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		reader.go
 		writer.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		reader.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		reader.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		reader.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/mime/ya.make b/contrib/go/_std_1.21/src/mime/ya.make
index 981d9fc5980..32818cbef59 100644
--- a/contrib/go/_std_1.21/src/mime/ya.make
+++ b/contrib/go/_std_1.21/src/mime/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encodedword.go
-		grammar.go
-		mediatype.go
-		type.go
-		type_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encodedword.go
-		grammar.go
-		mediatype.go
-		type.go
-		type_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encodedword.go
 		grammar.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		type.go
 		type_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encodedword.go
 		grammar.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		type.go
 		type_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encodedword.go
 		grammar.go
@@ -58,22 +39,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		type.go
 		type_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encodedword.go
-		grammar.go
-		mediatype.go
-		type.go
-		type_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encodedword.go
-		grammar.go
-		mediatype.go
-		type.go
-		type_windows.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/net/http/cgi/ya.make b/contrib/go/_std_1.21/src/net/http/cgi/ya.make
index 44dffcffa24..4e4539d285b 100644
--- a/contrib/go/_std_1.21/src/net/http/cgi/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/cgi/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		child.go
 		host.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		child.go
 		host.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		child.go
 		host.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		child.go
 		host.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		child.go
 		host.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		child.go
-		host.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make b/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
index b498d58c276..cc5be5b1986 100644
--- a/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		jar.go
 		punycode.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		jar.go
 		punycode.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		jar.go
 		punycode.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		jar.go
 		punycode.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		jar.go
 		punycode.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/fcgi/ya.make b/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
index 3ed6f9d42c8..843eaa8164e 100644
--- a/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		child.go
 		fcgi.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		child.go
 		fcgi.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		child.go
 		fcgi.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		child.go
 		fcgi.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		child.go
 		fcgi.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/httptest/ya.make b/contrib/go/_std_1.21/src/net/http/httptest/ya.make
index e6f18c79396..d5726ffd3ce 100644
--- a/contrib/go/_std_1.21/src/net/http/httptest/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httptest/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		httptest.go
 		recorder.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		recorder.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		httptest.go
 		recorder.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		httptest.go
 		recorder.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		recorder.go
 		server.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/httptrace/ya.make b/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
index ee0c2ef7922..d06d80bb28e 100644
--- a/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		trace.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		trace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		trace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		trace.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		trace.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		trace.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/httputil/ya.make b/contrib/go/_std_1.21/src/net/http/httputil/ya.make
index 40f2a4ce890..fbc2a774f59 100644
--- a/contrib/go/_std_1.21/src/net/http/httputil/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httputil/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		dump.go
 		httputil.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		persist.go
 		reverseproxy.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		dump.go
 		httputil.go
 		persist.go
 		reverseproxy.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		dump.go
 		httputil.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		persist.go
 		reverseproxy.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make b/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
index 8004dc99aa7..2126a2e08aa 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		print.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		print.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		print.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		print.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		print.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		print.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make b/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
index ec2e62311c5..29b67101e5e 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		testcert.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		testcert.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		testcert.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		testcert.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		testcert.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		testcert.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/internal/ya.make b/contrib/go/_std_1.21/src/net/http/internal/ya.make
index b6e359fde61..81ef1d1d0da 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		chunked.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		chunked.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		chunked.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		chunked.go
     )
@@ -30,14 +19,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		chunked.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		chunked.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/net/http/pprof/ya.make b/contrib/go/_std_1.21/src/net/http/pprof/ya.make
index 9e81acb63fd..3b6671c8e8a 100644
--- a/contrib/go/_std_1.21/src/net/http/pprof/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/pprof/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		pprof.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		pprof.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		pprof.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		pprof.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		pprof.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		pprof.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/http/ya.make b/contrib/go/_std_1.21/src/net/http/ya.make
index 3fcc56dc1e3..de734510615 100644
--- a/contrib/go/_std_1.21/src/net/http/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/ya.make
@@ -1,60 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		client.go
 		clone.go
@@ -106,7 +51,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		transport.go
 		transport_default_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		client.go
 		clone.go
@@ -132,7 +77,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		transport.go
 		transport_default_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		client.go
 		clone.go
@@ -184,58 +129,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		transport.go
 		transport_default_other.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/net/internal/socktest/ya.make b/contrib/go/_std_1.21/src/net/internal/socktest/ya.make
index e89ae5b61e0..40f417a3d1d 100644
--- a/contrib/go/_std_1.21/src/net/internal/socktest/ya.make
+++ b/contrib/go/_std_1.21/src/net/internal/socktest/ya.make
@@ -1,21 +1,16 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		switch.go
 		switch_posix.go
 		switch_unix.go
-		sys_cloexec.go
 		sys_unix.go
     )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		switch.go
 		switch_posix.go
 		switch_unix.go
-		sys_cloexec.go
 		sys_unix.go
     )
 ELSEIF (OS_LINUX AND ARCH_AARCH64)
@@ -26,25 +21,12 @@ ELSEIF (OS_LINUX AND ARCH_AARCH64)
 		sys_cloexec.go
 		sys_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		switch.go
-		switch_posix.go
-		switch_unix.go
-		sys_unix.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		switch.go
-		switch_posix.go
-		switch_unix.go
-		sys_unix.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		switch.go
 		switch_posix.go
 		switch_unix.go
+		sys_cloexec.go
 		sys_unix.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -54,19 +36,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		switch_windows.go
 		sys_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		switch.go
-		switch_posix.go
-		switch_windows.go
-		sys_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		switch.go
-		switch_posix.go
-		switch_windows.go
-		sys_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/mail/ya.make b/contrib/go/_std_1.21/src/net/mail/ya.make
index 01769488d15..81edfd8f369 100644
--- a/contrib/go/_std_1.21/src/net/mail/ya.make
+++ b/contrib/go/_std_1.21/src/net/mail/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		message.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		message.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		message.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/netip/ya.make b/contrib/go/_std_1.21/src/net/netip/ya.make
index 5b87de3a3ca..6e22a21434c 100644
--- a/contrib/go/_std_1.21/src/net/netip/ya.make
+++ b/contrib/go/_std_1.21/src/net/netip/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		leaf_alts.go
-		netip.go
-		uint128.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		leaf_alts.go
-		netip.go
-		uint128.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		leaf_alts.go
 		netip.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		netip.go
 		uint128.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		leaf_alts.go
 		netip.go
 		uint128.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		leaf_alts.go
 		netip.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		netip.go
 		uint128.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		leaf_alts.go
-		netip.go
-		uint128.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		leaf_alts.go
-		netip.go
-		uint128.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/rpc/jsonrpc/ya.make b/contrib/go/_std_1.21/src/net/rpc/jsonrpc/ya.make
index 65a9b1dcec2..b5655d1c6c6 100644
--- a/contrib/go/_std_1.21/src/net/rpc/jsonrpc/ya.make
+++ b/contrib/go/_std_1.21/src/net/rpc/jsonrpc/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		client.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		client.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		client.go
 		server.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		client.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		client.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		client.go
 		server.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		client.go
 		server.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		client.go
-		server.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		client.go
-		server.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/rpc/ya.make b/contrib/go/_std_1.21/src/net/rpc/ya.make
index 7dbc3b486bd..f435fddbea3 100644
--- a/contrib/go/_std_1.21/src/net/rpc/ya.make
+++ b/contrib/go/_std_1.21/src/net/rpc/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		client.go
-		debug.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		client.go
-		debug.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		client.go
 		debug.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		debug.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		client.go
 		debug.go
 		server.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		client.go
 		debug.go
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		debug.go
 		server.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		client.go
-		debug.go
-		server.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		client.go
-		debug.go
-		server.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/net/smtp/ya.make b/contrib/go/_std_1.21/src/net/smtp/ya.make
index fce75b99268..81ff6ebdbef 100644
--- a/contrib/go/_std_1.21/src/net/smtp/ya.make
+++ b/contrib/go/_std_1.21/src/net/smtp/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		auth.go
-		smtp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		auth.go
-		smtp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		auth.go
 		smtp.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		auth.go
 		smtp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		auth.go
 		smtp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		auth.go
 		smtp.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		auth.go
 		smtp.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		auth.go
-		smtp.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		auth.go
-		smtp.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/textproto/ya.make b/contrib/go/_std_1.21/src/net/textproto/ya.make
index 3a8a861fd9e..bdaee23abee 100644
--- a/contrib/go/_std_1.21/src/net/textproto/ya.make
+++ b/contrib/go/_std_1.21/src/net/textproto/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		header.go
-		pipeline.go
-		reader.go
-		textproto.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		header.go
-		pipeline.go
-		reader.go
-		textproto.go
-		writer.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		header.go
 		pipeline.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		textproto.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		header.go
 		pipeline.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		textproto.go
 		writer.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		header.go
 		pipeline.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		textproto.go
 		writer.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		header.go
-		pipeline.go
-		reader.go
-		textproto.go
-		writer.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		header.go
-		pipeline.go
-		reader.go
-		textproto.go
-		writer.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/net/url/ya.make b/contrib/go/_std_1.21/src/net/url/ya.make
index 04f9b6e3043..691fa2a87d3 100644
--- a/contrib/go/_std_1.21/src/net/url/ya.make
+++ b/contrib/go/_std_1.21/src/net/url/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		url.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		url.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		url.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		url.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		url.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		url.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		url.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		url.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		url.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make b/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
index 03568e34a5f..357058c18b3 100644
--- a/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
+++ b/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exists_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exists_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exists_unix.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		exists_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exists_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exists_unix.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		exists_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exists_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exists_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/os/exec/ya.make b/contrib/go/_std_1.21/src/os/exec/ya.make
index 6b1a3589eb0..0f8000539f6 100644
--- a/contrib/go/_std_1.21/src/os/exec/ya.make
+++ b/contrib/go/_std_1.21/src/os/exec/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		exec.go
-		exec_unix.go
-		lp_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		exec.go
-		exec_unix.go
-		lp_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		exec.go
 		exec_unix.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		exec_unix.go
 		lp_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		exec.go
 		exec_unix.go
 		lp_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exec.go
 		exec_unix.go
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		exec_windows.go
 		lp_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		exec.go
-		exec_windows.go
-		lp_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		exec.go
-		exec_windows.go
-		lp_windows.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/os/ya.make b/contrib/go/_std_1.21/src/os/ya.make
index 8c4c417f824..b49d2d94dc4 100644
--- a/contrib/go/_std_1.21/src/os/ya.make
+++ b/contrib/go/_std_1.21/src/os/ya.make
@@ -1,12 +1,8 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		dir.go
-		dir_unix.go
-		dirent_linux.go
+		dir_darwin.go
 		endian_little.go
 		env.go
 		error.go
@@ -16,7 +12,7 @@ ELSEIF (OS_LINUX AND ARCH_X86_64)
 		exec_posix.go
 		exec_unix.go
 		executable.go
-		executable_procfs.go
+		executable_darwin.go
 		file.go
 		file_open_unix.go
 		file_posix.go
@@ -24,29 +20,28 @@ ELSEIF (OS_LINUX AND ARCH_X86_64)
 		getwd.go
 		path.go
 		path_unix.go
-		pipe2_unix.go
+		pipe_unix.go
 		proc.go
 		rawconn.go
-		readfrom_linux.go
+		readfrom_stub.go
 		removeall_at.go
 		stat.go
-		stat_linux.go
+		stat_darwin.go
 		stat_unix.go
-		sticky_notbsd.go
+		sticky_bsd.go
 		str.go
 		sys.go
-		sys_linux.go
+		sys_bsd.go
 		sys_unix.go
 		tempfile.go
 		types.go
 		types_unix.go
-		wait_waitid.go
+		wait_unimp.go
     )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		dir.go
-		dir_unix.go
-		dirent_linux.go
+		dir_darwin.go
 		endian_little.go
 		env.go
 		error.go
@@ -56,7 +51,7 @@ ELSEIF (OS_LINUX AND ARCH_ARM64)
 		exec_posix.go
 		exec_unix.go
 		executable.go
-		executable_procfs.go
+		executable_darwin.go
 		file.go
 		file_open_unix.go
 		file_posix.go
@@ -64,23 +59,23 @@ ELSEIF (OS_LINUX AND ARCH_ARM64)
 		getwd.go
 		path.go
 		path_unix.go
-		pipe2_unix.go
+		pipe_unix.go
 		proc.go
 		rawconn.go
-		readfrom_linux.go
+		readfrom_stub.go
 		removeall_at.go
 		stat.go
-		stat_linux.go
+		stat_darwin.go
 		stat_unix.go
-		sticky_notbsd.go
+		sticky_bsd.go
 		str.go
 		sys.go
-		sys_linux.go
+		sys_bsd.go
 		sys_unix.go
 		tempfile.go
 		types.go
 		types_unix.go
-		wait_waitid.go
+		wait_unimp.go
     )
 ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
@@ -122,88 +117,11 @@ ELSEIF (OS_LINUX AND ARCH_AARCH64)
 		types_unix.go
 		wait_waitid.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		dir.go
-		dir_darwin.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_unix.go
-		executable.go
-		executable_darwin.go
-		file.go
-		file_open_unix.go
-		file_posix.go
-		file_unix.go
-		getwd.go
-		path.go
-		path_unix.go
-		pipe_unix.go
-		proc.go
-		rawconn.go
-		readfrom_stub.go
-		removeall_at.go
-		stat.go
-		stat_darwin.go
-		stat_unix.go
-		sticky_bsd.go
-		str.go
-		sys.go
-		sys_bsd.go
-		sys_unix.go
-		tempfile.go
-		types.go
-		types_unix.go
-		wait_unimp.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		dir.go
-		dir_darwin.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_unix.go
-		executable.go
-		executable_darwin.go
-		file.go
-		file_open_unix.go
-		file_posix.go
-		file_unix.go
-		getwd.go
-		path.go
-		path_unix.go
-		pipe_unix.go
-		proc.go
-		rawconn.go
-		readfrom_stub.go
-		removeall_at.go
-		stat.go
-		stat_darwin.go
-		stat_unix.go
-		sticky_bsd.go
-		str.go
-		sys.go
-		sys_bsd.go
-		sys_unix.go
-		tempfile.go
-		types.go
-		types_unix.go
-		wait_unimp.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		dir.go
-		dir_darwin.go
+		dir_unix.go
+		dirent_linux.go
 		endian_little.go
 		env.go
 		error.go
@@ -213,7 +131,7 @@ ELSEIF (OS_DARWIN AND ARCH_AARCH64)
 		exec_posix.go
 		exec_unix.go
 		executable.go
-		executable_darwin.go
+		executable_procfs.go
 		file.go
 		file_open_unix.go
 		file_posix.go
@@ -221,23 +139,23 @@ ELSEIF (OS_DARWIN AND ARCH_AARCH64)
 		getwd.go
 		path.go
 		path_unix.go
-		pipe_unix.go
+		pipe2_unix.go
 		proc.go
 		rawconn.go
-		readfrom_stub.go
+		readfrom_linux.go
 		removeall_at.go
 		stat.go
-		stat_darwin.go
+		stat_linux.go
 		stat_unix.go
-		sticky_bsd.go
+		sticky_notbsd.go
 		str.go
 		sys.go
-		sys_bsd.go
+		sys_linux.go
 		sys_unix.go
 		tempfile.go
 		types.go
 		types_unix.go
-		wait_unimp.go
+		wait_waitid.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
@@ -273,74 +191,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		types.go
 		types_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		dir.go
-		dir_windows.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_windows.go
-		executable.go
-		executable_windows.go
-		file.go
-		file_posix.go
-		file_windows.go
-		getwd.go
-		path.go
-		path_windows.go
-		proc.go
-		rawconn.go
-		readfrom_stub.go
-		removeall_noat.go
-		stat.go
-		stat_windows.go
-		sticky_notbsd.go
-		str.go
-		sys.go
-		sys_windows.go
-		tempfile.go
-		types.go
-		types_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		dir.go
-		dir_windows.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_windows.go
-		executable.go
-		executable_windows.go
-		file.go
-		file_posix.go
-		file_windows.go
-		getwd.go
-		path.go
-		path_windows.go
-		proc.go
-		rawconn.go
-		readfrom_stub.go
-		removeall_noat.go
-		stat.go
-		stat_windows.go
-		sticky_notbsd.go
-		str.go
-		sys.go
-		sys_windows.go
-		tempfile.go
-		types.go
-		types_windows.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/path/filepath/ya.make b/contrib/go/_std_1.21/src/path/filepath/ya.make
index 9d04957bacf..4c16802ea2e 100644
--- a/contrib/go/_std_1.21/src/path/filepath/ya.make
+++ b/contrib/go/_std_1.21/src/path/filepath/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		match.go
-		path.go
-		path_nonwindows.go
-		path_unix.go
-		symlink.go
-		symlink_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		match.go
-		path.go
-		path_nonwindows.go
-		path_unix.go
-		symlink.go
-		symlink_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		match.go
 		path.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		symlink.go
 		symlink_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		match.go
 		path.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		symlink.go
 		symlink_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		match.go
 		path.go
@@ -64,21 +43,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		symlink.go
 		symlink_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		match.go
-		path.go
-		path_windows.go
-		symlink.go
-		symlink_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		match.go
-		path.go
-		path_windows.go
-		symlink.go
-		symlink_windows.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/path/ya.make b/contrib/go/_std_1.21/src/path/ya.make
index bcdbc254bbd..68c112c167d 100644
--- a/contrib/go/_std_1.21/src/path/ya.make
+++ b/contrib/go/_std_1.21/src/path/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		match.go
-		path.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		match.go
-		path.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		match.go
 		path.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		match.go
 		path.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		match.go
 		path.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		match.go
 		path.go
@@ -37,16 +24,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		match.go
 		path.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		match.go
-		path.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		match.go
-		path.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/reflect/internal/example1/ya.make b/contrib/go/_std_1.21/src/reflect/internal/example1/ya.make
index 57009b8b3d7..12c79316c6a 100644
--- a/contrib/go/_std_1.21/src/reflect/internal/example1/ya.make
+++ b/contrib/go/_std_1.21/src/reflect/internal/example1/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		example.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		example.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		example.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/reflect/internal/example2/ya.make b/contrib/go/_std_1.21/src/reflect/internal/example2/ya.make
index 57009b8b3d7..12c79316c6a 100644
--- a/contrib/go/_std_1.21/src/reflect/internal/example2/ya.make
+++ b/contrib/go/_std_1.21/src/reflect/internal/example2/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		example.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		example.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		example.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		example.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		example.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/reflect/ya.make b/contrib/go/_std_1.21/src/reflect/ya.make
index 95c49253fad..536355cafd3 100644
--- a/contrib/go/_std_1.21/src/reflect/ya.make
+++ b/contrib/go/_std_1.21/src/reflect/ya.make
@@ -1,32 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		abi.go
-		asm_amd64.s
-		deepequal.go
-		float32reg_generic.go
-		makefunc.go
-		swapper.go
-		type.go
-		value.go
-		visiblefields.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		abi.go
-		asm_arm64.s
-		deepequal.go
-		float32reg_generic.go
-		makefunc.go
-		swapper.go
-		type.go
-		value.go
-		visiblefields.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		abi.go
 		asm_arm64.s
@@ -50,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		value.go
 		visiblefields.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		abi.go
 		asm_arm64.s
@@ -62,10 +35,10 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		value.go
 		visiblefields.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		abi.go
-		asm_arm64.s
+		asm_amd64.s
 		deepequal.go
 		float32reg_generic.go
 		makefunc.go
@@ -86,30 +59,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		value.go
 		visiblefields.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		abi.go
-		asm_arm64.s
-		deepequal.go
-		float32reg_generic.go
-		makefunc.go
-		swapper.go
-		type.go
-		value.go
-		visiblefields.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		abi.go
-		asm_arm64.s
-		deepequal.go
-		float32reg_generic.go
-		makefunc.go
-		swapper.go
-		type.go
-		value.go
-		visiblefields.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/regexp/syntax/ya.make b/contrib/go/_std_1.21/src/regexp/syntax/ya.make
index 36dd3fa2070..f368815ed25 100644
--- a/contrib/go/_std_1.21/src/regexp/syntax/ya.make
+++ b/contrib/go/_std_1.21/src/regexp/syntax/ya.make
@@ -1,30 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		compile.go
-		doc.go
-		op_string.go
-		parse.go
-		perl_groups.go
-		prog.go
-		regexp.go
-		simplify.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		compile.go
-		doc.go
-		op_string.go
-		parse.go
-		perl_groups.go
-		prog.go
-		regexp.go
-		simplify.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		compile.go
 		doc.go
@@ -46,7 +21,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		regexp.go
 		simplify.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		compile.go
 		doc.go
@@ -57,7 +32,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		regexp.go
 		simplify.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		compile.go
 		doc.go
@@ -79,27 +54,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		regexp.go
 		simplify.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		compile.go
-		doc.go
-		op_string.go
-		parse.go
-		perl_groups.go
-		prog.go
-		regexp.go
-		simplify.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		compile.go
-		doc.go
-		op_string.go
-		parse.go
-		perl_groups.go
-		prog.go
-		regexp.go
-		simplify.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/regexp/ya.make b/contrib/go/_std_1.21/src/regexp/ya.make
index 2aac28f8bd5..5903db04b96 100644
--- a/contrib/go/_std_1.21/src/regexp/ya.make
+++ b/contrib/go/_std_1.21/src/regexp/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		backtrack.go
-		exec.go
-		onepass.go
-		regexp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		backtrack.go
-		exec.go
-		onepass.go
-		regexp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		backtrack.go
 		exec.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		onepass.go
 		regexp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		backtrack.go
 		exec.go
 		onepass.go
 		regexp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		backtrack.go
 		exec.go
@@ -51,20 +34,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		onepass.go
 		regexp.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		backtrack.go
-		exec.go
-		onepass.go
-		regexp.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		backtrack.go
-		exec.go
-		onepass.go
-		regexp.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/runtime/coverage/ya.make b/contrib/go/_std_1.21/src/runtime/coverage/ya.make
index 5626dafa5c1..96fc316a11a 100644
--- a/contrib/go/_std_1.21/src/runtime/coverage/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/coverage/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		apis.go
 		dummy.s
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		hooks.go
 		testsupport.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		apis.go
 		dummy.s
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		hooks.go
 		testsupport.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		apis.go
 		dummy.s
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		hooks.go
 		testsupport.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/debug/ya.make b/contrib/go/_std_1.21/src/runtime/debug/ya.make
index ba88d8e0e15..51c6e58f85f 100644
--- a/contrib/go/_std_1.21/src/runtime/debug/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/debug/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		debug.s
 		garbage.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		stack.go
 		stubs.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		debug.s
 		garbage.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		stack.go
 		stubs.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		debug.s
 		garbage.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		stack.go
 		stubs.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make b/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
index 163b2d630c5..8acd81948b3 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		atomic_amd64.go
-		atomic_amd64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		atomic_arm64.go
-		atomic_arm64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		atomic_arm64.go
 		atomic_arm64.s
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		types_64bit.go
 		unaligned.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		atomic_arm64.go
 		atomic_arm64.s
@@ -52,10 +29,10 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		types_64bit.go
 		unaligned.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
-		atomic_arm64.go
-		atomic_arm64.s
+		atomic_amd64.go
+		atomic_amd64.s
 		doc.go
 		stubs.go
 		types.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		types_64bit.go
 		unaligned.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		atomic_arm64.go
-		atomic_arm64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		atomic_arm64.go
-		atomic_arm64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/internal/math/ya.make b/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
index 9c3166b8583..65b75f3a165 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		math.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		math.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		math.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		math.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		math.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		math.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make b/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
index 1fff240a898..9428d8dd051 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
@@ -1,13 +1,10 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		func_amd64.go
 		func_amd64.s
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		func_amd64.go
 		func_amd64.s
diff --git a/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make b/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
index 8b39b5da8cb..ef9cdc3c1b4 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		consts.go
 		consts_norace.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sys.go
 		zversion.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		consts.go
 		consts_norace.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		sys.go
 		zversion.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		consts.go
 		consts_norace.go
@@ -65,23 +44,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sys.go
 		zversion.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/internal/syscall/ya.make b/contrib/go/_std_1.21/src/runtime/internal/syscall/ya.make
index 62490a6f9cd..bf607c26402 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/syscall/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/syscall/ya.make
@@ -1,23 +1,14 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		asm_linux_amd64.s
-		defs_linux_amd64.go
-		syscall_linux.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
+IF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		asm_linux_arm64.s
 		defs_linux_arm64.go
 		syscall_linux.go
     )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
-		asm_linux_arm64.s
-		defs_linux_arm64.go
+		asm_linux_amd64.s
+		defs_linux_amd64.go
 		syscall_linux.go
     )
 ENDIF()
diff --git a/contrib/go/_std_1.21/src/runtime/metrics/ya.make b/contrib/go/_std_1.21/src/runtime/metrics/ya.make
index 73f3a6d1f49..297efb81bdd 100644
--- a/contrib/go/_std_1.21/src/runtime/metrics/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/metrics/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		description.go
 		doc.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sample.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		description.go
 		doc.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		sample.go
 		value.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		description.go
 		doc.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sample.go
 		value.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/pprof/ya.make b/contrib/go/_std_1.21/src/runtime/pprof/ya.make
index 318d29f9155..f5f8979bf89 100644
--- a/contrib/go/_std_1.21/src/runtime/pprof/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/pprof/ya.make
@@ -1,36 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_rusage.go
-		proto.go
-		proto_other.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_rusage.go
-		proto.go
-		proto_other.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		elf.go
 		label.go
@@ -58,7 +27,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		protomem.go
 		runtime.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		elf.go
 		label.go
@@ -72,7 +41,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		protomem.go
 		runtime.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		elf.go
 		label.go
@@ -100,33 +69,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		protomem.go
 		runtime.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_windows.go
-		proto.go
-		proto_windows.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_windows.go
-		proto.go
-		proto_windows.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/runtime/trace/ya.make b/contrib/go/_std_1.21/src/runtime/trace/ya.make
index 91655f900c9..5783d5ff367 100644
--- a/contrib/go/_std_1.21/src/runtime/trace/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/trace/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		annotation.go
 		trace.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		annotation.go
 		trace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		annotation.go
 		trace.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		annotation.go
 		trace.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		annotation.go
 		trace.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/slices/ya.make b/contrib/go/_std_1.21/src/slices/ya.make
index 5cc85a79038..ce1bed67e14 100644
--- a/contrib/go/_std_1.21/src/slices/ya.make
+++ b/contrib/go/_std_1.21/src/slices/ya.make
@@ -1,22 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		slices.go
-		sort.go
-		zsortanyfunc.go
-		zsortordered.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		slices.go
-		sort.go
-		zsortanyfunc.go
-		zsortordered.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		slices.go
 		sort.go
@@ -30,14 +13,14 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		zsortanyfunc.go
 		zsortordered.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		slices.go
 		sort.go
 		zsortanyfunc.go
 		zsortordered.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		slices.go
 		sort.go
@@ -51,19 +34,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		zsortanyfunc.go
 		zsortordered.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		slices.go
-		sort.go
-		zsortanyfunc.go
-		zsortordered.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		slices.go
-		sort.go
-		zsortanyfunc.go
-		zsortordered.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/sort/ya.make b/contrib/go/_std_1.21/src/sort/ya.make
index 8bb9643caa6..0ac5a7517cf 100644
--- a/contrib/go/_std_1.21/src/sort/ya.make
+++ b/contrib/go/_std_1.21/src/sort/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		search.go
-		slice.go
-		sort.go
-		zsortfunc.go
-		zsortinterface.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		search.go
-		slice.go
-		sort.go
-		zsortfunc.go
-		zsortinterface.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		search.go
 		slice.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		zsortfunc.go
 		zsortinterface.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		search.go
 		slice.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		zsortfunc.go
 		zsortinterface.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		search.go
 		slice.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		zsortfunc.go
 		zsortinterface.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		search.go
-		slice.go
-		sort.go
-		zsortfunc.go
-		zsortinterface.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		search.go
-		slice.go
-		sort.go
-		zsortfunc.go
-		zsortinterface.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/strconv/ya.make b/contrib/go/_std_1.21/src/strconv/ya.make
index 9f6a55f3d02..7461602880f 100644
--- a/contrib/go/_std_1.21/src/strconv/ya.make
+++ b/contrib/go/_std_1.21/src/strconv/ya.make
@@ -1,42 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		atob.go
-		atoc.go
-		atof.go
-		atoi.go
-		bytealg.go
-		ctoa.go
-		decimal.go
-		doc.go
-		eisel_lemire.go
-		ftoa.go
-		ftoaryu.go
-		isprint.go
-		itoa.go
-		quote.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		atob.go
-		atoc.go
-		atof.go
-		atoi.go
-		bytealg.go
-		ctoa.go
-		decimal.go
-		doc.go
-		eisel_lemire.go
-		ftoa.go
-		ftoaryu.go
-		isprint.go
-		itoa.go
-		quote.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		atob.go
 		atoc.go
@@ -70,7 +33,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		itoa.go
 		quote.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		atob.go
 		atoc.go
@@ -87,7 +50,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		itoa.go
 		quote.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		atob.go
 		atoc.go
@@ -121,39 +84,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		itoa.go
 		quote.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		atob.go
-		atoc.go
-		atof.go
-		atoi.go
-		bytealg.go
-		ctoa.go
-		decimal.go
-		doc.go
-		eisel_lemire.go
-		ftoa.go
-		ftoaryu.go
-		isprint.go
-		itoa.go
-		quote.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		atob.go
-		atoc.go
-		atof.go
-		atoi.go
-		bytealg.go
-		ctoa.go
-		decimal.go
-		doc.go
-		eisel_lemire.go
-		ftoa.go
-		ftoaryu.go
-		isprint.go
-		itoa.go
-		quote.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/strings/ya.make b/contrib/go/_std_1.21/src/strings/ya.make
index 9dbdf6f5650..edcbabec5ec 100644
--- a/contrib/go/_std_1.21/src/strings/ya.make
+++ b/contrib/go/_std_1.21/src/strings/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		builder.go
 		clone.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		builder.go
 		clone.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		builder.go
 		clone.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/sync/ya.make b/contrib/go/_std_1.21/src/sync/ya.make
index adf2284f04c..f2a43ff9c1a 100644
--- a/contrib/go/_std_1.21/src/sync/ya.make
+++ b/contrib/go/_std_1.21/src/sync/ya.make
@@ -1,36 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cond.go
-		map.go
-		mutex.go
-		once.go
-		oncefunc.go
-		pool.go
-		poolqueue.go
-		runtime.go
-		runtime2.go
-		rwmutex.go
-		waitgroup.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cond.go
-		map.go
-		mutex.go
-		once.go
-		oncefunc.go
-		pool.go
-		poolqueue.go
-		runtime.go
-		runtime2.go
-		rwmutex.go
-		waitgroup.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cond.go
 		map.go
@@ -58,7 +27,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		rwmutex.go
 		waitgroup.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cond.go
 		map.go
@@ -72,7 +41,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		rwmutex.go
 		waitgroup.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cond.go
 		map.go
@@ -100,34 +69,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		rwmutex.go
 		waitgroup.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cond.go
-		map.go
-		mutex.go
-		once.go
-		oncefunc.go
-		pool.go
-		poolqueue.go
-		runtime.go
-		runtime2.go
-		rwmutex.go
-		waitgroup.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cond.go
-		map.go
-		mutex.go
-		once.go
-		oncefunc.go
-		pool.go
-		poolqueue.go
-		runtime.go
-		runtime2.go
-		rwmutex.go
-		waitgroup.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/testing/internal/testdeps/ya.make b/contrib/go/_std_1.21/src/testing/internal/testdeps/ya.make
index 81ce470804f..cdadc11ef28 100644
--- a/contrib/go/_std_1.21/src/testing/internal/testdeps/ya.make
+++ b/contrib/go/_std_1.21/src/testing/internal/testdeps/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		deps.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		deps.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		deps.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		deps.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		deps.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		deps.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		deps.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		deps.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		deps.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/testing/ya.make b/contrib/go/_std_1.21/src/testing/ya.make
index 4a265c067a8..eaf586c78f5 100644
--- a/contrib/go/_std_1.21/src/testing/ya.make
+++ b/contrib/go/_std_1.21/src/testing/ya.make
@@ -1,34 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		allocs.go
-		benchmark.go
-		cover.go
-		example.go
-		fuzz.go
-		match.go
-		newcover.go
-		run_example.go
-		testing.go
-		testing_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		allocs.go
-		benchmark.go
-		cover.go
-		example.go
-		fuzz.go
-		match.go
-		newcover.go
-		run_example.go
-		testing.go
-		testing_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		allocs.go
 		benchmark.go
@@ -54,7 +25,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		testing.go
 		testing_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		allocs.go
 		benchmark.go
@@ -67,7 +38,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		testing.go
 		testing_other.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		allocs.go
 		benchmark.go
@@ -93,32 +64,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		testing.go
 		testing_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		allocs.go
-		benchmark.go
-		cover.go
-		example.go
-		fuzz.go
-		match.go
-		newcover.go
-		run_example.go
-		testing.go
-		testing_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		allocs.go
-		benchmark.go
-		cover.go
-		example.go
-		fuzz.go
-		match.go
-		newcover.go
-		run_example.go
-		testing.go
-		testing_windows.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/text/scanner/ya.make b/contrib/go/_std_1.21/src/text/scanner/ya.make
index 898e80a6bde..6d5deccf496 100644
--- a/contrib/go/_std_1.21/src/text/scanner/ya.make
+++ b/contrib/go/_std_1.21/src/text/scanner/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		scanner.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		scanner.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		scanner.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		scanner.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		scanner.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		scanner.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		scanner.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		scanner.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		scanner.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/text/tabwriter/ya.make b/contrib/go/_std_1.21/src/text/tabwriter/ya.make
index 6103f01457c..8679d9ac1eb 100644
--- a/contrib/go/_std_1.21/src/text/tabwriter/ya.make
+++ b/contrib/go/_std_1.21/src/text/tabwriter/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		tabwriter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		tabwriter.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		tabwriter.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		tabwriter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		tabwriter.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		tabwriter.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		tabwriter.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		tabwriter.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		tabwriter.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/text/template/parse/ya.make b/contrib/go/_std_1.21/src/text/template/parse/ya.make
index 4a7573a1cef..69a678355bc 100644
--- a/contrib/go/_std_1.21/src/text/template/parse/ya.make
+++ b/contrib/go/_std_1.21/src/text/template/parse/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		lex.go
-		node.go
-		parse.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		lex.go
-		node.go
-		parse.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		lex.go
 		node.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		node.go
 		parse.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		lex.go
 		node.go
 		parse.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		lex.go
 		node.go
@@ -44,17 +29,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		node.go
 		parse.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		lex.go
-		node.go
-		parse.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		lex.go
-		node.go
-		parse.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/text/template/ya.make b/contrib/go/_std_1.21/src/text/template/ya.make
index 117aef61748..2d1a597edd3 100644
--- a/contrib/go/_std_1.21/src/text/template/ya.make
+++ b/contrib/go/_std_1.21/src/text/template/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		doc.go
-		exec.go
-		funcs.go
-		helper.go
-		option.go
-		template.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		exec.go
-		funcs.go
-		helper.go
-		option.go
-		template.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		doc.go
 		exec.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		option.go
 		template.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		doc.go
 		exec.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		option.go
 		template.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		doc.go
 		exec.go
@@ -65,24 +44,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		option.go
 		template.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		doc.go
-		exec.go
-		funcs.go
-		helper.go
-		option.go
-		template.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		doc.go
-		exec.go
-		funcs.go
-		helper.go
-		option.go
-		template.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/time/tzdata/ya.make b/contrib/go/_std_1.21/src/time/tzdata/ya.make
index 9cd1d2a7d15..a6518e11db1 100644
--- a/contrib/go/_std_1.21/src/time/tzdata/ya.make
+++ b/contrib/go/_std_1.21/src/time/tzdata/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		tzdata.go
-		zzipdata.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		tzdata.go
-		zzipdata.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		tzdata.go
 		zzipdata.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		tzdata.go
 		zzipdata.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		tzdata.go
 		zzipdata.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		tzdata.go
 		zzipdata.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		tzdata.go
 		zzipdata.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		tzdata.go
-		zzipdata.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		tzdata.go
-		zzipdata.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/time/ya.make b/contrib/go/_std_1.21/src/time/ya.make
index 6ca58d4b93b..37f52aefb78 100644
--- a/contrib/go/_std_1.21/src/time/ya.make
+++ b/contrib/go/_std_1.21/src/time/ya.make
@@ -1,34 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		format.go
-		format_rfc3339.go
-		sleep.go
-		sys_unix.go
-		tick.go
-		time.go
-		zoneinfo.go
-		zoneinfo_goroot.go
-		zoneinfo_read.go
-		zoneinfo_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		format.go
-		format_rfc3339.go
-		sleep.go
-		sys_unix.go
-		tick.go
-		time.go
-		zoneinfo.go
-		zoneinfo_goroot.go
-		zoneinfo_read.go
-		zoneinfo_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		format.go
 		format_rfc3339.go
@@ -54,7 +25,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		zoneinfo_read.go
 		zoneinfo_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		format.go
 		format_rfc3339.go
@@ -67,7 +38,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		zoneinfo_read.go
 		zoneinfo_unix.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		format.go
 		format_rfc3339.go
@@ -94,34 +65,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		zoneinfo_read.go
 		zoneinfo_windows.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		format.go
-		format_rfc3339.go
-		sleep.go
-		sys_windows.go
-		tick.go
-		time.go
-		zoneinfo.go
-		zoneinfo_abbrs_windows.go
-		zoneinfo_goroot.go
-		zoneinfo_read.go
-		zoneinfo_windows.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		format.go
-		format_rfc3339.go
-		sleep.go
-		sys_windows.go
-		tick.go
-		time.go
-		zoneinfo.go
-		zoneinfo_abbrs_windows.go
-		zoneinfo_goroot.go
-		zoneinfo_read.go
-		zoneinfo_windows.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/unicode/utf16/ya.make b/contrib/go/_std_1.21/src/unicode/utf16/ya.make
index 63b31be5af5..b5097a77d8b 100644
--- a/contrib/go/_std_1.21/src/unicode/utf16/ya.make
+++ b/contrib/go/_std_1.21/src/unicode/utf16/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		utf16.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		utf16.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		utf16.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		utf16.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		utf16.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		utf16.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		utf16.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		utf16.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		utf16.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/unicode/utf8/ya.make b/contrib/go/_std_1.21/src/unicode/utf8/ya.make
index de0e9fd534c..ad7646bca0c 100644
--- a/contrib/go/_std_1.21/src/unicode/utf8/ya.make
+++ b/contrib/go/_std_1.21/src/unicode/utf8/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		utf8.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		utf8.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		utf8.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		utf8.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		utf8.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		utf8.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		utf8.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		utf8.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		utf8.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/unicode/ya.make b/contrib/go/_std_1.21/src/unicode/ya.make
index eb380b96ac2..c8e3ff7f218 100644
--- a/contrib/go/_std_1.21/src/unicode/ya.make
+++ b/contrib/go/_std_1.21/src/unicode/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		casetables.go
-		digit.go
-		graphic.go
-		letter.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		casetables.go
-		digit.go
-		graphic.go
-		letter.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		casetables.go
 		digit.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		letter.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		casetables.go
 		digit.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		letter.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		casetables.go
 		digit.go
@@ -58,22 +39,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		letter.go
 		tables.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		casetables.go
-		digit.go
-		graphic.go
-		letter.go
-		tables.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		casetables.go
-		digit.go
-		graphic.go
-		letter.go
-		tables.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20/ya.make
index 8f62e9832ca..7991568a250 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		chacha_generic.go
-		chacha_noasm.go
-		xor.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		chacha_arm64.go
-		chacha_arm64.s
-		chacha_generic.go
-		xor.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		chacha_arm64.go
 		chacha_arm64.s
@@ -28,18 +12,17 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		chacha_noasm.go
 		xor.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		chacha_arm64.go
 		chacha_arm64.s
 		chacha_generic.go
 		xor.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
-		chacha_arm64.go
-		chacha_arm64.s
 		chacha_generic.go
+		chacha_noasm.go
 		xor.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -48,19 +31,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		chacha_noasm.go
 		xor.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		chacha_arm64.go
-		chacha_arm64.s
-		chacha_generic.go
-		xor.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		chacha_arm64.go
-		chacha_arm64.s
-		chacha_generic.go
-		xor.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20poly1305/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20poly1305/ya.make
index 2257ada88dd..a6c3f40a583 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20poly1305/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/chacha20poly1305/ya.make
@@ -1,23 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		chacha20poly1305.go
-		chacha20poly1305_amd64.go
-		chacha20poly1305_amd64.s
-		chacha20poly1305_generic.go
-		xchacha20poly1305.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		chacha20poly1305.go
-		chacha20poly1305_generic.go
-		chacha20poly1305_noasm.go
-		xchacha20poly1305.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		chacha20poly1305.go
 		chacha20poly1305_generic.go
@@ -32,18 +14,19 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		chacha20poly1305_generic.go
 		xchacha20poly1305.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		chacha20poly1305.go
 		chacha20poly1305_generic.go
 		chacha20poly1305_noasm.go
 		xchacha20poly1305.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		chacha20poly1305.go
+		chacha20poly1305_amd64.go
+		chacha20poly1305_amd64.s
 		chacha20poly1305_generic.go
-		chacha20poly1305_noasm.go
 		xchacha20poly1305.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -54,19 +37,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		chacha20poly1305_generic.go
 		xchacha20poly1305.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		chacha20poly1305.go
-		chacha20poly1305_generic.go
-		chacha20poly1305_noasm.go
-		xchacha20poly1305.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		chacha20poly1305.go
-		chacha20poly1305_generic.go
-		chacha20poly1305_noasm.go
-		xchacha20poly1305.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/asn1/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/asn1/ya.make
index ebe58fe9626..de7ad280827 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/asn1/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/asn1/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		asn1.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		asn1.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		asn1.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		asn1.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		asn1.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		asn1.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		asn1.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/ya.make
index de07971cc49..eb5fc72be3c 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/cryptobyte/ya.make
@@ -1,20 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		asn1.go
-		builder.go
-		string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-		builder.go
-		string.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		asn1.go
 		builder.go
@@ -26,13 +11,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		builder.go
 		string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		asn1.go
 		builder.go
 		string.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		asn1.go
 		builder.go
@@ -44,18 +29,6 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		builder.go
 		string.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		asn1.go
-		builder.go
-		string.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		asn1.go
-		builder.go
-		string.go
-    )
 ENDIF()
 END()
 
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/hkdf/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/hkdf/ya.make
index afac1c277a7..11a304f6e62 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/hkdf/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/hkdf/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		hkdf.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		hkdf.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		hkdf.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		hkdf.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		hkdf.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		hkdf.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		hkdf.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		hkdf.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		hkdf.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/alias/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/alias/ya.make
index 2af7fd4551e..80830f4c9b5 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/alias/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/alias/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		alias.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		alias.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		alias.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		alias.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/poly1305/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/poly1305/ya.make
index 11e0a8adea7..8574e9faad3 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/poly1305/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/crypto/internal/poly1305/ya.make
@@ -1,23 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bits_go1.13.go
-		poly1305.go
-		sum_amd64.go
-		sum_amd64.s
-		sum_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bits_go1.13.go
-		mac_noasm.go
-		poly1305.go
-		sum_generic.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bits_go1.13.go
 		mac_noasm.go
@@ -32,18 +14,19 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		sum_amd64.s
 		sum_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bits_go1.13.go
 		mac_noasm.go
 		poly1305.go
 		sum_generic.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bits_go1.13.go
-		mac_noasm.go
 		poly1305.go
+		sum_amd64.go
+		sum_amd64.s
 		sum_generic.go
     )
 ELSEIF (OS_WINDOWS AND ARCH_X86_64)
@@ -54,19 +37,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		sum_amd64.s
 		sum_generic.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bits_go1.13.go
-		mac_noasm.go
-		poly1305.go
-		sum_generic.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bits_go1.13.go
-		mac_noasm.go
-		poly1305.go
-		sum_generic.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/dns/dnsmessage/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/dns/dnsmessage/ya.make
index 01769488d15..81edfd8f369 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/dns/dnsmessage/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/dns/dnsmessage/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		message.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		message.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		message.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		message.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		message.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpguts/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpguts/ya.make
index 13a6f5fc413..1218894b28b 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpguts/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpguts/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		guts.go
-		httplex.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		guts.go
-		httplex.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		guts.go
 		httplex.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		guts.go
 		httplex.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		guts.go
 		httplex.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		guts.go
 		httplex.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		guts.go
 		httplex.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		guts.go
-		httplex.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		guts.go
-		httplex.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpproxy/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpproxy/ya.make
index 944a5e66d6b..11762394beb 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpproxy/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http/httpproxy/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		proxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		proxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		proxy.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		proxy.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		proxy.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		proxy.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		proxy.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		proxy.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		proxy.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http2/hpack/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http2/hpack/ya.make
index 7ad589ef344..390f2737355 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http2/hpack/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/http2/hpack/ya.make
@@ -1,24 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		encode.go
-		hpack.go
-		huffman.go
-		static_table.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		hpack.go
-		huffman.go
-		static_table.go
-		tables.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		encode.go
 		hpack.go
@@ -34,7 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		static_table.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		encode.go
 		hpack.go
@@ -42,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		static_table.go
 		tables.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		encode.go
 		hpack.go
@@ -58,21 +39,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		static_table.go
 		tables.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		encode.go
-		hpack.go
-		huffman.go
-		static_table.go
-		tables.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		encode.go
-		hpack.go
-		huffman.go
-		static_table.go
-		tables.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/idna/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/idna/ya.make
index 7ded1b919b1..d7ab5ad54ec 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/idna/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/idna/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		go118.go
-		idna10.0.0.go
-		punycode.go
-		tables15.0.0.go
-		trie.go
-		trie13.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		go118.go
-		idna10.0.0.go
-		punycode.go
-		tables15.0.0.go
-		trie.go
-		trie13.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		go118.go
 		idna10.0.0.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		trie13.0.0.go
 		trieval.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		go118.go
 		idna10.0.0.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		trie13.0.0.go
 		trieval.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		go118.go
 		idna10.0.0.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		trie13.0.0.go
 		trieval.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		go118.go
-		idna10.0.0.go
-		punycode.go
-		tables15.0.0.go
-		trie.go
-		trie13.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		go118.go
-		idna10.0.0.go
-		punycode.go
-		tables15.0.0.go
-		trie.go
-		trie13.0.0.go
-		trieval.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/route/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/route/ya.make
index e1d1fcd8927..6fd7036eb7f 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/net/route/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/net/route/ya.make
@@ -1,8 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		address.go
 		binary.go
@@ -18,23 +15,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		syscall.go
 		zsys_darwin.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		address.go
-		binary.go
-		empty.s
-		interface.go
-		interface_classic.go
-		interface_multicast.go
-		message.go
-		route.go
-		route_classic.go
-		sys.go
-		sys_darwin.go
-		syscall.go
-		zsys_darwin.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		address.go
 		binary.go
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/sys/cpu/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/sys/cpu/ya.make
index fcdf629677c..4739833746c 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/sys/cpu/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/sys/cpu/ya.make
@@ -1,48 +1,14 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		byteorder.go
-		cpu.go
-		cpu_gc_x86.go
-		cpu_linux_noinit.go
-		cpu_x86.go
-		cpu_x86.s
-		endian_little.go
-		hwcap_linux.go
-		parse.go
-		runtime_auxv.go
-		runtime_auxv_go121.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		byteorder.go
-		cpu.go
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_gc_arm64.go
-		cpu_linux_arm64.go
-		endian_little.go
-		hwcap_linux.go
-		parse.go
-		proc_cpuinfo_linux.go
-		runtime_auxv.go
-		runtime_auxv_go121.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		byteorder.go
 		cpu.go
 		cpu_arm64.go
 		cpu_arm64.s
 		cpu_gc_arm64.go
-		cpu_linux_arm64.go
+		cpu_other_arm64.go
 		endian_little.go
-		hwcap_linux.go
 		parse.go
-		proc_cpuinfo_linux.go
 		runtime_auxv.go
 		runtime_auxv_go121.go
     )
@@ -58,28 +24,31 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		runtime_auxv.go
 		runtime_auxv_go121.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		byteorder.go
 		cpu.go
 		cpu_arm64.go
 		cpu_arm64.s
 		cpu_gc_arm64.go
-		cpu_other_arm64.go
+		cpu_linux_arm64.go
 		endian_little.go
+		hwcap_linux.go
 		parse.go
+		proc_cpuinfo_linux.go
 		runtime_auxv.go
 		runtime_auxv_go121.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		byteorder.go
 		cpu.go
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_gc_arm64.go
-		cpu_other_arm64.go
+		cpu_gc_x86.go
+		cpu_linux_noinit.go
+		cpu_x86.go
+		cpu_x86.s
 		endian_little.go
+		hwcap_linux.go
 		parse.go
 		runtime_auxv.go
 		runtime_auxv_go121.go
@@ -96,31 +65,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		runtime_auxv.go
 		runtime_auxv_go121.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		byteorder.go
-		cpu.go
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_gc_arm64.go
-		cpu_other_arm64.go
-		endian_little.go
-		parse.go
-		runtime_auxv.go
-		runtime_auxv_go121.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		byteorder.go
-		cpu.go
-		cpu_arm64.go
-		cpu_arm64.s
-		cpu_gc_arm64.go
-		cpu_other_arm64.go
-		endian_little.go
-		parse.go
-		runtime_auxv.go
-		runtime_auxv_go121.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/secure/bidirule/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/secure/bidirule/ya.make
index e1949d866ab..9073a5e36d6 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/secure/bidirule/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/secure/bidirule/ya.make
@@ -1,18 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bidirule.go
-		bidirule10.0.0.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bidirule.go
-		bidirule10.0.0.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bidirule.go
 		bidirule10.0.0.go
@@ -22,12 +9,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		bidirule.go
 		bidirule10.0.0.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bidirule.go
 		bidirule10.0.0.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bidirule.go
 		bidirule10.0.0.go
@@ -37,15 +24,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		bidirule.go
 		bidirule10.0.0.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bidirule.go
-		bidirule10.0.0.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bidirule.go
-		bidirule10.0.0.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/transform/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/transform/ya.make
index 38d61e2737b..8fa24223676 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/transform/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/transform/ya.make
@@ -1,16 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		transform.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		transform.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		transform.go
     )
@@ -18,11 +7,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		transform.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		transform.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		transform.go
     )
@@ -30,13 +19,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		transform.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		transform.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		transform.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/bidi/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/bidi/ya.make
index 0259a28a9dd..47a2ec2c125 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/bidi/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/bidi/ya.make
@@ -1,26 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		bidi.go
-		bracket.go
-		core.go
-		prop.go
-		tables15.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		bidi.go
-		bracket.go
-		core.go
-		prop.go
-		tables15.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		bidi.go
 		bracket.go
@@ -38,7 +17,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		tables15.0.0.go
 		trieval.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		bidi.go
 		bracket.go
@@ -47,7 +26,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		tables15.0.0.go
 		trieval.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		bidi.go
 		bracket.go
@@ -65,23 +44,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		tables15.0.0.go
 		trieval.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		bidi.go
-		bracket.go
-		core.go
-		prop.go
-		tables15.0.0.go
-		trieval.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		bidi.go
-		bracket.go
-		core.go
-		prop.go
-		tables15.0.0.go
-		trieval.go
-    )
 ENDIF()
 END()
diff --git a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/norm/ya.make b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/norm/ya.make
index 20671a14b55..5b6020506a0 100644
--- a/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/norm/ya.make
+++ b/contrib/go/_std_1.21/src/vendor/golang.org/x/text/unicode/norm/ya.make
@@ -1,32 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		composition.go
-		forminfo.go
-		input.go
-		iter.go
-		normalize.go
-		readwriter.go
-		tables15.0.0.go
-		transform.go
-		trie.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		composition.go
-		forminfo.go
-		input.go
-		iter.go
-		normalize.go
-		readwriter.go
-		tables15.0.0.go
-		transform.go
-		trie.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		composition.go
 		forminfo.go
@@ -50,7 +23,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		transform.go
 		trie.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		composition.go
 		forminfo.go
@@ -62,7 +35,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		transform.go
 		trie.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		composition.go
 		forminfo.go
@@ -86,29 +59,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		transform.go
 		trie.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		composition.go
-		forminfo.go
-		input.go
-		iter.go
-		normalize.go
-		readwriter.go
-		tables15.0.0.go
-		transform.go
-		trie.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		composition.go
-		forminfo.go
-		input.go
-		iter.go
-		normalize.go
-		readwriter.go
-		tables15.0.0.go
-		transform.go
-		trie.go
-    )
 ENDIF()
 END()
diff --git a/contrib/libs/cxxsupp/libcxxrt/atomic.h b/contrib/libs/cxxsupp/libcxxrt/atomic.h
index afdbdd04d5d..701d05337cf 100644
--- a/contrib/libs/cxxsupp/libcxxrt/atomic.h
+++ b/contrib/libs/cxxsupp/libcxxrt/atomic.h
@@ -1,28 +1,102 @@
+
 #ifndef __has_builtin
-#define __has_builtin(x) 0
+#	define __has_builtin(x) 0
 #endif
 #ifndef __has_feature
-#define __has_feature(x) 0
+#	define __has_feature(x) 0
+#endif
+#ifndef __has_extension
+#	define __has_extension(x) 0
+#endif
+
+#if !__has_extension(c_atomic)
+#	define _Atomic(T) T
 #endif
-/**
- * Swap macro that enforces a happens-before relationship with a corresponding
- * ATOMIC_LOAD.
- */
 #if __has_builtin(__c11_atomic_exchange)
-#define ATOMIC_SWAP(addr, val)\
-	__c11_atomic_exchange(reinterpret_cast<_Atomic(__typeof__(val))*>(addr), val, __ATOMIC_ACQ_REL)
-#elif __has_builtin(__sync_swap)
-#define ATOMIC_SWAP(addr, val)\
-	__sync_swap(addr, val)
+#	define ATOMIC_BUILTIN(name) __c11_atomic_##name
 #else
-#define ATOMIC_SWAP(addr, val)\
-	__sync_lock_test_and_set(addr, val)
+#	define ATOMIC_BUILTIN(name) __atomic_##name##_n
 #endif
 
-#if __has_builtin(__c11_atomic_load)
-#define ATOMIC_LOAD(addr)\
-	__c11_atomic_load(reinterpret_cast<_Atomic(__typeof__(*addr))*>(addr), __ATOMIC_ACQUIRE)
+namespace
+{
+	/**
+	 * C++11 memory orders.  We only need a subset of them.
+	 */
+	enum memory_order
+	{
+		/**
+		 * Acquire order.
+		 */
+		acquire = __ATOMIC_ACQUIRE,
+
+		/**
+		 * Release order.
+		 */
+		release = __ATOMIC_RELEASE,
+
+		/**
+		 * Sequentially consistent memory ordering.
+		 */
+		seqcst = __ATOMIC_SEQ_CST
+	};
+
+	/**
+	 * Atomic, implements a subset of `std::atomic`.
+	 */
+	template<typename T>
+	class atomic
+	{
+		/**
+		 * The underlying value.  Use C11 atomic qualification if available.
+		 */
+		_Atomic(T) val;
+
+		public:
+		/**
+		 * Constructor, takes a value.
+		 */
+		atomic(T init) : val(init) {}
+
+		/**
+		 * Atomically load with the specified memory order.
+		 */
+		T load(memory_order order = memory_order::seqcst)
+		{
+			return ATOMIC_BUILTIN(load)(&val, order);
+		}
+
+		/**
+		 * Atomically store with the specified memory order.
+		 */
+		void store(T v, memory_order order = memory_order::seqcst)
+		{
+			return ATOMIC_BUILTIN(store)(&val, v, order);
+		}
+
+		/**
+		 * Atomically exchange with the specified memory order.
+		 */
+		T exchange(T v, memory_order order = memory_order::seqcst)
+		{
+			return ATOMIC_BUILTIN(exchange)(&val, v, order);
+		}
+
+		/**
+		 * Atomically exchange with the specified memory order.
+		 */
+		bool compare_exchange(T &          expected,
+		                      T            desired,
+		                      memory_order order = memory_order::seqcst)
+		{
+#if __has_builtin(__c11_atomic_compare_exchange_strong)
+			return __c11_atomic_compare_exchange_strong(
+			  &val, &expected, desired, order, order);
 #else
-#define ATOMIC_LOAD(addr)\
-	(__sync_synchronize(), *addr)
+			return __atomic_compare_exchange_n(
+			  &val, &expected, desired, true, order, order);
 #endif
+		}
+	};
+} // namespace
+#undef ATOMIC_BUILTIN
diff --git a/contrib/libs/cxxsupp/libcxxrt/cxxabi.h b/contrib/libs/cxxsupp/libcxxrt/cxxabi.h
index 7a8cb6745f8..e96d4c2592f 100644
--- a/contrib/libs/cxxsupp/libcxxrt/cxxabi.h
+++ b/contrib/libs/cxxsupp/libcxxrt/cxxabi.h
@@ -77,6 +77,13 @@ struct __cxa_exception
 {
 #if __LP64__
 	/**
+	 * Now _Unwind_Exception is marked with __attribute__((aligned)), which
+	 * implies __cxa_exception is also aligned.  Insert padding in the
+	 * beginning of the struct, rather than before unwindHeader.
+	 */
+	void *reserve;
+
+	/**
 	 * Reference count.  Used to support the C++11 exception_ptr class.  This
 	 * is prepended to the structure in 64-bit mode and squeezed in to the
 	 * padding left before the 64-bit aligned _Unwind_Exception at the end in
@@ -198,6 +205,14 @@ __cxa_eh_globals *__cxa_get_globals_fast(void);
 
 std::type_info * __cxa_current_exception_type();
 
+
+void *__cxa_allocate_exception(size_t thrown_size);
+
+void __cxa_free_exception(void* thrown_exception);
+
+__cxa_exception *__cxa_init_primary_exception(
+		void *object, std::type_info* tinfo, void (*dest)(void *));
+
 /**
  * Throws an exception returned by __cxa_current_primary_exception().  This
  * exception may have been caught in another thread.
diff --git a/contrib/libs/cxxsupp/libcxxrt/exception.cc b/contrib/libs/cxxsupp/libcxxrt/exception.cc
index 9bb47c8e9e7..0a26befee6a 100644
--- a/contrib/libs/cxxsupp/libcxxrt/exception.cc
+++ b/contrib/libs/cxxsupp/libcxxrt/exception.cc
@@ -1,5 +1,6 @@
 /* 
  * Copyright 2010-2011 PathScale, Inc. All rights reserved.
+ * Copyright 2021 David Chisnall. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -139,6 +140,7 @@ struct __cxa_thread_info
 	terminate_handler terminateHandler;
 	/** The unexpected exception handler for this thread. */
 	unexpected_handler unexpectedHandler;
+#ifndef LIBCXXRT_NO_EMERGENCY_MALLOC
 	/**
 	 * The number of emergency buffers held by this thread.  This is 0 in
 	 * normal operation - the emergency buffers are only used when malloc()
@@ -147,6 +149,7 @@ struct __cxa_thread_info
 	 * in ABI spec [3.3.1]).
 	 */
 	int emergencyBuffersHeld;
+#endif
 	/**
 	 * The exception currently running in a cleanup.
 	 */
@@ -174,6 +177,7 @@ struct __cxa_thread_info
 struct __cxa_dependent_exception
 {
 #if __LP64__
+	void *reserve;
 	void *primaryException;
 #endif
 	std::type_info *exceptionType;
@@ -196,8 +200,18 @@ struct __cxa_dependent_exception
 #endif
 	_Unwind_Exception unwindHeader;
 };
+static_assert(sizeof(__cxa_exception) == sizeof(__cxa_dependent_exception),
+    "__cxa_exception and __cxa_dependent_exception should have the same size");
+static_assert(offsetof(__cxa_exception, referenceCount) ==
+    offsetof(__cxa_dependent_exception, primaryException),
+    "referenceCount and primaryException should have the same offset");
+static_assert(offsetof(__cxa_exception, unwindHeader) ==
+    offsetof(__cxa_dependent_exception, unwindHeader),
+    "unwindHeader fields should have the same offset");
+static_assert(offsetof(__cxa_dependent_exception, unwindHeader) ==
+    offsetof(__cxa_dependent_exception, adjustedPtr) + 8,
+    "there should be no padding before unwindHeader");
 
-static_assert(sizeof(__cxa_dependent_exception) == sizeof(__cxa_exception));
 
 namespace std
 {
@@ -283,19 +297,19 @@ using namespace ABI_NAMESPACE;
  */
 static _Unwind_Reason_Code trace(struct _Unwind_Context *context, void *c)
 {
-	Dl_info myinfo;
-	int mylookup =
-		dladdr(reinterpret_cast<void *>(__cxa_current_exception_type), &myinfo);
-	void *ip = reinterpret_cast<void*>(_Unwind_GetIP(context));
-	Dl_info info;
-	if (dladdr(ip, &info) != 0)
-	{
-		if (mylookup == 0 || strcmp(info.dli_fname, myinfo.dli_fname) != 0)
-		{
-			printf("%p:%s() in %s\n", ip, info.dli_sname, info.dli_fname);
-		}
-	}
-	return _URC_CONTINUE_UNWIND;
+       Dl_info myinfo;
+       int mylookup =
+               dladdr(reinterpret_cast<void *>(__cxa_current_exception_type), &myinfo);
+       void *ip = reinterpret_cast<void*>(_Unwind_GetIP(context));
+       Dl_info info;
+       if (dladdr(ip, &info) != 0)
+       {
+               if (mylookup == 0 || strcmp(info.dli_fname, myinfo.dli_fname) != 0)
+               {
+                       printf("%p:%s() in %s\n", ip, info.dli_sname, info.dli_fname);
+               }
+       }
+       return _URC_CONTINUE_UNWIND;
 }
 
 static void bt_terminate_handler() {
@@ -335,9 +349,9 @@ static void bt_terminate_handler() {
 }
 
 /** The global termination handler. */
-static terminate_handler terminateHandler = bt_terminate_handler;
+static atomic<terminate_handler> terminateHandler = bt_terminate_handler;
 /** The global unexpected exception handler. */
-static unexpected_handler unexpectedHandler = std::terminate;
+static atomic<unexpected_handler> unexpectedHandler = std::terminate;
 
 /** Key used for thread-local data. */
 static pthread_key_t eh_key;
@@ -512,6 +526,23 @@ extern "C" __cxa_eh_globals *ABI_NAMESPACE::__cxa_get_globals_fast(void)
 	return &(thread_info_fast()->globals);
 }
 
+#ifdef LIBCXXRT_NO_EMERGENCY_MALLOC
+static char *alloc_or_die(size_t size)
+{
+	char *buffer = static_cast<char*>(calloc(1, size));
+
+	if (buffer == nullptr)
+	{
+		fputs("Out of memory attempting to allocate exception\n", stderr);
+		std::terminate();
+	}
+	return buffer;
+}
+static void free_exception(char *e)
+{
+	free(e);
+}
+#else
 /**
  * An emergency allocation reserved for when malloc fails.  This is treated as
  * 16 buffers of 1KB each.
@@ -651,6 +682,7 @@ static void free_exception(char *e)
 		free(e);
 	}
 }
+#endif
 
 static constexpr size_t align_to(size_t size, size_t alignment) noexcept {
     return (size + alignment - 1) / alignment * alignment;
@@ -672,6 +704,7 @@ static_assert(
 static constexpr size_t backtrace_buffer_size = 0;
 #endif
 
+
 /**
  * Allocates an exception structure.  Returns a pointer to the space that can
  * be used to store an object of thrown_size bytes.  This function will use an
@@ -821,12 +854,12 @@ static void throw_exception(__cxa_exception *ex)
 	ex->unexpectedHandler = info->unexpectedHandler;
 	if (0 == ex->unexpectedHandler)
 	{
-		ex->unexpectedHandler = unexpectedHandler;
+		ex->unexpectedHandler = unexpectedHandler.load();
 	}
 	ex->terminateHandler  = info->terminateHandler;
 	if (0 == ex->terminateHandler)
 	{
-		ex->terminateHandler = terminateHandler;
+		ex->terminateHandler = terminateHandler.load();
 	}
 	info->globals.uncaughtExceptions++;
 
@@ -837,6 +870,21 @@ static void throw_exception(__cxa_exception *ex)
 	report_failure(err, ex);
 }
 
+extern "C" __cxa_exception *__cxa_init_primary_exception(
+		void *object, std::type_info* tinfo, void (*dest)(void *)) {
+	__cxa_exception *ex = reinterpret_cast<__cxa_exception*>(object) - 1;
+
+	ex->referenceCount = 0;
+	ex->exceptionType = tinfo;
+
+	ex->exceptionDestructor = dest;
+
+	ex->unwindHeader.exception_class = exception_class;
+	ex->unwindHeader.exception_cleanup = exception_cleanup;
+
+	return ex;
+}
+
 typedef void (*cxa_throw_hook_t)(void*, std::type_info*, void(*)(void*)) noexcept;
 
 __attribute__((weak)) cxa_throw_hook_t cxa_throw_hook = nullptr;
@@ -850,20 +898,13 @@ extern "C" void __cxa_throw(void *thrown_exception,
                             std::type_info *tinfo,
                             void(*dest)(void*))
 {
-	if (cxa_throw_hook)
-	{
-		cxa_throw_hook(thrown_exception, tinfo, dest);
-	}
-
-	__cxa_exception *ex = reinterpret_cast<__cxa_exception*>(thrown_exception) - 1;
+       if (cxa_throw_hook)
+       {
+           cxa_throw_hook(thrown_exception, tinfo, dest);
+       }
 
+	__cxa_exception *ex = __cxa_init_primary_exception(thrown_exception, tinfo, dest);
 	ex->referenceCount = 1;
-	ex->exceptionType = tinfo;
-	
-	ex->exceptionDestructor = dest;
-	
-	ex->unwindHeader.exception_class = exception_class;
-	ex->unwindHeader.exception_cleanup = exception_cleanup;
 
 	throw_exception(ex);
 }
@@ -1567,7 +1608,7 @@ namespace std
 	{
 		if (thread_local_handlers) { return pathscale::set_unexpected(f); }
 
-		return ATOMIC_SWAP(&unexpectedHandler, f);
+		return unexpectedHandler.exchange(f);
 	}
 	/**
 	 * Sets the function that is called to terminate the program.
@@ -1576,7 +1617,7 @@ namespace std
 	{
 		if (thread_local_handlers) { return pathscale::set_terminate(f); }
 
-		return ATOMIC_SWAP(&terminateHandler, f);
+		return terminateHandler.exchange(f);
 	}
 	/**
 	 * Terminates the program, calling a custom terminate implementation if
@@ -1592,7 +1633,7 @@ namespace std
 			// return.
 			abort();
 		}
-		terminateHandler();
+		terminateHandler.load()();
 	}
 	/**
 	 * Called when an unexpected exception is encountered (i.e. an exception
@@ -1609,7 +1650,7 @@ namespace std
 			// return.
 			abort();
 		}
-		unexpectedHandler();
+		unexpectedHandler.load()();
 	}
 	/**
 	 * Returns whether there are any exceptions currently being thrown that
@@ -1639,7 +1680,7 @@ namespace std
 		{
 			return info->unexpectedHandler;
 		}
-		return ATOMIC_LOAD(&unexpectedHandler);
+		return unexpectedHandler.load();
 	}
 	/**
 	 * Returns the current terminate handler.
@@ -1651,7 +1692,7 @@ namespace std
 		{
 			return info->terminateHandler;
 		}
-		return ATOMIC_LOAD(&terminateHandler);
+		return terminateHandler.load();
 	}
 }
 #if defined(__arm__) && !defined(__ARM_DWARF_EH__)
@@ -1682,8 +1723,10 @@ asm (
 ".type __cxa_end_cleanup, \"function\"   \n"
 "__cxa_end_cleanup:                      \n"
 "	push {r1, r2, r3, r4}                \n"
+"	mov r4, lr                           \n"
 "	bl __cxa_get_cleanup                 \n"
-"	push {r1, r2, r3, r4}                \n"
+"	mov lr, r4                           \n"
+"	pop {r1, r2, r3, r4}                 \n"
 "	b _Unwind_Resume                     \n"
 "	bl abort                             \n"
 ".popsection                             \n"
diff --git a/contrib/libs/cxxsupp/libcxxrt/guard.cc b/contrib/libs/cxxsupp/libcxxrt/guard.cc
index 10978716e85..cb58aa7da28 100644
--- a/contrib/libs/cxxsupp/libcxxrt/guard.cc
+++ b/contrib/libs/cxxsupp/libcxxrt/guard.cc
@@ -1,5 +1,6 @@
-/* 
+/*
  * Copyright 2010-2012 PathScale, Inc. All rights reserved.
+ * Copyright 2021 David Chisnall. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -10,7 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
  * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -38,126 +39,310 @@
  * value as a low-overhead lock.  Because statics (in most sane code) are
  * accessed far more times than they are initialised, this lock implementation
  * is heavily optimised towards the case where the static has already been
- * initialised.  
+ * initialised.
  */
+#include "atomic.h"
+#include <assert.h>
+#include <pthread.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <pthread.h>
-#include <assert.h>
-#include "atomic.h"
 
 // Older GCC doesn't define __LITTLE_ENDIAN__
 #ifndef __LITTLE_ENDIAN__
-	// If __BYTE_ORDER__ is defined, use that instead
+// If __BYTE_ORDER__ is defined, use that instead
 #	ifdef __BYTE_ORDER__
 #		if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #			define __LITTLE_ENDIAN__
 #		endif
-	// x86 and ARM are the most common little-endian CPUs, so let's have a
-	// special case for them (ARM is already special cased).  Assume everything
-	// else is big endian.
+// x86 and ARM are the most common little-endian CPUs, so let's have a
+// special case for them (ARM is already special cased).  Assume everything
+// else is big endian.
 #	elif defined(__x86_64) || defined(__i386)
 #		define __LITTLE_ENDIAN__
 #	endif
 #endif
 
-
 /*
- * The least significant bit of the guard variable indicates that the object
- * has been initialised, the most significant bit is used for a spinlock.
+ * The Itanium C++ ABI defines guard words that are 64-bit (32-bit on AArch32)
+ * values with one bit defined to indicate that the guarded variable is and
+ * another bit to indicate that it's currently locked (initialisation in
+ * progress).  The bit to use depends on the byte order of the target.
+ *
+ * On many 32-bit platforms, 64-bit atomics are unavailable (or slow) and so we
+ * treat the two halves of the 64-bit word as independent values and establish
+ * an ordering on them such that the guard word is never modified unless the
+ * lock word is in the locked state.  This means that we can do double-checked
+ * locking by loading the guard word and, if it is not initialised, trying to
+ * transition the lock word from the unlocked to locked state, and then
+ * manipulate the guard word.
  */
+namespace
+{
+	/**
+	 * The state of the guard variable when an attempt is made to lock it.
+	 */
+	enum class GuardState
+	{
+		/**
+		 * The lock is not held but is not needed because initialisation is
+		 * one.
+		 */
+		InitDone,
+
+		/**
+		 * Initialisation is not done but the lock is held by the caller.
+		 */
+		InitLockSucceeded,
+
+		/**
+		 * Attempting to acquire the lock failed.
+		 */
+		InitLockFailed
+	};
+
+	/**
+	 * Class encapsulating a single atomic word being used to represent the
+	 * guard.  The word size is defined by the type of `GuardWord`.  The bit
+	 * used to indicate the locked state is `1<<LockedBit`, the bit used to
+	 * indicate the initialised state is `1<<InitBit`.
+	 */
+	template<typename GuardWord, int LockedBit, int InitBit>
+	struct SingleWordGuard
+	{
+		/**
+		 * The value indicating that the lock bit is set (and no other bits).
+		 */
+		static constexpr GuardWord locked = static_cast<GuardWord>(1)
+		                                    << LockedBit;
+
+		/**
+		 * The value indicating that the initialised bit is set (and all other
+		 * bits are zero).
+		 */
+		static constexpr GuardWord initialised = static_cast<GuardWord>(1)
+		                                         << InitBit;
+
+		/**
+		 * The guard variable.
+		 */
+		atomic<GuardWord> val;
+
+		public:
+		/**
+		 * Release the lock and set the initialised state.  In the single-word
+		 * implementation here, these are both done by a single store.
+		 */
+		void unlock(bool isInitialised)
+		{
+			val.store(isInitialised ? initialised : 0, memory_order::release);
+#ifndef NDEBUG
+			GuardWord init_state = initialised;
+			assert(*reinterpret_cast<uint8_t*>(&init_state) != 0);
+#endif
+		}
+
+		/**
+		 * Try to acquire the lock.  This has a tri-state return, indicating
+		 * either that the lock was acquired, it wasn't acquired because it was
+		 * contended, or it wasn't acquired because the guarded variable is
+		 * already initialised.
+		 */
+		GuardState try_lock()
+		{
+			GuardWord old = 0;
+			// Try to acquire the lock, assuming that we are in the state where
+			// the lock is not held and the variable is not initialised (so the
+			// expected value is 0).
+			if (val.compare_exchange(old, locked))
+			{
+				return GuardState::InitLockSucceeded;
+			}
+			// If the CAS failed and the old value indicates that this is
+			// initialised, return that initialisation is done and skip further
+			// retries.
+			if (old == initialised)
+			{
+				return GuardState::InitDone;
+			}
+			// Otherwise, report failure.
+			return GuardState::InitLockFailed;
+		}
+
+		/**
+		 * Check whether the guard indicates that the variable is initialised.
+		 */
+		bool is_initialised()
+		{
+			return (val.load(memory_order::acquire) & initialised) ==
+			       initialised;
+		}
+	};
+
+	/**
+	 * Class encapsulating using two 32-bit atomic values to represent a 64-bit
+	 * guard variable.
+	 */
+	template<int LockedBit, int InitBit>
+	class DoubleWordGuard
+	{
+		/**
+		 * The value of `lock_word` when the lock is held.
+		 */
+		static constexpr uint32_t locked = static_cast<uint32_t>(1)
+		                                   << LockedBit;
+
+		/**
+		 * The value of `init_word` when the guarded variable is initialised.
+		 */
+		static constexpr uint32_t initialised = static_cast<uint32_t>(1)
+		                                        << InitBit;
+
+		/**
+		 * The word used for the initialised flag.  This is always the first
+		 * word irrespective of endian because the generated code compares the
+		 * first byte in memory against 0.
+		 */
+		atomic<uint32_t> init_word;
+
+		/**
+		 * The word used for the lock.
+		 */
+		atomic<uint32_t> lock_word;
+
+		public:
+		/**
+		 * Try to acquire the lock.  This has a tri-state return, indicating
+		 * either that the lock was acquired, it wasn't acquired because it was
+		 * contended, or it wasn't acquired because the guarded variable is
+		 * already initialised.
+		 */
+		GuardState try_lock()
+		{
+			uint32_t old = 0;
+			// Try to acquire the lock
+			if (lock_word.compare_exchange(old, locked))
+			{
+				// If we succeeded, check if initialisation has happened.  In
+				// this version, we don't have atomic manipulation of both the
+				// lock and initialised bits together.  Instead, we have an
+				// ordering rule that the initialised bit is only ever updated
+				// with the lock held.
+				if (is_initialised())
+				{
+					// If another thread did manage to initialise this, release
+					// the lock and notify the caller that initialisation is
+					// done.
+					lock_word.store(0, memory_order::release);
+					return GuardState::InitDone;
+				}
+				return GuardState::InitLockSucceeded;
+			}
+			return GuardState::InitLockFailed;
+		}
+
+		/**
+		 * Set the initialised state and release the lock.  In this
+		 * implementation, this is ordered, not atomic: the initialise bit is
+		 * set while the lock is held.
+		 */
+		void unlock(bool isInitialised)
+		{
+			init_word.store(isInitialised ? initialised : 0,
+			                  memory_order::release);
+			lock_word.store(0, memory_order::release);
+			assert((*reinterpret_cast<uint8_t*>(this) != 0) == isInitialised);
+		}
+
+		/**
+		 * Return whether the guarded variable is initialised.
+		 */
+		bool is_initialised()
+		{
+			return (init_word.load(memory_order::acquire) & initialised) ==
+			       initialised;
+		}
+	};
+
+	// Check that the two implementations are the correct size.
+	static_assert(sizeof(SingleWordGuard<uint32_t, 31, 0>) == sizeof(uint32_t),
+	              "Single-word 32-bit guard must be 32 bits");
+	static_assert(sizeof(SingleWordGuard<uint64_t, 63, 0>) == sizeof(uint64_t),
+	              "Single-word 64-bit guard must be 64 bits");
+	static_assert(sizeof(DoubleWordGuard<31, 0>) == sizeof(uint64_t),
+	              "Double-word guard must be 64 bits");
+
 #ifdef __arm__
-// ARM ABI - 32-bit guards.
-typedef uint32_t guard_t;
-typedef uint32_t guard_lock_t;
-static const uint32_t LOCKED = static_cast<guard_t>(1) << 31;
-static const uint32_t INITIALISED = 1;
-#define LOCK_PART(guard) (guard)
-#define INIT_PART(guard) (guard)
+	/**
+	 * The Arm PCS defines a variant of the Itanium ABI with 32-bit lock words.
+	 */
+	using Guard = SingleWordGuard<uint32_t, 31, 0>;
 #elif defined(_LP64)
-typedef uint64_t guard_t;
-typedef uint64_t guard_lock_t;
 #	if defined(__LITTLE_ENDIAN__)
-static const guard_t LOCKED = static_cast<guard_t>(1) << 63;
-static const guard_t INITIALISED = 1;
+	/**
+	 * On little-endian 64-bit platforms the guard word is a single 64-bit
+	 * atomic with the lock in the high bit and the initialised flag in the low
+	 * bit.
+	 */
+	using Guard = SingleWordGuard<uint64_t, 63, 0>;
 #	else
-static const guard_t LOCKED = 1;
-static const guard_t INITIALISED = static_cast<guard_t>(1) << 56;
+	/**
+	 * On bit-endian 64-bit platforms, the guard word is a single 64-bit atomic
+	 * with the lock in the low bit and the initialised bit in the highest
+	 * byte.
+	 */
+	using Guard = SingleWordGuard<uint64_t, 0, 56>;
 #	endif
-#define LOCK_PART(guard) (guard)
-#define INIT_PART(guard) (guard)
 #else
-typedef uint32_t guard_lock_t;
 #	if defined(__LITTLE_ENDIAN__)
-typedef struct {
-	uint32_t init_half;
-	uint32_t lock_half;
-} guard_t;
-static const uint32_t LOCKED = static_cast<guard_lock_t>(1) << 31;
-static const uint32_t INITIALISED = 1;
+	/**
+	 * 32-bit platforms use the same layout as 64-bit.
+	 */
+	using Guard = DoubleWordGuard<31, 0>;
 #	else
-typedef struct {
-	uint32_t init_half;
-	uint32_t lock_half;
-} guard_t;
-static_assert(sizeof(guard_t) == sizeof(uint64_t), "");
-static const uint32_t LOCKED = 1;
-static const uint32_t INITIALISED = static_cast<guard_lock_t>(1) << 24;
+	/**
+	 * 32-bit platforms use the same layout as 64-bit.
+	 */
+	using Guard = DoubleWordGuard<0, 24>;
 #	endif
-#define LOCK_PART(guard) (&(guard)->lock_half)
-#define INIT_PART(guard) (&(guard)->init_half)
 #endif
-static const guard_lock_t INITIAL = 0;
+
+} // namespace
 
 /**
  * Acquires a lock on a guard, returning 0 if the object has already been
  * initialised, and 1 if it has not.  If the object is already constructed then
  * this function just needs to read a byte from memory and return.
  */
-extern "C" int __cxa_guard_acquire(volatile guard_t *guard_object)
+extern "C" int __cxa_guard_acquire(Guard *guard_object)
 {
-	guard_lock_t old;
-	// Not an atomic read, doesn't establish a happens-before relationship, but
-	// if one is already established and we end up seeing an initialised state
-	// then it's a fast path, otherwise we'll do something more expensive than
-	// this test anyway...
-	if (INITIALISED == __atomic_load_n(INIT_PART(guard_object), __ATOMIC_RELAXED))
+	// Check if this is already initialised.  If so, we don't have to do
+	// anything.
+	if (guard_object->is_initialised())
+	{
 		return 0;
-	// Spin trying to do the initialisation
+	}
+	// Spin trying to acquire the lock.  If we fail to acquire the lock the
+	// first time then another thread will *probably* initialise it, but if the
+	// constructor throws an exception then we may have to try again in this
+	// thread.
 	for (;;)
 	{
-		// Loop trying to move the value of the guard from 0 (not
-		// locked, not initialised) to the locked-uninitialised
-		// position.
-		old = __sync_val_compare_and_swap(LOCK_PART(guard_object),
-		    INITIAL, LOCKED);
-		if (old == INITIAL) {
-			// Lock obtained.  If lock and init bit are
-			// in separate words, check for init race.
-			if (INIT_PART(guard_object) == LOCK_PART(guard_object))
-				return 1;
-			if (INITIALISED != *INIT_PART(guard_object))
+		// Try to acquire the lock.
+		switch (guard_object->try_lock())
+		{
+			// If we failed to acquire the lock but another thread has
+			// initialised the lock while we were waiting, return immediately
+			// indicating that initialisation is not required.
+			case GuardState::InitDone:
+				return 0;
+			// If we acquired the lock, return immediately to start
+			// initialisation.
+			case GuardState::InitLockSucceeded:
 				return 1;
-
-			// No need for a memory barrier here,
-			// see first comment.
-			__atomic_store_n(LOCK_PART(guard_object), INITIAL, __ATOMIC_RELAXED);
-			return 0;
+			// If we didn't acquire the lock, pause and retry.
+			case GuardState::InitLockFailed:
+				break;
 		}
-		// If lock and init bit are in the same word, check again
-		// if we are done.
-		if (INIT_PART(guard_object) == LOCK_PART(guard_object) &&
-		    old == INITIALISED)
-			return 0;
-
-		assert(old == LOCKED);
-		// Another thread holds the lock.
-		// If lock and init bit are in different words, check
-		// if we are done before yielding and looping.
-		if (INIT_PART(guard_object) != LOCK_PART(guard_object) &&
-		    INITIALISED == *INIT_PART(guard_object))
-			return 0;
 		sched_yield();
 	}
 }
@@ -166,28 +351,16 @@ extern "C" int __cxa_guard_acquire(volatile guard_t *guard_object)
  * Releases the lock without marking the object as initialised.  This function
  * is called if initialising a static causes an exception to be thrown.
  */
-extern "C" void __cxa_guard_abort(volatile guard_t *guard_object)
+extern "C" void __cxa_guard_abort(Guard *guard_object)
 {
-	__attribute__((unused))
-	bool reset = __sync_bool_compare_and_swap(LOCK_PART(guard_object),
-	    LOCKED, INITIAL);
-	assert(reset);
+	guard_object->unlock(false);
 }
+
 /**
  * Releases the guard and marks the object as initialised.  This function is
  * called after successful initialisation of a static.
  */
-extern "C" void __cxa_guard_release(volatile guard_t *guard_object)
+extern "C" void __cxa_guard_release(Guard *guard_object)
 {
-	guard_lock_t old;
-	if (INIT_PART(guard_object) == LOCK_PART(guard_object))
-		old = LOCKED;
-	else
-		old = INITIAL;
-	__attribute__((unused))
-	bool reset = __sync_bool_compare_and_swap(INIT_PART(guard_object),
-	    old, INITIALISED);
-	assert(reset);
-	if (INIT_PART(guard_object) != LOCK_PART(guard_object))
-		*LOCK_PART(guard_object) = INITIAL;
+	guard_object->unlock(true);
 }
diff --git a/contrib/libs/cxxsupp/libcxxrt/memory.cc b/contrib/libs/cxxsupp/libcxxrt/memory.cc
index 694c5d5037e..caa0aba79a2 100644
--- a/contrib/libs/cxxsupp/libcxxrt/memory.cc
+++ b/contrib/libs/cxxsupp/libcxxrt/memory.cc
@@ -51,7 +51,7 @@ typedef void (*new_handler)();
  * The function to call when allocation fails.  By default, there is no
  * handler and a bad allocation exception is thrown if an allocation fails.
  */
-static new_handler new_handl;
+static atomic<new_handler> new_handl{nullptr};
 
 namespace std
 {
@@ -61,12 +61,13 @@ namespace std
 	__attribute__((weak))
 	new_handler set_new_handler(new_handler handler) noexcept
 	{
-		return ATOMIC_SWAP(&new_handl, handler);
+		return new_handl.exchange(handler);
 	}
+
 	__attribute__((weak))
 	new_handler get_new_handler(void) noexcept
 	{
-		return ATOMIC_LOAD(&new_handl);
+		return new_handl.load();
 	}
 }
 
diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make
index 66955cff482..93c9d74bb05 100644
--- a/contrib/libs/cxxsupp/libcxxrt/ya.make
+++ b/contrib/libs/cxxsupp/libcxxrt/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.05.
+# Generated by devtools/yamaker from nixpkgs 22.11.
 
 LIBRARY()
 
@@ -11,9 +11,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2021-09-08)
+VERSION(2023-10-11)
 
-ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/14bf5d5526056ae1cc16f03b7b8e96108a1e38d0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/03c83f5a57be8c5b1a29a68de5638744f17d28ba.tar.gz)
 
 ADDINCL(
     contrib/libs/cxxsupp/libcxxrt
@@ -23,10 +23,14 @@ NO_COMPILER_WARNINGS()
 
 NO_RUNTIME()
 
-CXXFLAGS(-nostdinc++)
+CXXFLAGS(
+    -nostdinc++
+)
 
 IF (CXX_UNWIND == "glibcxx_dynamic" OR ARCH_PPC64LE)
-    LDFLAGS(-lgcc_s)
+    LDFLAGS(
+        -lgcc_s
+    )
 ELSE()
     PEERDIR(
         contrib/libs/libunwind
@@ -35,6 +39,7 @@ ENDIF()
 
 IF (SANITIZER_TYPE == undefined OR FUZZING)
     NO_SANITIZE()
+
     NO_SANITIZE_COVERAGE()
 ENDIF()
 
diff --git a/contrib/python/hypothesis/py3/.dist-info/METADATA b/contrib/python/hypothesis/py3/.dist-info/METADATA
index b4f00cf430d..c94200ebd37 100644
--- a/contrib/python/hypothesis/py3/.dist-info/METADATA
+++ b/contrib/python/hypothesis/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypothesis
-Version: 6.92.8
+Version: 6.94.0
 Summary: A library for property-based testing
 Home-page: https://hypothesis.works
 Author: David R. MacIver and Zac Hatfield-Dodds
diff --git a/contrib/python/hypothesis/py3/.dist-info/top_level.txt b/contrib/python/hypothesis/py3/.dist-info/top_level.txt
index 93b8370b8df..77a969c8588 100644
--- a/contrib/python/hypothesis/py3/.dist-info/top_level.txt
+++ b/contrib/python/hypothesis/py3/.dist-info/top_level.txt
@@ -1,3 +1,4 @@
 _hypothesis_ftz_detector
+_hypothesis_globals
 _hypothesis_pytestplugin
 hypothesis
diff --git a/contrib/python/hypothesis/py3/_hypothesis_globals.py b/contrib/python/hypothesis/py3/_hypothesis_globals.py
new file mode 100644
index 00000000000..e97e0918795
--- /dev/null
+++ b/contrib/python/hypothesis/py3/_hypothesis_globals.py
@@ -0,0 +1,28 @@
+# This file is part of Hypothesis, which may be found at
+# https://github.com/HypothesisWorks/hypothesis/
+#
+# Copyright the Hypothesis Authors.
+# Individual contributors are listed in AUTHORS.rst and the git log.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public License,
+# v. 2.0. If a copy of the MPL was not distributed with this file, You can
+# obtain one at https://mozilla.org/MPL/2.0/.
+
+"""
+Module for globals shared between plugin(s) and the main hypothesis module, without
+depending on either. This file should have no imports outside of stdlib.
+"""
+
+import os
+
+in_initialization = 1
+"""If nonzero, indicates that hypothesis is still initializing (importing or loading
+the test environment). `import hypothesis` will cause this number to be decremented,
+and the pytest plugin increments at load time, then decrements it just before the test
+session starts. However, this leads to a hole in coverage if another pytest plugin
+imports hypothesis before our plugin is loaded. HYPOTHESIS_EXTEND_INITIALIZATION may
+be set to pre-increment the value on behalf of _hypothesis_pytestplugin, plugging the
+hole."""
+
+if os.environ.get("HYPOTHESIS_EXTEND_INITIALIZATION"):
+    in_initialization += 1
diff --git a/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py b/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
index 9875e067f52..944304ccdb5 100644
--- a/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
+++ b/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
@@ -21,9 +21,12 @@ See https://github.com/HypothesisWorks/hypothesis/issues/3140 for details.
 
 import base64
 import json
+import os
 import sys
+import warnings
 from inspect import signature
 
+import _hypothesis_globals
 import pytest
 
 try:
@@ -94,6 +97,19 @@ if tuple(map(int, pytest.__version__.split(".")[:2])) < (4, 6):  # pragma: no co
     warnings.warn(PYTEST_TOO_OLD_MESSAGE % (pytest.__version__,), stacklevel=1)
 
 else:
+    # Restart side-effect detection as early as possible, to maximize coverage. We
+    # need balanced increment/decrement in configure/sessionstart to support nested
+    # pytest (e.g. runpytest_inprocess), so this early increment in effect replaces
+    # the first one in pytest_configure.
+    _configured = False
+    if not os.environ.get("HYPOTHESIS_EXTEND_INITIALIZATION"):
+        _hypothesis_globals.in_initialization += 1
+        if "hypothesis" in sys.modules:
+            # Some other plugin has imported hypothesis, so we'll check if there
+            # have been undetected side-effects and warn if so.
+            from hypothesis.configuration import notice_initialization_restarted
+
+            notice_initialization_restarted()
 
     def pytest_addoption(parser):
         group = parser.getgroup("hypothesis", "Hypothesis")
@@ -147,6 +163,12 @@ else:
         return f"hypothesis profile {settings._current_profile!r}{settings_str}"
 
     def pytest_configure(config):
+        global _configured
+        # skip first increment because we pre-incremented at import time
+        if _configured:
+            _hypothesis_globals.in_initialization += 1
+        _configured = True
+
         config.addinivalue_line("markers", "hypothesis: Tests which use hypothesis.")
         if not _any_hypothesis_option(config):
             return
@@ -407,6 +429,9 @@ else:
             if isinstance(item, pytest.Function) and is_hypothesis_test(item.obj):
                 item.add_marker("hypothesis")
 
+    def pytest_sessionstart(session):
+        _hypothesis_globals.in_initialization -= 1
+
     # Monkeypatch some internals to prevent applying @pytest.fixture() to a
     # function which has already been decorated with @hypothesis.given().
     # (the reverse case is already an explicit error in Hypothesis)
diff --git a/contrib/python/hypothesis/py3/hypothesis/__init__.py b/contrib/python/hypothesis/py3/hypothesis/__init__.py
index db140b81653..cfb55119f74 100644
--- a/contrib/python/hypothesis/py3/hypothesis/__init__.py
+++ b/contrib/python/hypothesis/py3/hypothesis/__init__.py
@@ -15,6 +15,8 @@ It verifies your code against a wide range of input and minimizes any
 failing examples it finds.
 """
 
+import _hypothesis_globals
+
 from hypothesis._settings import HealthCheck, Phase, Verbosity, settings
 from hypothesis.control import (
     assume,
@@ -54,3 +56,6 @@ __all__ = [
 
 run()
 del run
+
+_hypothesis_globals.in_initialization -= 1
+del _hypothesis_globals
diff --git a/contrib/python/hypothesis/py3/hypothesis/configuration.py b/contrib/python/hypothesis/py3/hypothesis/configuration.py
index 6e6ab295160..2586c729f7d 100644
--- a/contrib/python/hypothesis/py3/hypothesis/configuration.py
+++ b/contrib/python/hypothesis/py3/hypothesis/configuration.py
@@ -9,8 +9,13 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 import os
+import warnings
 from pathlib import Path
 
+import _hypothesis_globals
+
+from hypothesis.errors import HypothesisSideeffectWarning
+
 __hypothesis_home_directory_default = Path.cwd() / ".hypothesis"
 
 __hypothesis_home_directory = None
@@ -21,7 +26,12 @@ def set_hypothesis_home_dir(directory):
     __hypothesis_home_directory = None if directory is None else Path(directory)
 
 
-def storage_directory(*names):
+def storage_directory(*names, intent_to_write=True):
+    if intent_to_write:
+        check_sideeffect_during_initialization(
+            "accessing storage for {}", "/".join(names)
+        )
+
     global __hypothesis_home_directory
     if not __hypothesis_home_directory:
         if where := os.getenv("HYPOTHESIS_STORAGE_DIRECTORY"):
@@ -29,3 +39,53 @@ def storage_directory(*names):
     if not __hypothesis_home_directory:
         __hypothesis_home_directory = __hypothesis_home_directory_default
     return __hypothesis_home_directory.joinpath(*names)
+
+
+_first_postinit_what = None
+
+
+def check_sideeffect_during_initialization(
+    what: str, *fmt_args: object, extra: str = ""
+) -> None:
+    """Called from locations that should not be executed during initialization, for example
+    touching disk or materializing lazy/deferred strategies from plugins. If initialization
+    is in progress, a warning is emitted.
+
+    Note that computing the repr can take nontrivial time or memory, so we avoid doing so
+    unless (and until) we're actually emitting the warning.
+    """
+    global _first_postinit_what
+    # This is not a particularly hot path, but neither is it doing productive work, so we want to
+    # minimize the cost by returning immediately. The drawback is that we require
+    # notice_initialization_restarted() to be called if in_initialization changes away from zero.
+    if _first_postinit_what is not None:
+        return
+    elif _hypothesis_globals.in_initialization:
+        # Note: -Werror is insufficient under pytest, as doesn't take effect until
+        # test session start.
+        msg = what.format(*fmt_args)
+        warnings.warn(
+            f"Slow code in plugin: avoid {msg} at import time!  Set PYTHONWARNINGS=error "
+            "to get a traceback and show which plugin is responsible." + extra,
+            HypothesisSideeffectWarning,
+            stacklevel=3,
+        )
+    else:
+        _first_postinit_what = (what, fmt_args)
+
+
+def notice_initialization_restarted(*, warn: bool = True) -> None:
+    """Reset _first_postinit_what, so that we don't think we're in post-init. Additionally, if it
+    was set that means that there has been a sideeffect that we haven't warned about, so do that
+    now (the warning text will be correct, and we also hint that the stacktrace can be improved).
+    """
+    global _first_postinit_what
+    if _first_postinit_what is not None:
+        what, *fmt_args = _first_postinit_what
+        _first_postinit_what = None
+        if warn:
+            check_sideeffect_during_initialization(
+                what,
+                *fmt_args,
+                extra=" Additionally, set HYPOTHESIS_EXTEND_INITIALIZATION=1 to pinpoint the exact location.",
+            )
diff --git a/contrib/python/hypothesis/py3/hypothesis/control.py b/contrib/python/hypothesis/py3/hypothesis/control.py
index 3a973f666f9..5b662197a79 100644
--- a/contrib/python/hypothesis/py3/hypothesis/control.py
+++ b/contrib/python/hypothesis/py3/hypothesis/control.py
@@ -105,16 +105,13 @@ class BuildContext:
             )
         )
 
-    def prep_args_kwargs_from_strategies(self, arg_strategies, kwarg_strategies):
+    def prep_args_kwargs_from_strategies(self, kwarg_strategies):
         arg_labels = {}
-        all_s = [(None, s) for s in arg_strategies] + list(kwarg_strategies.items())
-        args = []
         kwargs = {}
-        for i, (k, s) in enumerate(all_s):
+        for k, s in kwarg_strategies.items():
             start_idx = self.data.index
-            obj = self.data.draw(s)
+            obj = self.data.draw(s, observe_as=f"generate:{k}")
             end_idx = self.data.index
-            assert k is not None
             kwargs[k] = obj
 
             # This high up the stack, we can't see or really do much with the conjecture
@@ -124,10 +121,10 @@ class BuildContext:
             # pass a dict of such out so that the pretty-printer knows where to place
             # the which-parts-matter comments later.
             if start_idx != end_idx:
-                arg_labels[k or i] = (start_idx, end_idx)
+                arg_labels[k] = (start_idx, end_idx)
                 self.data.arg_slices.add((start_idx, end_idx))
 
-        return args, kwargs, arg_labels
+        return kwargs, arg_labels
 
     def __enter__(self):
         self.assign_variable = _current_build_context.with_value(self)
diff --git a/contrib/python/hypothesis/py3/hypothesis/core.py b/contrib/python/hypothesis/py3/hypothesis/core.py
index 86b20ea6f98..75f1cc70e98 100644
--- a/contrib/python/hypothesis/py3/hypothesis/core.py
+++ b/contrib/python/hypothesis/py3/hypothesis/core.py
@@ -15,6 +15,7 @@ import contextlib
 import datetime
 import inspect
 import io
+import math
 import sys
 import time
 import types
@@ -605,6 +606,7 @@ def execute_explicit_examples(state, wrapped_test, arguments, kwargs, original_s
                     data=empty_data,
                     how_generated="explicit example",
                     string_repr=state._string_repr,
+                    timing=state._timing_features,
                 )
                 deliver_json_blob(tc)
 
@@ -816,34 +818,30 @@ class StateForActualGivenExecution:
 
         self._string_repr = ""
         text_repr = None
-        if self.settings.deadline is None:
+        if self.settings.deadline is None and not TESTCASE_CALLBACKS:
             test = self.test
         else:
 
             @proxies(self.test)
             def test(*args, **kwargs):
-                arg_drawtime = sum(data.draw_times)
-                initial_draws = len(data.draw_times)
+                arg_drawtime = math.fsum(data.draw_times.values())
                 start = time.perf_counter()
                 try:
                     result = self.test(*args, **kwargs)
                 finally:
                     finish = time.perf_counter()
-                    internal_draw_time = sum(data.draw_times[initial_draws:])
-                    runtime = datetime.timedelta(
-                        seconds=finish - start - internal_draw_time
-                    )
+                    in_drawtime = math.fsum(data.draw_times.values()) - arg_drawtime
+                    runtime = datetime.timedelta(seconds=finish - start - in_drawtime)
                     self._timing_features = {
-                        "time_running_test": finish - start - internal_draw_time,
-                        "time_drawing_args": arg_drawtime,
-                        "time_interactive_draws": internal_draw_time,
+                        "execute_test": finish - start - in_drawtime,
+                        **data.draw_times,
                     }
 
-                current_deadline = self.settings.deadline
-                if not is_final:
-                    current_deadline = (current_deadline // 4) * 5
-                if runtime >= current_deadline:
-                    raise DeadlineExceeded(runtime, self.settings.deadline)
+                if (current_deadline := self.settings.deadline) is not None:
+                    if not is_final:
+                        current_deadline = (current_deadline // 4) * 5
+                    if runtime >= current_deadline:
+                        raise DeadlineExceeded(runtime, self.settings.deadline)
                 return result
 
         def run(data):
@@ -854,10 +852,9 @@ class StateForActualGivenExecution:
             args = self.stuff.args
             kwargs = dict(self.stuff.kwargs)
             if example_kwargs is None:
-                a, kw, argslices = context.prep_args_kwargs_from_strategies(
-                    (), self.stuff.given_kwargs
+                kw, argslices = context.prep_args_kwargs_from_strategies(
+                    self.stuff.given_kwargs
                 )
-                assert not a, "strategies all moved to kwargs by now"
             else:
                 kw = example_kwargs
                 argslices = {}
@@ -944,7 +941,7 @@ class StateForActualGivenExecution:
         if expected_failure is not None:
             exception, traceback = expected_failure
             if isinstance(exception, DeadlineExceeded) and (
-                runtime_secs := self._timing_features.get("time_running_test")
+                runtime_secs := self._timing_features.get("execute_test")
             ):
                 report(
                     "Unreliable test timings! On an initial run, this "
@@ -1066,11 +1063,12 @@ class StateForActualGivenExecution:
                     how_generated=f"generated during {phase} phase",
                     string_repr=self._string_repr,
                     arguments={**self._jsonable_arguments, **data._observability_args},
-                    metadata=self._timing_features,
+                    timing=self._timing_features,
+                    metadata={},
                     coverage=tractable_coverage_report(trace) or None,
                 )
                 deliver_json_blob(tc)
-            self._timing_features.clear()
+            self._timing_features = {}
 
     def run_engine(self):
         """Run the test function many times, on database input and generated
@@ -1184,17 +1182,17 @@ class StateForActualGivenExecution:
                     "status": "passed" if sys.exc_info()[0] else "failed",
                     "status_reason": str(origin or "unexpected/flaky pass"),
                     "representation": self._string_repr,
+                    "arguments": self._jsonable_arguments,
                     "how_generated": "minimal failing example",
                     "features": {
                         **{
-                            k: v
+                            f"target:{k}".strip(":"): v
                             for k, v in ran_example.target_observations.items()
-                            if isinstance(k, str)
                         },
                         **ran_example.events,
-                        **self._timing_features,
                     },
-                    "coverage": None,  # TODO: expose this?
+                    "timing": self._timing_features,
+                    "coverage": None,  # Not recorded when we're replaying the MFE
                     "metadata": {"traceback": tb},
                 }
                 deliver_json_blob(tc)
diff --git a/contrib/python/hypothesis/py3/hypothesis/database.py b/contrib/python/hypothesis/py3/hypothesis/database.py
index 4abce10c01c..9fbdd31597a 100644
--- a/contrib/python/hypothesis/py3/hypothesis/database.py
+++ b/contrib/python/hypothesis/py3/hypothesis/database.py
@@ -59,7 +59,7 @@ def _db_for_path(path=None):
                 "https://hypothesis.readthedocs.io/en/latest/settings.html#settings-profiles"
             )
 
-        path = storage_directory("examples")
+        path = storage_directory("examples", intent_to_write=False)
         if not _usable_dir(path):  # pragma: no cover
             warnings.warn(
                 "The database setting is not configured, and the default "
@@ -495,6 +495,8 @@ class GitHubArtifactDatabase(ExampleDatabase):
         self._initialized = True
 
     def _initialize_db(self) -> None:
+        # Trigger warning that we suppressed earlier by intent_to_write=False
+        storage_directory(self.path.name)
         # Create the cache directory if it doesn't exist
         self.path.mkdir(exist_ok=True, parents=True)
 
diff --git a/contrib/python/hypothesis/py3/hypothesis/errors.py b/contrib/python/hypothesis/py3/hypothesis/errors.py
index 8387a875863..0d376a7493d 100644
--- a/contrib/python/hypothesis/py3/hypothesis/errors.py
+++ b/contrib/python/hypothesis/py3/hypothesis/errors.py
@@ -117,6 +117,13 @@ class HypothesisDeprecationWarning(HypothesisWarning, FutureWarning):
     """
 
 
+class HypothesisSideeffectWarning(HypothesisWarning):
+    """A warning issued by Hypothesis when it sees actions that are
+    discouraged at import or initialization time because they are
+    slow or have user-visible side effects.
+    """
+
+
 class Frozen(HypothesisException):
     """Raised when a mutation method has been called on a ConjectureData object
     after freeze() has been called."""
diff --git a/contrib/python/hypothesis/py3/hypothesis/extra/lark.py b/contrib/python/hypothesis/py3/hypothesis/extra/lark.py
index 57b68ec9f77..37b5f5d4013 100644
--- a/contrib/python/hypothesis/py3/hypothesis/extra/lark.py
+++ b/contrib/python/hypothesis/py3/hypothesis/extra/lark.py
@@ -34,6 +34,7 @@ from hypothesis import strategies as st
 from hypothesis.errors import InvalidArgument
 from hypothesis.internal.conjecture.utils import calc_label_from_name
 from hypothesis.internal.validation import check_type
+from hypothesis.strategies._internal.regex import IncompatibleWithAlphabet
 from hypothesis.strategies._internal.utils import cacheable, defines_strategy
 
 __all__ = ["from_lark"]
@@ -59,7 +60,7 @@ class LarkStrategy(st.SearchStrategy):
     See ``from_lark`` for details.
     """
 
-    def __init__(self, grammar, start, explicit):
+    def __init__(self, grammar, start, explicit, alphabet):
         assert isinstance(grammar, lark.lark.Lark)
         if start is None:
             start = grammar.options.start
@@ -86,38 +87,66 @@ class LarkStrategy(st.SearchStrategy):
             t = r.origin
             self.names_to_symbols[t.name] = t
 
+        disallowed = set()
+        self.terminal_strategies = {}
         for t in terminals:
             self.names_to_symbols[t.name] = Terminal(t.name)
-
-        self.start = st.sampled_from([self.names_to_symbols[s] for s in start])
+            s = st.from_regex(t.pattern.to_regexp(), fullmatch=True, alphabet=alphabet)
+            try:
+                s.validate()
+            except IncompatibleWithAlphabet:
+                disallowed.add(t.name)
+            else:
+                self.terminal_strategies[t.name] = s
 
         self.ignored_symbols = tuple(self.names_to_symbols[n] for n in ignore_names)
 
-        self.terminal_strategies = {
-            t.name: st.from_regex(t.pattern.to_regexp(), fullmatch=True)
-            for t in terminals
-        }
-        unknown_explicit = set(explicit) - get_terminal_names(
-            terminals, rules, ignore_names
-        )
-        if unknown_explicit:
+        all_terminals = get_terminal_names(terminals, rules, ignore_names)
+        if unknown_explicit := sorted(set(explicit) - all_terminals):
+            raise InvalidArgument(
+                "The following arguments were passed as explicit_strategies, but "
+                f"there is no {unknown_explicit} terminal production in this grammar."
+            )
+        if missing_declared := sorted(
+            all_terminals - {t.name for t in terminals} - set(explicit)
+        ):
             raise InvalidArgument(
-                "The following arguments were passed as explicit_strategies, "
-                "but there is no such terminal production in this grammar: "
-                + repr(sorted(unknown_explicit))
+                f"Undefined terminal{'s' * (len(missing_declared) > 1)} "
+                f"{sorted(missing_declared)!r}. Generation does not currently "
+                "support use of %declare unless you pass `explicit`, a dict of "
+                f"names-to-strategies, such as `{{{missing_declared[0]!r}: "
+                'st.just("")}}`'
             )
         self.terminal_strategies.update(explicit)
 
         nonterminals = {}
 
         for rule in rules:
-            nonterminals.setdefault(rule.origin.name, []).append(tuple(rule.expansion))
-
-        for v in nonterminals.values():
-            v.sort(key=len)
+            if disallowed.isdisjoint(r.name for r in rule.expansion):
+                nonterminals.setdefault(rule.origin.name, []).append(
+                    tuple(rule.expansion)
+                )
+
+        allowed_rules = {*self.terminal_strategies, *nonterminals}
+        while dict(nonterminals) != (
+            nonterminals := {
+                k: clean
+                for k, v in nonterminals.items()
+                if (clean := [x for x in v if all(r.name in allowed_rules for r in x)])
+            }
+        ):
+            allowed_rules = {*self.terminal_strategies, *nonterminals}
+
+        if set(start).isdisjoint(allowed_rules):
+            raise InvalidArgument(
+                f"No start rule {tuple(start)} is allowed by {alphabet=}"
+            )
+        self.start = st.sampled_from(
+            [self.names_to_symbols[s] for s in start if s in allowed_rules]
+        )
 
         self.nonterminal_strategies = {
-            k: st.sampled_from(v) for k, v in nonterminals.items()
+            k: st.sampled_from(sorted(v, key=len)) for k, v in nonterminals.items()
         }
 
         self.__rule_labels = {}
@@ -138,15 +167,7 @@ class LarkStrategy(st.SearchStrategy):
 
     def draw_symbol(self, data, symbol, draw_state):
         if isinstance(symbol, Terminal):
-            try:
-                strategy = self.terminal_strategies[symbol.name]
-            except KeyError:
-                raise InvalidArgument(
-                    "Undefined terminal %r. Generation does not currently support "
-                    "use of %%declare unless you pass `explicit`, a dict of "
-                    'names-to-strategies, such as `{%r: st.just("")}`'
-                    % (symbol.name, symbol.name)
-                ) from None
+            strategy = self.terminal_strategies[symbol.name]
             draw_state.append(data.draw(strategy))
         else:
             assert isinstance(symbol, NonTerminal)
@@ -181,6 +202,7 @@ def from_lark(
     *,
     start: Optional[str] = None,
     explicit: Optional[Dict[str, st.SearchStrategy[str]]] = None,
+    alphabet: st.SearchStrategy[str] = st.characters(codec="utf-8"),
 ) -> st.SearchStrategy[str]:
     """A strategy for strings accepted by the given context-free grammar.
 
@@ -214,4 +236,4 @@ def from_lark(
             k: v.map(check_explicit(f"explicit[{k!r}]={v!r}"))
             for k, v in explicit.items()
         }
-    return LarkStrategy(grammar, start, explicit)
+    return LarkStrategy(grammar, start, explicit, alphabet)
diff --git a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/data.py b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/data.py
index 7a5542b0bd6..03f489fa50d 100644
--- a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/data.py
+++ b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/data.py
@@ -30,6 +30,7 @@ from typing import (
     Set,
     Tuple,
     Type,
+    TypeVar,
     Union,
 )
 
@@ -88,6 +89,8 @@ InterestingOrigin = Tuple[
 ]
 TargetObservations = Dict[Optional[str], Union[int, float]]
 
+T = TypeVar("T")
+
 
 class ExtraInformation:
     """A class for holding shared state on a ``ConjectureData`` that should
@@ -1426,7 +1429,7 @@ class ConjectureData:
         self.events: Dict[str, Union[str, int, float]] = {}
         self.forced_indices: "Set[int]" = set()
         self.interesting_origin: Optional[InterestingOrigin] = None
-        self.draw_times: "List[float]" = []
+        self.draw_times: "Dict[str, float]" = {}
         self.max_depth = 0
         self.has_discards = False
         self.provider = PrimitiveProvider(self)
@@ -1550,6 +1553,8 @@ class ConjectureData:
 
     def draw_bytes(self, size: int, *, forced: Optional[bytes] = None) -> bytes:
         assert forced is None or len(forced) == size
+        assert size >= 0
+
         return self.provider.draw_bytes(size, forced=forced)
 
     def draw_boolean(self, p: float = 0.5, *, forced: Optional[bool] = None) -> bool:
@@ -1594,7 +1599,12 @@ class ConjectureData:
             value = repr(value)
         self.output += value
 
-    def draw(self, strategy: "SearchStrategy[Ex]", label: Optional[int] = None) -> "Ex":
+    def draw(
+        self,
+        strategy: "SearchStrategy[Ex]",
+        label: Optional[int] = None,
+        observe_as: Optional[str] = None,
+    ) -> "Ex":
         if self.is_find and not strategy.supports_find:
             raise InvalidArgument(
                 f"Cannot use strategy {strategy!r} within a call to find "
@@ -1631,7 +1641,8 @@ class ConjectureData:
                 try:
                     return strategy.do_draw(self)
                 finally:
-                    self.draw_times.append(time.perf_counter() - start_time)
+                    key = observe_as or f"unlabeled_{len(self.draw_times)}"
+                    self.draw_times[key] = time.perf_counter() - start_time
         finally:
             self.stop_example()
 
@@ -1719,6 +1730,11 @@ class ConjectureData:
         self.buffer = bytes(self.buffer)
         self.observer.conclude_test(self.status, self.interesting_origin)
 
+    def choice(self, values: Sequence[T], *, forced: Optional[T] = None) -> T:
+        forced_i = None if forced is None else values.index(forced)
+        i = self.draw_integer(0, len(values) - 1, forced=forced_i)
+        return values[i]
+
     def draw_bits(self, n: int, *, forced: Optional[int] = None) -> int:
         """Return an ``n``-bit integer from the underlying source of
         bytes. If ``forced`` is set to an integer will instead
@@ -1770,15 +1786,6 @@ class ConjectureData:
         assert result.bit_length() <= n
         return result
 
-    def write(self, string: bytes) -> Optional[bytes]:
-        """Write ``string`` to the output buffer."""
-        self.__assert_not_frozen("write")
-        string = bytes(string)
-        if not string:
-            return None
-        self.draw_bits(len(string) * 8, forced=int_from_bytes(string))
-        return self.buffer[-len(string) :]
-
     def __check_capacity(self, n: int) -> None:
         if self.index + n > self.max_length:
             self.mark_overrun()
diff --git a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/engine.py b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/engine.py
index c5d33480e24..961774816f8 100644
--- a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/engine.py
+++ b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/engine.py
@@ -53,7 +53,39 @@ class HealthCheckState:
     valid_examples: int = attr.ib(default=0)
     invalid_examples: int = attr.ib(default=0)
     overrun_examples: int = attr.ib(default=0)
-    draw_times: list = attr.ib(factory=list)
+    draw_times: "defaultdict[str, list[float]]" = attr.ib(
+        factory=lambda: defaultdict(list)
+    )
+
+    @property
+    def total_draw_time(self):
+        return math.fsum(sum(self.draw_times.values(), start=[]))
+
+    def timing_report(self):
+        """Return a terminal report describing what was slow."""
+        if not self.draw_times:
+            return ""
+        width = max(len(k[len("generate:") :].strip(": ")) for k in self.draw_times)
+        out = [f"\n  {'':^{width}}   count | fraction |    slowest draws (seconds)"]
+        args_in_order = sorted(self.draw_times.items(), key=lambda kv: -sum(kv[1]))
+        for i, (argname, times) in enumerate(args_in_order):  # pragma: no branch
+            # If we have very many unique keys, which can happen due to interactive
+            # draws with computed labels, we'll skip uninformative rows.
+            if (
+                5 <= i < (len(self.draw_times) - 2)
+                and math.fsum(times) * 20 < self.total_draw_time
+            ):
+                out.append(f"  (skipped {len(self.draw_times) - i} rows of fast draws)")
+                break
+            # Compute the row to report, omitting times <1ms to focus on slow draws
+            reprs = [f"{t:>6.3f}," for t in sorted(times)[-5:] if t > 5e-4]
+            desc = " ".join((["    -- "] * 5 + reprs)[-5:]).rstrip(",")
+            arg = argname[len("generate:") :].strip(": ")  # removeprefix in py3.9
+            out.append(
+                f"  {arg:^{width}} | {len(times):>4}  | "
+                f"{math.fsum(times)/self.total_draw_time:>7.0%}  |  {desc}"
+            )
+        return "\n".join(out)
 
 
 class ExitReason(Enum):
@@ -205,7 +237,7 @@ class ConjectureRunner:
                 call_stats = {
                     "status": data.status.name.lower(),
                     "runtime": data.finish_time - data.start_time,
-                    "drawtime": math.fsum(data.draw_times),
+                    "drawtime": math.fsum(data.draw_times.values()),
                     "events": sorted(
                         k if v == "" else f"{k}: {v}" for k, v in data.events.items()
                     ),
@@ -328,7 +360,8 @@ class ConjectureRunner:
         if state is None:
             return
 
-        state.draw_times.extend(data.draw_times)
+        for k, v in data.draw_times.items():
+            state.draw_times[k].append(v)
 
         if data.status == Status.VALID:
             state.valid_examples += 1
@@ -371,7 +404,7 @@ class ConjectureRunner:
                 HealthCheck.filter_too_much,
             )
 
-        draw_time = sum(state.draw_times)
+        draw_time = state.total_draw_time
 
         # Allow at least the greater of one second or 5x the deadline.  If deadline
         # is None, allow 30s - the user can disable the healthcheck too if desired.
@@ -383,7 +416,8 @@ class ConjectureRunner:
                 f"{state.valid_examples} valid examples in {draw_time:.2f} seconds "
                 f"({state.invalid_examples} invalid ones and {state.overrun_examples} "
                 "exceeded maximum size). Try decreasing size of the data you're "
-                "generating (with e.g. max_size or max_leaves parameters).",
+                "generating (with e.g. max_size or max_leaves parameters)."
+                + state.timing_report(),
                 HealthCheck.too_slow,
             )
 
diff --git a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/utils.py b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/utils.py
index 0712b2d8c88..97b913d79e6 100644
--- a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/utils.py
+++ b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/utils.py
@@ -81,14 +81,6 @@ def check_sample(
     return tuple(values)
 
 
-def choice(
-    data: "ConjectureData", values: Sequence[T], *, forced: Optional[T] = None
-) -> T:
-    forced_i = None if forced is None else values.index(forced)
-    i = data.draw_integer(0, len(values) - 1, forced=forced_i)
-    return values[i]
-
-
 class Sampler:
     """Sampler based on Vose's algorithm for the alias method. See
     http://www.keithschwarz.com/darts-dice-coins/ for a good explanation.
@@ -182,8 +174,8 @@ class Sampler:
             if forced is None
             else next((b, a, a_c) for (b, a, a_c) in self.table if forced in (b, a))
         )
-        base, alternate, alternate_chance = choice(
-            data, self.table, forced=forced_choice
+        base, alternate, alternate_chance = data.choice(
+            self.table, forced=forced_choice
         )
         use_alternate = data.draw_boolean(
             alternate_chance, forced=None if forced is None else forced == alternate
diff --git a/contrib/python/hypothesis/py3/hypothesis/internal/observability.py b/contrib/python/hypothesis/py3/hypothesis/internal/observability.py
index 0da4aca7649..284a2072d75 100644
--- a/contrib/python/hypothesis/py3/hypothesis/internal/observability.py
+++ b/contrib/python/hypothesis/py3/hypothesis/internal/observability.py
@@ -37,6 +37,7 @@ def make_testcase(
     how_generated: str = "unknown",
     string_repr: str = "<unknown>",
     arguments: Optional[dict] = None,
+    timing: Dict[str, float],
     metadata: Optional[dict] = None,
     coverage: Optional[Dict[str, List[int]]] = None,
 ) -> dict:
@@ -65,6 +66,7 @@ def make_testcase(
             },
             **data.events,
         },
+        "timing": timing,
         "metadata": {
             **(metadata or {}),
             "traceback": getattr(data.extra_information, "_expected_traceback", None),
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/core.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/core.py
index b3a558c3068..028d8405c7e 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/core.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/core.py
@@ -55,6 +55,7 @@ import attr
 from hypothesis._settings import note_deprecation
 from hypothesis.control import cleanup, current_build_context, note
 from hypothesis.errors import (
+    HypothesisSideeffectWarning,
     HypothesisWarning,
     InvalidArgument,
     ResolutionFailed,
@@ -2100,10 +2101,10 @@ class DataObject:
 
     def draw(self, strategy: SearchStrategy[Ex], label: Any = None) -> Ex:
         check_strategy(strategy, "strategy")
-        result = self.conjecture_data.draw(strategy)
         self.count += 1
         printer = RepresentationPrinter(context=current_build_context())
         desc = f"Draw {self.count}{'' if label is None else f' ({label})'}: "
+        result = self.conjecture_data.draw(strategy, observe_as=f"generate:{desc}")
         if TESTCASE_CALLBACKS:
             self.conjecture_data._observability_args[desc] = to_jsonable(result)
 
@@ -2196,14 +2197,25 @@ def register_type_strategy(
             f"{custom_type=} is not allowed to be registered, "
             f"because there is no such thing as a runtime instance of {custom_type!r}"
         )
-    elif not (isinstance(strategy, SearchStrategy) or callable(strategy)):
+    if not (isinstance(strategy, SearchStrategy) or callable(strategy)):
         raise InvalidArgument(
             f"{strategy=} must be a SearchStrategy, or a function that takes "
             "a generic type and returns a specific SearchStrategy"
         )
-    elif isinstance(strategy, SearchStrategy) and strategy.is_empty:
-        raise InvalidArgument(f"{strategy=} must not be empty")
-    elif types.has_type_arguments(custom_type):
+    if isinstance(strategy, SearchStrategy):
+        with warnings.catch_warnings():
+            warnings.simplefilter("error", HypothesisSideeffectWarning)
+
+            # Calling is_empty forces materialization of lazy strategies. If this is done at import
+            # time, lazy strategies will warn about it; here, we force that warning to raise to
+            # avoid the materialization. Ideally, we'd just check if the strategy is lazy, but the
+            # lazy strategy may be wrapped underneath another strategy so that's complicated.
+            try:
+                if strategy.is_empty:
+                    raise InvalidArgument(f"{strategy=} must not be empty")
+            except HypothesisSideeffectWarning:  # pragma: no cover
+                pass
+    if types.has_type_arguments(custom_type):
         raise InvalidArgument(
             f"Cannot register generic type {custom_type!r}, because it has type "
             "arguments which would not be handled.  Instead, register a function "
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/deferred.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/deferred.py
index 489b4d7b7a0..f7dae9a1e59 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/deferred.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/deferred.py
@@ -10,6 +10,7 @@
 
 import inspect
 
+from hypothesis.configuration import check_sideeffect_during_initialization
 from hypothesis.errors import InvalidArgument
 from hypothesis.internal.reflection import get_pretty_function_description
 from hypothesis.strategies._internal.strategies import SearchStrategy, check_strategy
@@ -27,6 +28,8 @@ class DeferredStrategy(SearchStrategy):
     @property
     def wrapped_strategy(self):
         if self.__wrapped_strategy is None:
+            check_sideeffect_during_initialization("deferred evaluation of {!r}", self)
+
             if not inspect.isfunction(self.__definition):
                 raise InvalidArgument(
                     f"Expected definition to be a function but got {self.__definition!r} "
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/lazy.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/lazy.py
index 5e493a90999..d6bb13c7c13 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/lazy.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/lazy.py
@@ -12,6 +12,7 @@ from inspect import signature
 from typing import MutableMapping
 from weakref import WeakKeyDictionary
 
+from hypothesis.configuration import check_sideeffect_during_initialization
 from hypothesis.internal.reflection import (
     convert_keyword_arguments,
     convert_positional_arguments,
@@ -100,6 +101,8 @@ class LazyStrategy(SearchStrategy):
     @property
     def wrapped_strategy(self):
         if self.__wrapped_strategy is None:
+            check_sideeffect_during_initialization("lazy evaluation of {!r}", self)
+
             unwrapped_args = tuple(unwrap_strategies(s) for s in self.__args)
             unwrapped_kwargs = {
                 k: unwrap_strategies(v) for k, v in self.__kwargs.items()
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/regex.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/regex.py
index 23c3aedc82a..8de137a4225 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/regex.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/regex.py
@@ -63,6 +63,10 @@ GROUP_CACHE_STRATEGY: st.SearchStrategy[dict] = st.shared(
 )
 
 
+class IncompatibleWithAlphabet(InvalidArgument):
+    pass
+
+
 @st.composite
 def update_group(draw, group_name, strategy):
     cache = draw(GROUP_CACHE_STRATEGY)
@@ -176,11 +180,8 @@ class CharactersBuilder:
         else:
             raise NotImplementedError(f"Unknown character category: {category}")
 
-    def add_char(self, char, *, check=True):
+    def add_char(self, c):
         """Add given char to the whitelist."""
-        c = self.code_to_char(char)
-        if check and chars_not_in_alphabet(self._alphabet, c):
-            raise InvalidArgument(f"Literal {c!r} is not in the specified alphabet")
         self._whitelist_chars.add(c)
         if (
             self._ignorecase
@@ -363,7 +364,7 @@ def _strategy(codes, context, is_unicode, *, alphabet):
                 if i + 1 < j:
                     chars = empty.join(to_char(charcode) for _, charcode in codes[i:j])
                     if invalid := chars_not_in_alphabet(alphabet, chars):
-                        raise InvalidArgument(
+                        raise IncompatibleWithAlphabet(
                             f"Literal {chars!r} contains characters {invalid!r} "
                             f"which are not in the specified alphabet"
                         )
@@ -389,7 +390,9 @@ def _strategy(codes, context, is_unicode, *, alphabet):
             # Regex 'a' (single char)
             c = to_char(value)
             if chars_not_in_alphabet(alphabet, c):
-                raise InvalidArgument(f"Literal {c!r} is not in the specified alphabet")
+                raise IncompatibleWithAlphabet(
+                    f"Literal {c!r} is not in the specified alphabet"
+                )
             if (
                 context.flags & re.IGNORECASE
                 and c != c.swapcase()
@@ -451,12 +454,28 @@ def _strategy(codes, context, is_unicode, *, alphabet):
                     pass
                 elif charset_code == sre.LITERAL:
                     # Regex '[a]' (single char)
-                    builder.add_char(charset_value)
+                    c = builder.code_to_char(charset_value)
+                    if chars_not_in_alphabet(builder._alphabet, c):
+                        raise IncompatibleWithAlphabet(
+                            f"Literal {c!r} is not in the specified alphabet"
+                        )
+                    builder.add_char(c)
                 elif charset_code == sre.RANGE:
                     # Regex '[a-z]' (char range)
                     low, high = charset_value
-                    for char_code in range(low, high + 1):
-                        builder.add_char(char_code, check=char_code in (low, high))
+                    chars = empty.join(map(builder.code_to_char, range(low, high + 1)))
+                    if len(chars) == len(
+                        invalid := set(chars_not_in_alphabet(alphabet, chars))
+                    ):
+                        raise IncompatibleWithAlphabet(
+                            f"Charset '[{chr(low)}-{chr(high)}]' contains characters {invalid!r} "
+                            f"which are not in the specified alphabet"
+                        )
+                    for c in chars:
+                        if isinstance(c, int):
+                            c = int_to_byte(c)
+                        if c not in invalid:
+                            builder.add_char(c)
                 elif charset_code == sre.CATEGORY:
                     # Regex '[\w]' (char category)
                     builder.add_category(charset_value)
@@ -515,7 +534,16 @@ def _strategy(codes, context, is_unicode, *, alphabet):
 
         elif code == sre.BRANCH:
             # Regex 'a|b|c' (branch)
-            return st.one_of([recurse(branch) for branch in value[1]])
+            branches = []
+            errors = []
+            for branch in value[1]:
+                try:
+                    branches.append(recurse(branch))
+                except IncompatibleWithAlphabet as e:
+                    errors.append(str(e))
+            if errors and not branches:
+                raise IncompatibleWithAlphabet("\n".join(errors))
+            return st.one_of(branches)
 
         elif code in [sre.MIN_REPEAT, sre.MAX_REPEAT, POSSESSIVE_REPEAT]:
             # Regexes 'a?', 'a*', 'a+' and their non-greedy variants
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/strategies.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/strategies.py
index f2cc0925a54..d2b33f2673d 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/strategies.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/strategies.py
@@ -602,7 +602,7 @@ class SampledFromStrategy(SearchStrategy):
         # The speculative index didn't work out, but at this point we've built
         # and can choose from the complete list of allowed indices and elements.
         if allowed:
-            i, element = cu.choice(data, allowed)
+            i, element = data.choice(allowed)
             data.draw_integer(0, len(self.elements) - 1, forced=i)
             return element
         # If there are no allowed indices, the filter couldn't be satisfied.
diff --git a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/utils.py b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/utils.py
index b2a7661cd6b..bd56d2287ea 100644
--- a/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/utils.py
+++ b/contrib/python/hypothesis/py3/hypothesis/strategies/_internal/utils.py
@@ -184,5 +184,11 @@ def to_jsonable(obj: object) -> object:
     if (pyd := sys.modules.get("pydantic")) and isinstance(obj, pyd.BaseModel):
         return to_jsonable(obj.model_dump())
 
+    # Hey, might as well try calling a .to_json() method - it works for Pandas!
+    try:
+        return to_jsonable(obj.to_json())  # type: ignore
+    except Exception:
+        pass
+
     # If all else fails, we'll just pretty-print as a string.
     return pretty(obj)
diff --git a/contrib/python/hypothesis/py3/hypothesis/version.py b/contrib/python/hypothesis/py3/hypothesis/version.py
index ef8fe6a63a3..fd4613cb616 100644
--- a/contrib/python/hypothesis/py3/hypothesis/version.py
+++ b/contrib/python/hypothesis/py3/hypothesis/version.py
@@ -8,5 +8,5 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-__version_info__ = (6, 92, 8)
+__version_info__ = (6, 94, 0)
 __version__ = ".".join(map(str, __version_info__))
diff --git a/contrib/python/hypothesis/py3/ya.make b/contrib/python/hypothesis/py3/ya.make
index 92b1d0c734e..476e93730ed 100644
--- a/contrib/python/hypothesis/py3/ya.make
+++ b/contrib/python/hypothesis/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(6.92.8)
+VERSION(6.94.0)
 
 LICENSE(MPL-2.0)
 
@@ -20,6 +20,7 @@ NO_CHECK_IMPORTS(
 PY_SRCS(
     TOP_LEVEL
     _hypothesis_ftz_detector.py
+    _hypothesis_globals.py
     _hypothesis_pytestplugin.py
     hypothesis/__init__.py
     hypothesis/_settings.py
diff --git a/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp b/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp
index 4c8dbe83479..c8106255920 100644
--- a/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp
+++ b/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp
@@ -1451,9 +1451,9 @@
 # endif // !defined(BOOST_ASIO_DISABLE_CO_AWAIT)
 # if defined(__clang__)
 #  if (__cpp_coroutines >= 201703)
-#   if __has_include(<experimental/coroutine>)
+#   if __has_include(<coroutine>)
 #    define BOOST_ASIO_HAS_CO_AWAIT 1
-#   endif // __has_include(<experimental/coroutine>)
+#   endif // __has_include(<coroutine>)
 #  endif // (__cpp_coroutines >= 201703)
 # endif // defined(__clang__)
 #endif // !defined(BOOST_ASIO_HAS_CO_AWAIT)
diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt
index 76fbd16e7be..15a2c09f555 100644
--- a/library/cpp/tld/tlds-alpha-by-domain.txt
+++ b/library/cpp/tld/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2024012400, Last Updated Wed Jan 24 07:07:01 2024 UTC
+# Version 2024012700, Last Updated Sat Jan 27 07:07:01 2024 UTC
 AAA
 AARP
 ABB
diff --git a/library/cpp/yt/misc/enum_indexed_array-inl.h b/library/cpp/yt/containers/enum_indexed_array-inl.h
index edda891683e..edda891683e 100644
--- a/library/cpp/yt/misc/enum_indexed_array-inl.h
+++ b/library/cpp/yt/containers/enum_indexed_array-inl.h
diff --git a/library/cpp/yt/misc/enum_indexed_array.h b/library/cpp/yt/containers/enum_indexed_array.h
index 8992456277f..bae6a75237a 100644
--- a/library/cpp/yt/misc/enum_indexed_array.h
+++ b/library/cpp/yt/containers/enum_indexed_array.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "enum.h"
+#include <library/cpp/yt/misc/enum.h>
 
 namespace NYT {
 
diff --git a/library/cpp/yt/misc/unittests/enum_indexed_array_ut.cpp b/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp
index 4111c6f4fec..a87c417d7d8 100644
--- a/library/cpp/yt/misc/unittests/enum_indexed_array_ut.cpp
+++ b/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/testing/gtest/gtest.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT {
 namespace {
diff --git a/library/cpp/yt/containers/unittests/sharded_set_ut.cpp b/library/cpp/yt/containers/unittests/sharded_set_ut.cpp
index 2c4f8c59356..a954ea5151c 100644
--- a/library/cpp/yt/containers/unittests/sharded_set_ut.cpp
+++ b/library/cpp/yt/containers/unittests/sharded_set_ut.cpp
@@ -21,7 +21,7 @@ using TSet = TShardedSet<int, 16, TIntToShard>;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TEST(CompactSetTest, Insert)
+TEST(TShardedSetTest, Insert)
 {
     TSet set;
 
@@ -41,7 +41,7 @@ TEST(CompactSetTest, Insert)
     EXPECT_EQ(0u, set.count(4));
 }
 
-TEST(CompactSetTest, Erase)
+TEST(TShardedSetTest, Erase)
 {
     TSet set;
 
@@ -65,7 +65,7 @@ TEST(CompactSetTest, Erase)
     EXPECT_EQ(0u, set.count(8));
 }
 
-TEST(CompactSetTest, StressTest)
+TEST(TShardedSetTest, StressTest)
 {
     TSet set;
 
diff --git a/library/cpp/yt/containers/unittests/ya.make b/library/cpp/yt/containers/unittests/ya.make
index 3e7cfd4311d..3ffc4206589 100644
--- a/library/cpp/yt/containers/unittests/ya.make
+++ b/library/cpp/yt/containers/unittests/ya.make
@@ -1,8 +1,11 @@
-GTEST(unittester-containers)
+GTEST()
 
 INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
+SIZE(MEDIUM)
+
 SRCS(
+    enum_indexed_array_ut.cpp
     sharded_set_ut.cpp
 )
 
diff --git a/library/cpp/yt/misc/enum-inl.h b/library/cpp/yt/misc/enum-inl.h
index 02493d7ac57..5e1d04da1fb 100644
--- a/library/cpp/yt/misc/enum-inl.h
+++ b/library/cpp/yt/misc/enum-inl.h
@@ -302,67 +302,6 @@ T TEnumTraits<T, true>::FromString(TStringBuf literal)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class E, class T, E Min, E Max>
-constexpr TEnumIndexedVector<E, T, Min, Max>::TEnumIndexedVector()
-    : Items_{}
-{ }
-
-template <class E, class T, E Min, E Max>
-constexpr TEnumIndexedVector<E, T, Min, Max>::TEnumIndexedVector(std::initializer_list<T> elements)
-    : Items_{}
-{
-    Y_ASSERT(std::distance(elements.begin(), elements.end()) <= N);
-    size_t index = 0;
-    for (const auto& element : elements) {
-        Items_[index++] = element;
-    }
-}
-
-template <class E, class T, E Min, E Max>
-T& TEnumIndexedVector<E, T, Min, Max>::operator[] (E index)
-{
-    Y_ASSERT(index >= Min && index <= Max);
-    return Items_[ToUnderlying(index) - ToUnderlying(Min)];
-}
-
-template <class E, class T, E Min, E Max>
-const T& TEnumIndexedVector<E, T, Min, Max>::operator[] (E index) const
-{
-    return const_cast<TEnumIndexedVector&>(*this)[index];
-}
-
-template <class E, class T, E Min, E Max>
-T* TEnumIndexedVector<E, T, Min, Max>::begin()
-{
-    return Items_.data();
-}
-
-template <class E, class T, E Min, E Max>
-const T* TEnumIndexedVector<E, T, Min, Max>::begin() const
-{
-    return Items_.data();
-}
-
-template <class E, class T, E Min, E Max>
-T* TEnumIndexedVector<E, T, Min, Max>::end()
-{
-    return begin() + N;
-}
-
-template <class E, class T, E Min, E Max>
-const T* TEnumIndexedVector<E, T, Min, Max>::end() const
-{
-    return begin() + N;
-}
-
-template <class E, class T, E Min, E Max>
-bool TEnumIndexedVector<E, T, Min, Max>::IsDomainValue(E value)
-{
-    return value >= Min && value <= Max;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 #define ENUM__BINARY_BITWISE_OPERATOR(T, assignOp, op) \
     [[maybe_unused]] inline constexpr T operator op (T lhs, T rhs) \
     { \
diff --git a/library/cpp/yt/misc/enum.h b/library/cpp/yt/misc/enum.h
index 9da79b9fd32..954b63cbc03 100644
--- a/library/cpp/yt/misc/enum.h
+++ b/library/cpp/yt/misc/enum.h
@@ -185,52 +185,6 @@ struct TEnumTraits<T, true>
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// TODO(babenko): drop in favor of TEnumIndexedArray
-//! A statically sized vector with elements of type |T| indexed by
-//! the items of enumeration type |E|.
-/*!
- *  Items are value-initialized on construction.
- */
-template <
-    class E,
-    class T,
-    E Min = TEnumTraits<E>::GetMinValue(),
-    E Max = TEnumTraits<E>::GetMaxValue()
->
-class TEnumIndexedVector
-{
-public:
-    using TIndex = E;
-    using TValue = T;
-
-    constexpr TEnumIndexedVector();
-    constexpr TEnumIndexedVector(std::initializer_list<T> elements);
-
-    constexpr TEnumIndexedVector(const TEnumIndexedVector&) = default;
-    constexpr TEnumIndexedVector(TEnumIndexedVector&&) noexcept = default;
-
-    constexpr TEnumIndexedVector& operator=(const TEnumIndexedVector&) = default;
-    constexpr TEnumIndexedVector& operator=(TEnumIndexedVector&&) noexcept = default;
-
-    T& operator[] (E index);
-    const T& operator[] (E index) const;
-
-    // STL interop.
-    T* begin();
-    const T* begin() const;
-    T* end();
-    const T* end() const;
-
-    static bool IsDomainValue(E value);
-
-private:
-    using TUnderlying = std::underlying_type_t<E>;
-    static constexpr int N = static_cast<TUnderlying>(Max) - static_cast<TUnderlying>(Min) + 1;
-    std::array<T, N> Items_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
 //! Returns |true| iff the enumeration value is not bitwise zero.
 template <typename E>
     requires TEnumTraits<E>::IsBitEnum
diff --git a/library/cpp/yt/misc/unittests/ya.make b/library/cpp/yt/misc/unittests/ya.make
index 43e9f9b9ff1..611edd72173 100644
--- a/library/cpp/yt/misc/unittests/ya.make
+++ b/library/cpp/yt/misc/unittests/ya.make
@@ -4,7 +4,6 @@ INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
 SRCS(
     enum_ut.cpp
-    enum_indexed_array_ut.cpp
     guid_ut.cpp
     preprocessor_ut.cpp
     strong_typedef_ut.cpp
diff --git a/library/cpp/yt/misc/ya.make b/library/cpp/yt/misc/ya.make
index 586d14f6eeb..841930aaa24 100644
--- a/library/cpp/yt/misc/ya.make
+++ b/library/cpp/yt/misc/ya.make
@@ -11,6 +11,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/yt/exception
+    library/cpp/yt/assert
 )
 
 CHECK_DEPENDENT_DIRS(
diff --git a/library/cpp/yt/string/format-inl.h b/library/cpp/yt/string/format-inl.h
index c198fdcd65e..85e82b473e8 100644
--- a/library/cpp/yt/string/format-inl.h
+++ b/library/cpp/yt/string/format-inl.h
@@ -11,8 +11,9 @@
 
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
+#include <library/cpp/yt/containers/enum_indexed_array.h>
+
 #include <library/cpp/yt/misc/enum.h>
-#include <library/cpp/yt/misc/enum_indexed_array.h>
 
 #include <util/system/platform.h>
 
@@ -415,27 +416,6 @@ struct TValueFormatter<TEnumIndexedArray<E, T>>
     }
 };
 
-// TEnumIndexedVector
-template <class E, class T>
-struct TValueFormatter<TEnumIndexedVector<E, T>>
-{
-    static void Do(TStringBuilderBase* builder, const TEnumIndexedVector<E, T>& collection, TStringBuf format)
-    {
-        builder->AppendChar('{');
-        bool firstItem = true;
-        for (const auto& index : TEnumTraits<E>::GetDomainValues()) {
-            if (!firstItem) {
-                builder->AppendString(DefaultJoinToStringDelimiter);
-            }
-            FormatValue(builder, index, format);
-            builder->AppendString(": ");
-            FormatValue(builder, collection[index], format);
-            firstItem = false;
-        }
-        builder->AppendChar('}');
-    }
-};
-
 // std::pair
 template <class T1, class T2>
 struct TValueFormatter<std::pair<T1, T2>>
diff --git a/library/cpp/yt/string/unittests/enum_ut.cpp b/library/cpp/yt/string/unittests/enum_ut.cpp
index 91a8b045006..2c368e85d45 100644
--- a/library/cpp/yt/string/unittests/enum_ut.cpp
+++ b/library/cpp/yt/string/unittests/enum_ut.cpp
@@ -14,7 +14,6 @@ namespace {
 DEFINE_ENUM(ESample, (One)(Two));
 static_assert(TFormatTraits<ESample>::HasCustomFormatValue);
 static_assert(TFormatTraits<TEnumIndexedArray<ESample, int>>::HasCustomFormatValue);
-static_assert(TFormatTraits<TEnumIndexedVector<ESample, int>>::HasCustomFormatValue);
 
 DEFINE_ENUM(EColor,
     (Red)
diff --git a/library/cpp/ytalloc/api/ya.make b/library/cpp/ytalloc/api/ya.make
index 7e7852df14e..9cec6be14c4 100644
--- a/library/cpp/ytalloc/api/ya.make
+++ b/library/cpp/ytalloc/api/ya.make
@@ -6,6 +6,7 @@ SRCS(
 
 PEERDIR(
     library/cpp/yt/misc
+    library/cpp/yt/containers
 )
 
 END()
diff --git a/library/cpp/ytalloc/api/ytalloc.h b/library/cpp/ytalloc/api/ytalloc.h
index 43ba48852d6..38879074dda 100644
--- a/library/cpp/ytalloc/api/ytalloc.h
+++ b/library/cpp/ytalloc/api/ytalloc.h
@@ -3,7 +3,8 @@
 #include <stddef.h>
 
 #include <library/cpp/yt/misc/enum.h>
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <util/system/types.h>
 
diff --git a/library/rightlib_sha.txt b/library/rightlib_sha.txt
index 5bfd2b763b1..8eca80cba6f 100644
--- a/library/rightlib_sha.txt
+++ b/library/rightlib_sha.txt
@@ -1 +1 @@
-f6d7ec162ce757a854f4a619d6b0c7084ad48f3e
+0ff1123e2bd6d1424be6f5d21ad6f390b4fd5ac8
diff --git a/util/charset/wide.h b/util/charset/wide.h
index 6da3c76252c..2b52bb4f12c 100644
--- a/util/charset/wide.h
+++ b/util/charset/wide.h
@@ -49,8 +49,8 @@ namespace NDetail {
 
     inline wchar32 ReadSurrogatePair(const wchar16* chars) noexcept {
         const wchar32 SURROGATE_OFFSET = static_cast<wchar32>(0x10000 - (0xD800 << 10) - 0xDC00);
-        wchar16 lead = chars[0];
-        wchar16 tail = chars[1];
+        wchar32 lead = chars[0];
+        wchar32 tail = chars[1];
 
         Y_ASSERT(IsW16SurrogateLead(lead));
         Y_ASSERT(IsW16SurrogateTail(tail));
@@ -98,7 +98,7 @@ inline wchar32 ReadSymbol(const wchar32* begin, const wchar32* end) noexcept {
 }
 
 //! presuming input data is either big enought of null terminated
-inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin) noexcept {
+inline wchar32 ReadSymbolAndAdvance(const char16_t*& begin) noexcept {
     Y_ASSERT(*begin);
     if (IsW16SurrogateLead(begin[0])) {
         if (IsW16SurrogateTail(begin[1])) {
@@ -117,12 +117,30 @@ inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin) noexcept {
 }
 
 //! presuming input data is either big enought of null terminated
-inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin) noexcept {
+inline wchar32 ReadSymbolAndAdvance(const char32_t*& begin) noexcept {
     Y_ASSERT(*begin);
     return *(begin++);
 }
 
-inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin, const wchar16* end) noexcept {
+inline wchar32 ReadSymbolAndAdvance(const wchar_t*& begin) noexcept {
+    // According to
+    // https://en.cppreference.com/w/cpp/language/types
+    // wchar_t holds UTF-16 on Windows and UTF-32 on Linux / macOS
+    //
+    // Apply reinterpret cast and dispatch to a proper type
+
+#ifdef _win_
+    using TDistinctChar = char16_t;
+#else
+    using TDistinctChar = char32_t;
+#endif
+    const TDistinctChar*& distinctBegin = reinterpret_cast<const TDistinctChar*&>(begin);
+    wchar32 result = ReadSymbolAndAdvance(distinctBegin);
+    begin = reinterpret_cast<const wchar_t*&>(distinctBegin);
+    return result;
+}
+
+inline wchar32 ReadSymbolAndAdvance(const char16_t*& begin, const char16_t* end) noexcept {
     Y_ASSERT(begin < end);
     if (IsW16SurrogateLead(begin[0])) {
         if (begin + 1 != end && IsW16SurrogateTail(begin[1])) {
@@ -144,6 +162,25 @@ inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin, const wchar32* end) n
     return *(begin++);
 }
 
+inline wchar32 ReadSymbolAndAdvance(const wchar_t*& begin, const wchar_t* end) noexcept {
+    // According to
+    // https://en.cppreference.com/w/cpp/language/types
+    // wchar_t holds UTF-16 on Windows and UTF-32 on Linux / macOS
+    //
+    // Apply reinterpret cast and dispatch to a proper type
+
+#ifdef _win_
+    using TDistinctChar = char16_t;
+#else
+    using TDistinctChar = char32_t;
+#endif
+    const TDistinctChar* distinctBegin = reinterpret_cast<const TDistinctChar*>(begin);
+    const TDistinctChar* distinctEnd = reinterpret_cast<const TDistinctChar*>(end);
+    wchar32 result = ::ReadSymbolAndAdvance(distinctBegin, distinctEnd);
+    begin = reinterpret_cast<const wchar_t*>(distinctBegin);
+    return result;
+}
+
 template <class T>
 inline size_t WriteSymbol(wchar16 s, T& dest) noexcept {
     ::NDetail::TSelector<std::is_pointer<T>::value>::WriteSymbol(s, dest);
diff --git a/util/generic/vector.h b/util/generic/vector.h
index a5b258955a8..8cb0aeaea1c 100644
--- a/util/generic/vector.h
+++ b/util/generic/vector.h
@@ -8,6 +8,10 @@
 #include <vector>
 #include <initializer_list>
 
+#ifdef _YNDX_LIBCXX_ENABLE_VECTOR_POD_RESIZE_UNINITIALIZED
+    #include <type_traits>
+#endif
+
 template <class T, class A>
 class TVector: public std::vector<T, TReboundAllocator<A, T>> {
 public:
diff --git a/util/stream/output.cpp b/util/stream/output.cpp
index 719c877764a..8b3f78527dc 100644
--- a/util/stream/output.cpp
+++ b/util/stream/output.cpp
@@ -70,24 +70,13 @@ void Out<wchar32>(IOutputStream& o, wchar32 ch) {
     o.Write(buffer, length);
 }
 
-static void WriteString(IOutputStream& o, const wchar16* w, size_t n) {
+template <typename TCharType>
+static void WriteString(IOutputStream& o, const TCharType* w, size_t n) {
     const size_t buflen = (n * MAX_UTF8_BYTES); // * 4 because the conversion functions can convert unicode character into maximum 4 bytes of UTF8
     TTempBuf buffer(buflen + 1);
-    char* const data = buffer.Data();
     size_t written = 0;
-    WideToUTF8(w, n, data, written);
-    data[written] = 0;
-    o.Write(data, written);
-}
-
-static void WriteString(IOutputStream& o, const wchar32* w, size_t n) {
-    const size_t buflen = (n * MAX_UTF8_BYTES); // * 4 because the conversion functions can convert unicode character into maximum 4 bytes of UTF8
-    TTempBuf buffer(buflen + 1);
-    char* const data = buffer.Data();
-    size_t written = 0;
-    WideToUTF8(w, n, data, written);
-    data[written] = 0;
-    o.Write(data, written);
+    WideToUTF8(w, n, buffer.Data(), written);
+    o.Write(buffer.Data(), written);
 }
 
 template <>
@@ -101,11 +90,31 @@ void Out<std::string>(IOutputStream& o, const std::string& p) {
 }
 
 template <>
+void Out<std::wstring>(IOutputStream& o, const std::wstring& p) {
+    WriteString(o, p.data(), p.length());
+}
+
+template <>
+void Out<std::u16string>(IOutputStream& o, const std::u16string& p) {
+    WriteString(o, p.data(), p.length());
+}
+
+template <>
+void Out<std::u32string>(IOutputStream& o, const std::u32string& p) {
+    WriteString(o, p.data(), p.length());
+}
+
+template <>
 void Out<std::string_view>(IOutputStream& o, const std::string_view& p) {
     o.Write(p.data(), p.length());
 }
 
 template <>
+void Out<std::wstring_view>(IOutputStream& o, const std::wstring_view& p) {
+    WriteString(o, p.data(), p.length());
+}
+
+template <>
 void Out<std::u16string_view>(IOutputStream& o, const std::u16string_view& p) {
     WriteString(o, p.data(), p.length());
 }
diff --git a/util/stream/str_ut.cpp b/util/stream/str_ut.cpp
index fc6b46c31a4..534b58d71cc 100644
--- a/util/stream/str_ut.cpp
+++ b/util/stream/str_ut.cpp
@@ -149,4 +149,42 @@ Y_UNIT_TEST_SUITE(TStringInputOutputTest) {
         // Check old stream is in a valid state
         output1 << "baz";
     }
+
+    // There is no distinct tests for Out<> via IOutputStream.
+    // Let's tests strings output here.
+    Y_UNIT_TEST(TestWritingWideStrings) {
+        using namespace std::literals::string_literals;
+        TString str;
+        TStringOutput stream(str);
+
+        // test char16_t
+        const char16_t* utf16Data = u"Быть или не быть? Вот в чём вопрос";
+        stream << std::u16string(utf16Data);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+
+        stream << std::u16string_view(utf16Data);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+
+        // test char32_t
+        const char32_t* utf32Data = U"Быть или не быть? Вот в чём вопрос";
+        stream << std::u32string(utf32Data);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+
+        stream << std::u32string_view(utf32Data);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+
+        // test wchar_t
+        const wchar_t* wcharData = L"Быть или не быть? Вот в чём вопрос";
+        stream << std::wstring(wcharData);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+
+        stream << std::wstring_view(wcharData);
+        UNIT_ASSERT_STRINGS_EQUAL(str, "Быть или не быть? Вот в чём вопрос");
+        str.clear();
+    }
 }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/certs.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/certs.pb.go
index d5a8b601c9a..85d524d8f86 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/certs.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/certs.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/certs.proto
 
 package adminv3
@@ -22,7 +22,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// Proto representation of certificate details. Admin endpoint uses this wrapper for ``/certs`` to
+// Proto representation of certificate details. Admin endpoint uses this wrapper for “/certs“ to
 // display certificate information. See :ref:`/certs <operations_admin_interface_certs>` for more
 // information.
 type Certificates struct {
@@ -241,6 +241,7 @@ type SubjectAlternateName struct {
 	// Subject Alternate Name.
 	//
 	// Types that are assignable to Name:
+	//
 	//	*SubjectAlternateName_Dns
 	//	*SubjectAlternateName_Uri
 	//	*SubjectAlternateName_IpAddress
@@ -464,14 +465,14 @@ var file_envoy_admin_v3_certs_proto_rawDesc = []byte{
 	0x73, 0x73, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53,
 	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x4e,
-	0x61, 0x6d, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x73, 0x0a, 0x1c, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x43, 0x65, 0x72,
-	0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33,
-	0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x61, 0x6d, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x73, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x2e, 0x76, 0x33, 0x42, 0x0a, 0x43, 0x65, 0x72, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/clusters.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/clusters.pb.go
index c3277cdd31c..d3ddba25414 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/clusters.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/clusters.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/clusters.proto
 
 package adminv3
@@ -24,7 +24,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// Admin endpoint uses this wrapper for ``/clusters`` to display cluster status information.
+// Admin endpoint uses this wrapper for “/clusters“ to display cluster status information.
 // See :ref:`/clusters <operations_admin_interface_clusters>` for more information.
 type Clusters struct {
 	state         protoimpl.MessageState
@@ -88,20 +88,20 @@ type ClusterStatus struct {
 	// The success rate threshold used in the last interval.
 	// If
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``false``, all errors: externally and locally generated were used to calculate the threshold.
+	// is “false“, all errors: externally and locally generated were used to calculate the threshold.
 	// If
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``true``, only externally generated errors were used to calculate the threshold.
+	// is “true“, only externally generated errors were used to calculate the threshold.
 	// The threshold is used to eject hosts based on their success rate. See
 	// :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for details.
 	//
 	// Note: this field may be omitted in any of the three following cases:
 	//
-	// 1. There were not enough hosts with enough request volume to proceed with success rate based
-	//    outlier ejection.
-	// 2. The threshold is computed to be < 0 because a negative value implies that there was no
-	//    threshold for that interval.
-	// 3. Outlier detection is not enabled for this cluster.
+	//  1. There were not enough hosts with enough request volume to proceed with success rate based
+	//     outlier ejection.
+	//  2. The threshold is computed to be < 0 because a negative value implies that there was no
+	//     threshold for that interval.
+	//  3. Outlier detection is not enabled for this cluster.
 	SuccessRateEjectionThreshold *v3.Percent `protobuf:"bytes,3,opt,name=success_rate_ejection_threshold,json=successRateEjectionThreshold,proto3" json:"success_rate_ejection_threshold,omitempty"`
 	// Mapping from host address to the host's current status.
 	HostStatuses []*HostStatus `protobuf:"bytes,4,rep,name=host_statuses,json=hostStatuses,proto3" json:"host_statuses,omitempty"`
@@ -109,17 +109,17 @@ type ClusterStatus struct {
 	// taken into account and externally originated errors were treated as success.
 	// This field should be interpreted only when
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``true``. The threshold is used to eject hosts based on their success rate.
+	// is “true“. The threshold is used to eject hosts based on their success rate.
 	// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
 	// details.
 	//
 	// Note: this field may be omitted in any of the three following cases:
 	//
-	// 1. There were not enough hosts with enough request volume to proceed with success rate based
-	//    outlier ejection.
-	// 2. The threshold is computed to be < 0 because a negative value implies that there was no
-	//    threshold for that interval.
-	// 3. Outlier detection is not enabled for this cluster.
+	//  1. There were not enough hosts with enough request volume to proceed with success rate based
+	//     outlier ejection.
+	//  2. The threshold is computed to be < 0 because a negative value implies that there was no
+	//     threshold for that interval.
+	//  3. Outlier detection is not enabled for this cluster.
 	LocalOriginSuccessRateEjectionThreshold *v3.Percent `protobuf:"bytes,5,opt,name=local_origin_success_rate_ejection_threshold,json=localOriginSuccessRateEjectionThreshold,proto3" json:"local_origin_success_rate_ejection_threshold,omitempty"`
 	// :ref:`Circuit breaking <arch_overview_circuit_break>` settings of the cluster.
 	CircuitBreakers *v31.CircuitBreakers `protobuf:"bytes,6,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"`
@@ -233,10 +233,10 @@ type HostStatus struct {
 	// Request success rate for this host over the last calculated interval.
 	// If
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``false``, all errors: externally and locally generated were used in success rate
+	// is “false“, all errors: externally and locally generated were used in success rate
 	// calculation. If
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``true``, only externally generated errors were used in success rate calculation.
+	// is “true“, only externally generated errors were used in success rate calculation.
 	// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
 	// details.
 	//
@@ -255,7 +255,7 @@ type HostStatus struct {
 	// errors were treated as success.
 	// This field should be interpreted only when
 	// :ref:`outlier_detection.split_external_local_origin_errors<envoy_v3_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
-	// is ``true``.
+	// is “true“.
 	// See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
 	// details.
 	//
@@ -611,14 +611,14 @@ var file_envoy_admin_v3_clusters_proto_rawDesc = []byte{
 	0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e,
 	0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76,
 	0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x76, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x76, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42,
+	0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump.pb.go
index 68ca40f8bd1..445fad63ff5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/config_dump.proto
 
 package adminv3
@@ -37,17 +37,18 @@ type ConfigDump struct {
 	// The following configurations are currently supported and will be dumped in the order given
 	// below:
 	//
-	// * ``bootstrap``: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
-	// * ``clusters``: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
-	// * ``ecds_filter_http``: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
-	// * ``ecds_filter_tcp_listener``: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
-	// * ``endpoints``:  :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
-	// * ``listeners``: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
-	// * ``scoped_routes``: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
-	// * ``routes``:  :ref:`RoutesConfigDump <envoy_v3_api_msg_admin.v3.RoutesConfigDump>`
-	// * ``secrets``:  :ref:`SecretsConfigDump <envoy_v3_api_msg_admin.v3.SecretsConfigDump>`
+	// * “bootstrap“: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
+	// * “clusters“: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
+	// * “ecds_filter_http“: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
+	// * “ecds_filter_quic_listener“: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
+	// * “ecds_filter_tcp_listener“: :ref:`EcdsConfigDump <envoy_v3_api_msg_admin.v3.EcdsConfigDump>`
+	// * “endpoints“:  :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
+	// * “listeners“: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
+	// * “scoped_routes“: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
+	// * “routes“:  :ref:`RoutesConfigDump <envoy_v3_api_msg_admin.v3.RoutesConfigDump>`
+	// * “secrets“:  :ref:`SecretsConfigDump <envoy_v3_api_msg_admin.v3.SecretsConfigDump>`
 	//
-	// EDS Configuration will only be dumped by using parameter ``?include_eds``
+	// EDS Configuration will only be dumped by using parameter “?include_eds“
 	//
 	// Currently ECDS is supported in HTTP and listener filters. Note, ECDS configuration for
 	// either HTTP or listener filter will only be dumped if it is actually configured.
@@ -497,14 +498,14 @@ var file_envoy_admin_v3_config_dump_proto_rawDesc = []byte{
 	0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
 	0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53, 0x65, 0x63,
 	0x72, 0x65, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x42, 0x78,
-	0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64,
+	0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75,
+	0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33,
+	0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump_shared.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump_shared.pb.go
index 5673dd972f2..9180be6df78 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump_shared.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/config_dump_shared.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/config_dump_shared.proto
 
 package adminv3
@@ -708,7 +708,7 @@ type ListenersConfigDump_DynamicListener struct {
 	// configuration dump, the draining listeners should generally be discarded.
 	DrainingState *ListenersConfigDump_DynamicListenerState `protobuf:"bytes,4,opt,name=draining_state,json=drainingState,proto3" json:"draining_state,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this particular
+	// The “error_state“ field contains the rejected version of this particular
 	// resource along with the reason and timestamp. For successfully updated or
 	// acknowledged resource, this field should be empty.
 	ErrorState *UpdateFailureState `protobuf:"bytes,5,opt,name=error_state,json=errorState,proto3" json:"error_state,omitempty"`
@@ -866,7 +866,7 @@ type ClustersConfigDump_DynamicCluster struct {
 	// The timestamp when the Cluster was last updated.
 	LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this particular
+	// The “error_state“ field contains the rejected version of this particular
 	// resource along with the reason and timestamp. For successfully updated or
 	// acknowledged resource, this field should be empty.
 	// [#not-implemented-hide:]
@@ -1015,7 +1015,7 @@ type RoutesConfigDump_DynamicRouteConfig struct {
 	// The timestamp when the Route was last updated.
 	LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this particular
+	// The “error_state“ field contains the rejected version of this particular
 	// resource along with the reason and timestamp. For successfully updated or
 	// acknowledged resource, this field should be empty.
 	// [#not-implemented-hide:]
@@ -1175,7 +1175,7 @@ type ScopedRoutesConfigDump_DynamicScopedRouteConfigs struct {
 	// The timestamp when the scoped route config set was last updated.
 	LastUpdated *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this particular
+	// The “error_state“ field contains the rejected version of this particular
 	// resource along with the reason and timestamp. For successfully updated or
 	// acknowledged resource, this field should be empty.
 	// [#not-implemented-hide:]
@@ -1331,7 +1331,7 @@ type EndpointsConfigDump_DynamicEndpointConfig struct {
 	// [#not-implemented-hide:] The timestamp when the Endpoint was last updated.
 	LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this particular
+	// The “error_state“ field contains the rejected version of this particular
 	// resource along with the reason and timestamp. For successfully updated or
 	// acknowledged resource, this field should be empty.
 	// [#not-implemented-hide:]
@@ -1424,7 +1424,7 @@ type EcdsConfigDump_EcdsFilterConfig struct {
 	// The timestamp when the ECDS filter was last updated.
 	LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
 	// Set if the last update failed, cleared after the next successful update.
-	// The ``error_state`` field contains the rejected version of this
+	// The “error_state“ field contains the rejected version of this
 	// particular resource along with the reason and timestamp. For successfully
 	// updated or acknowledged resource, this field should be empty.
 	// [#not-implemented-hide:]
@@ -1876,15 +1876,15 @@ var file_envoy_admin_v3_config_dump_shared_proto_rawDesc = []byte{
 	0x4e, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44,
 	0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x4f, 0x45, 0x53, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45,
 	0x58, 0x49, 0x53, 0x54, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10,
-	0x03, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x04, 0x42, 0x7e, 0x0a,
-	0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x15, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64,
-	0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70,
+	0x03, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x04, 0x42, 0x7e, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d,
+	0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x15, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d,
+	0x70, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d,
+	0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/init_dump.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/init_dump.pb.go
index e91e784b4ee..03f7035926e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/init_dump.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/init_dump.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/init_dump.proto
 
 package adminv3
@@ -153,14 +153,14 @@ var file_envoy_admin_v3_init_dump_proto_rawDesc = []byte{
 	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a,
 	0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20,
 	0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x42, 0x76, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33,
-	0x42, 0x0d, 0x49, 0x6e, 0x69, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0x76, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x49, 0x6e, 0x69, 0x74, 0x44, 0x75,
+	0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33,
+	0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/listeners.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/listeners.pb.go
index 1718165ddb4..593f59f4ccd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/listeners.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/listeners.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/listeners.proto
 
 package adminv3
@@ -22,7 +22,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// Admin endpoint uses this wrapper for ``/listeners`` to display listener status information.
+// Admin endpoint uses this wrapper for “/listeners“ to display listener status information.
 // See :ref:`/listeners <operations_admin_interface_listeners>` for more information.
 type Listeners struct {
 	state         protoimpl.MessageState
@@ -176,15 +176,15 @@ var file_envoy_admin_v3_listeners_proto_rawDesc = []byte{
 	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x3a, 0x29,
 	0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d,
 	0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x77, 0x0a, 0x1c, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f,
-	0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x77, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76,
+	0x33, 0x42, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/memory.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/memory.pb.go
index d3f7cc547fb..f54ea8e7dee 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/memory.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/memory.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/memory.proto
 
 package adminv3
@@ -31,24 +31,24 @@ type Memory struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The number of bytes allocated by the heap for Envoy. This is an alias for
-	// ``generic.current_allocated_bytes``.
+	// “generic.current_allocated_bytes“.
 	Allocated uint64 `protobuf:"varint,1,opt,name=allocated,proto3" json:"allocated,omitempty"`
 	// The number of bytes reserved by the heap but not necessarily allocated. This is an alias for
-	// ``generic.heap_size``.
+	// “generic.heap_size“.
 	HeapSize uint64 `protobuf:"varint,2,opt,name=heap_size,json=heapSize,proto3" json:"heap_size,omitempty"`
 	// The number of bytes in free, unmapped pages in the page heap. These bytes always count towards
 	// virtual memory usage, and depending on the OS, typically do not count towards physical memory
-	// usage. This is an alias for ``tcmalloc.pageheap_unmapped_bytes``.
+	// usage. This is an alias for “tcmalloc.pageheap_unmapped_bytes“.
 	PageheapUnmapped uint64 `protobuf:"varint,3,opt,name=pageheap_unmapped,json=pageheapUnmapped,proto3" json:"pageheap_unmapped,omitempty"`
 	// The number of bytes in free, mapped pages in the page heap. These bytes always count towards
 	// virtual memory usage, and unless the underlying memory is swapped out by the OS, they also
-	// count towards physical memory usage. This is an alias for ``tcmalloc.pageheap_free_bytes``.
+	// count towards physical memory usage. This is an alias for “tcmalloc.pageheap_free_bytes“.
 	PageheapFree uint64 `protobuf:"varint,4,opt,name=pageheap_free,json=pageheapFree,proto3" json:"pageheap_free,omitempty"`
 	// The amount of memory used by the TCMalloc thread caches (for small objects). This is an alias
-	// for ``tcmalloc.current_total_thread_cache_bytes``.
+	// for “tcmalloc.current_total_thread_cache_bytes“.
 	TotalThreadCache uint64 `protobuf:"varint,5,opt,name=total_thread_cache,json=totalThreadCache,proto3" json:"total_thread_cache,omitempty"`
 	// The number of bytes of the physical memory usage by the allocator. This is an alias for
-	// ``generic.total_physical_bytes``.
+	// “generic.total_physical_bytes“.
 	TotalPhysicalBytes uint64 `protobuf:"varint,6,opt,name=total_physical_bytes,json=totalPhysicalBytes,proto3" json:"total_physical_bytes,omitempty"`
 }
 
@@ -153,14 +153,14 @@ var file_envoy_admin_v3_memory_proto_rawDesc = []byte{
 	0x01, 0x28, 0x04, 0x52, 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63,
 	0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x3a, 0x21, 0x9a, 0xc5, 0x88, 0x1e, 0x1c, 0x0a, 0x1a,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c,
-	0x70, 0x68, 0x61, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x42, 0x74, 0x0a, 0x1c, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x4d, 0x65, 0x6d, 0x6f,
-	0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33,
-	0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x70, 0x68, 0x61, 0x2e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x42, 0x74, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
+	0x76, 0x33, 0x42, 0x0b, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/metrics.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/metrics.pb.go
index a7e0729713c..b4d35e8f60b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/metrics.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/metrics.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/metrics.proto
 
 package adminv3
@@ -155,15 +155,15 @@ var file_envoy_admin_v3_metrics_proto_rawDesc = []byte{
 	0x55, 0x4e, 0x54, 0x45, 0x52, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x41, 0x55, 0x47, 0x45,
 	0x10, 0x01, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x42, 0x75, 0x0a, 0x1c, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x65, 0x74,
-	0x72, 0x69, 0x63, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f,
-	0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x42, 0x75, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/mutex_stats.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/mutex_stats.pb.go
index b50b0c615b5..ddaec87020e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/mutex_stats.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/mutex_stats.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/mutex_stats.proto
 
 package adminv3
@@ -22,11 +22,11 @@ const (
 )
 
 // Proto representation of the statistics collected upon absl::Mutex contention, if Envoy is run
-// under :option:`--enable-mutex-tracing`. For more information, see the ``absl::Mutex``
+// under :option:`--enable-mutex-tracing`. For more information, see the “absl::Mutex“
 // [docs](https://abseil.io/about/design/mutex#extra-features).
 //
-// *NB*: The wait cycles below are measured by ``absl::base_internal::CycleClock``, and may not
-// correspond to core clock frequency. For more information, see the ``CycleClock``
+// *NB*: The wait cycles below are measured by “absl::base_internal::CycleClock“, and may not
+// correspond to core clock frequency. For more information, see the “CycleClock“
 // [docs](https://github.com/abseil/abseil-cpp/blob/master/absl/base/internal/cycleclock.h).
 type MutexStats struct {
 	state         protoimpl.MessageState
@@ -116,14 +116,14 @@ var file_envoy_admin_v3_mutex_stats_proto_rawDesc = []byte{
 	0x74, 0x69, 0x6d, 0x65, 0x57, 0x61, 0x69, 0x74, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x73, 0x3a, 0x25,
 	0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d,
 	0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4d, 0x75, 0x74, 0x65, 0x78,
-	0x53, 0x74, 0x61, 0x74, 0x73, 0x42, 0x78, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d,
-	0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4d, 0x75, 0x74, 0x65, 0x78, 0x53, 0x74, 0x61, 0x74,
-	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x53, 0x74, 0x61, 0x74, 0x73, 0x42, 0x78, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4d,
+	0x75, 0x74, 0x65, 0x78, 0x53, 0x74, 0x61, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/server_info.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/server_info.pb.go
index a3a084baee6..8e8f5375d13 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/server_info.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/server_info.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/server_info.proto
 
 package adminv3
@@ -842,14 +842,14 @@ var file_envoy_admin_v3_server_info_proto_rawDesc = []byte{
 	0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x52, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x6f,
 	0x62, 0x6a, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6c, 0x65, 0x6e, 0x52, 0x11, 0x62, 0x6f, 0x6f,
 	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x78,
-	0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64,
+	0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33,
+	0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/tap.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/tap.pb.go
index 1111cc8e561..056ee37b952 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/tap.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v3/tap.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/admin/v3/tap.proto
 
 package adminv3
@@ -105,14 +105,14 @@ var file_envoy_admin_v3_tap_proto_rawDesc = []byte{
 	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x74, 0x61, 0x70, 0x43,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68,
-	0x61, 0x2e, 0x54, 0x61, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x71, 0x0a, 0x1c,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x54, 0x61,
-	0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x61, 0x2e, 0x54, 0x61, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x71, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x54, 0x61, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/deprecation.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/deprecation.pb.go
index 2a73462bfb1..75ba29582d4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/deprecation.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/deprecation.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/annotations/deprecation.proto
 
 package annotations
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/resource.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/resource.pb.go
index 597d6da5c9a..5da50ae67a3 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/resource.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/annotations/resource.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/annotations/resource.proto
 
 package annotations
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go
index 225e71961aa..8fc62ff7a93 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/auth/cert.proto
 
 package auth
@@ -34,16 +34,16 @@ var file_envoy_api_v2_auth_cert_proto_rawDesc = []byte{
 	0x61, 0x75, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f,
 	0x61, 0x75, 0x74, 0x68, 0x2f, 0x74, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x99,
-	0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75,
-	0x74, 0x68, 0x42, 0x09, 0x43, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12,
-	0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x50, 0x01, 0x50, 0x02, 0x50, 0x03,
+	0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e,
+	0x76, 0x33, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61,
+	0x75, 0x74, 0x68, 0x42, 0x09, 0x43, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x50, 0x01, 0x50, 0x02, 0x50, 0x03,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/common.pb.go
index 8f05100da7c..741735fd3c9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/common.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/auth/common.proto
 
 package auth
@@ -143,9 +143,9 @@ type TlsParameters struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Minimum TLS protocol version. By default, it's ``TLSv1_2`` for both clients and servers.
+	// Minimum TLS protocol version. By default, it's “TLSv1_2“ for both clients and servers.
 	TlsMinimumProtocolVersion TlsParameters_TlsProtocol `protobuf:"varint,1,opt,name=tls_minimum_protocol_version,json=tlsMinimumProtocolVersion,proto3,enum=envoy.api.v2.auth.TlsParameters_TlsProtocol" json:"tls_minimum_protocol_version,omitempty"`
-	// Maximum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_3`` for
+	// Maximum TLS protocol version. By default, it's “TLSv1_2“ for clients and “TLSv1_3“ for
 	// servers.
 	TlsMaximumProtocolVersion TlsParameters_TlsProtocol `protobuf:"varint,2,opt,name=tls_maximum_protocol_version,json=tlsMaximumProtocolVersion,proto3,enum=envoy.api.v2.auth.TlsParameters_TlsProtocol" json:"tls_maximum_protocol_version,omitempty"`
 	// If specified, the TLS listener will only support the specified `cipher list
@@ -157,35 +157,35 @@ type TlsParameters struct {
 	//
 	// .. code-block:: none
 	//
-	//   [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-	//   [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-	//   ECDHE-ECDSA-AES128-SHA
-	//   ECDHE-RSA-AES128-SHA
-	//   AES128-GCM-SHA256
-	//   AES128-SHA
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
-	//   ECDHE-ECDSA-AES256-SHA
-	//   ECDHE-RSA-AES256-SHA
-	//   AES256-GCM-SHA384
-	//   AES256-SHA
+	//	[ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
+	//	[ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
+	//	ECDHE-ECDSA-AES128-SHA
+	//	ECDHE-RSA-AES128-SHA
+	//	AES128-GCM-SHA256
+	//	AES128-SHA
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
+	//	ECDHE-ECDSA-AES256-SHA
+	//	ECDHE-RSA-AES256-SHA
+	//	AES256-GCM-SHA384
+	//	AES256-SHA
 	//
 	// In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default cipher list is:
 	//
 	// .. code-block:: none
 	//
-	//   ECDHE-ECDSA-AES128-GCM-SHA256
-	//   ECDHE-RSA-AES128-GCM-SHA256
-	//   ECDHE-ECDSA-AES128-SHA
-	//   ECDHE-RSA-AES128-SHA
-	//   AES128-GCM-SHA256
-	//   AES128-SHA
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
-	//   ECDHE-ECDSA-AES256-SHA
-	//   ECDHE-RSA-AES256-SHA
-	//   AES256-GCM-SHA384
-	//   AES256-SHA
+	//	ECDHE-ECDSA-AES128-GCM-SHA256
+	//	ECDHE-RSA-AES128-GCM-SHA256
+	//	ECDHE-ECDSA-AES128-SHA
+	//	ECDHE-RSA-AES128-SHA
+	//	AES128-GCM-SHA256
+	//	AES128-SHA
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
+	//	ECDHE-ECDSA-AES256-SHA
+	//	ECDHE-RSA-AES256-SHA
+	//	AES256-GCM-SHA384
+	//	AES256-SHA
 	CipherSuites []string `protobuf:"bytes,3,rep,name=cipher_suites,json=cipherSuites,proto3" json:"cipher_suites,omitempty"`
 	// If specified, the TLS connection will only support the specified ECDH
 	// curves. If not specified, the default curves will be used.
@@ -194,14 +194,14 @@ type TlsParameters struct {
 	//
 	// .. code-block:: none
 	//
-	//   X25519
-	//   P-256
+	//	X25519
+	//	P-256
 	//
 	// In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default curve is:
 	//
 	// .. code-block:: none
 	//
-	//   P-256
+	//	P-256
 	EcdhCurves []string `protobuf:"bytes,4,rep,name=ecdh_curves,json=ecdhCurves,proto3" json:"ecdh_curves,omitempty"`
 }
 
@@ -279,6 +279,7 @@ type PrivateKeyProvider struct {
 	// Private key method provider specific configuration.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*PrivateKeyProvider_Config
 	//	*PrivateKeyProvider_TypedConfig
 	ConfigType isPrivateKeyProvider_ConfigType `protobuf_oneof:"config_type"`
@@ -330,7 +331,7 @@ func (m *PrivateKeyProvider) GetConfigType() isPrivateKeyProvider_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto.
 func (x *PrivateKeyProvider) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*PrivateKeyProvider_Config); ok {
 		return x.Config
@@ -350,7 +351,7 @@ type isPrivateKeyProvider_ConfigType interface {
 }
 
 type PrivateKeyProvider_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -374,7 +375,7 @@ type TlsCertificate struct {
 	PrivateKey *core.DataSource `protobuf:"bytes,2,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
 	// BoringSSL private key method provider. This is an alternative to :ref:`private_key
 	// <envoy_api_field_auth.TlsCertificate.private_key>` field. This can't be
-	// marked as ``oneof`` due to API compatibility reasons. Setting both :ref:`private_key
+	// marked as “oneof“ due to API compatibility reasons. Setting both :ref:`private_key
 	// <envoy_api_field_auth.TlsCertificate.private_key>` and
 	// :ref:`private_key_provider
 	// <envoy_api_field_auth.TlsCertificate.private_key_provider>` fields will result in an
@@ -479,18 +480,18 @@ type TlsSessionTicketKeys struct {
 	// or on different hosts.
 	//
 	// Each key must contain exactly 80 bytes of cryptographically-secure random data. For
-	// example, the output of ``openssl rand 80``.
+	// example, the output of “openssl rand 80“.
 	//
 	// .. attention::
 	//
-	//   Using this feature has serious security considerations and risks. Improper handling of keys
-	//   may result in loss of secrecy in connections, even if ciphers supporting perfect forward
-	//   secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
-	//   discussion. To minimize the risk, you must:
+	//	Using this feature has serious security considerations and risks. Improper handling of keys
+	//	may result in loss of secrecy in connections, even if ciphers supporting perfect forward
+	//	secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
+	//	discussion. To minimize the risk, you must:
 	//
-	//   * Keep the session ticket keys at least as secure as your TLS certificate private keys
-	//   * Rotate session ticket keys at least daily, and preferably hourly
-	//   * Always generate keys using a cryptographically-secure random data source
+	//	* Keep the session ticket keys at least as secure as your TLS certificate private keys
+	//	* Rotate session ticket keys at least daily, and preferably hourly
+	//	* Always generate keys using a cryptographically-secure random data source
 	Keys []*core.DataSource `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
 }
 
@@ -568,11 +569,11 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -noout -pubkey
-	//     | openssl pkey -pubin -outform DER
-	//     | openssl dgst -sha256 -binary
-	//     | openssl enc -base64
-	//   NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
+	//	$ openssl x509 -in path/to/client.crt -noout -pubkey
+	//	  | openssl pkey -pubin -outform DER
+	//	  | openssl dgst -sha256 -binary
+	//	  | openssl enc -base64
+	//	NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
 	//
 	// This is the format used in HTTP Public Key Pinning.
 	//
@@ -585,10 +586,10 @@ type CertificateValidationContext struct {
 	//
 	// .. attention::
 	//
-	//   This option is preferred over :ref:`verify_certificate_hash
-	//   <envoy_api_field_auth.CertificateValidationContext.verify_certificate_hash>`,
-	//   because SPKI is tied to a private key, so it doesn't change when the certificate
-	//   is renewed using the same private key.
+	//	This option is preferred over :ref:`verify_certificate_hash
+	//	<envoy_api_field_auth.CertificateValidationContext.verify_certificate_hash>`,
+	//	because SPKI is tied to a private key, so it doesn't change when the certificate
+	//	is renewed using the same private key.
 	VerifyCertificateSpki []string `protobuf:"bytes,3,rep,name=verify_certificate_spki,json=verifyCertificateSpki,proto3" json:"verify_certificate_spki,omitempty"`
 	// An optional list of hex-encoded SHA-256 hashes. If specified, Envoy will verify that
 	// the SHA-256 of the DER-encoded presented certificate matches one of the specified values.
@@ -597,16 +598,16 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
-	//   df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
+	//	$ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
+	//	df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
 	//
 	// A long hex-encoded and colon-separated SHA-256 (a.k.a. "fingerprint") of the certificate
 	// can be generated with the following command:
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
-	//   DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
+	//	$ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
+	//	DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
 	//
 	// Both of those formats are acceptable.
 	//
@@ -622,11 +623,11 @@ type CertificateValidationContext struct {
 	//
 	// .. attention::
 	//
-	//   Subject Alternative Names are easily spoofable and verifying only them is insecure,
-	//   therefore this option must be used together with :ref:`trusted_ca
-	//   <envoy_api_field_auth.CertificateValidationContext.trusted_ca>`.
+	//	Subject Alternative Names are easily spoofable and verifying only them is insecure,
+	//	therefore this option must be used together with :ref:`trusted_ca
+	//	<envoy_api_field_auth.CertificateValidationContext.trusted_ca>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto.
 	VerifySubjectAltName []string `protobuf:"bytes,4,rep,name=verify_subject_alt_name,json=verifySubjectAltName,proto3" json:"verify_subject_alt_name,omitempty"`
 	// An optional list of Subject Alternative name matchers. Envoy will verify that the
 	// Subject Alternative Name of the presented certificate matches one of the specified matches.
@@ -638,14 +639,14 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: yaml
 	//
-	//  match_subject_alt_names:
-	//    exact: "api.example.com"
+	//	match_subject_alt_names:
+	//	  exact: "api.example.com"
 	//
 	// .. attention::
 	//
-	//   Subject Alternative Names are easily spoofable and verifying only them is insecure,
-	//   therefore this option must be used together with :ref:`trusted_ca
-	//   <envoy_api_field_auth.CertificateValidationContext.trusted_ca>`.
+	//	Subject Alternative Names are easily spoofable and verifying only them is insecure,
+	//	therefore this option must be used together with :ref:`trusted_ca
+	//	<envoy_api_field_auth.CertificateValidationContext.trusted_ca>`.
 	MatchSubjectAltNames []*matcher.StringMatcher `protobuf:"bytes,9,rep,name=match_subject_alt_names,json=matchSubjectAltNames,proto3" json:"match_subject_alt_names,omitempty"`
 	// [#not-implemented-hide:] Must present a signed time-stamped OCSP response.
 	RequireOcspStaple *wrappers.BoolValue `protobuf:"bytes,5,opt,name=require_ocsp_staple,json=requireOcspStaple,proto3" json:"require_ocsp_staple,omitempty"`
@@ -716,7 +717,7 @@ func (x *CertificateValidationContext) GetVerifyCertificateHash() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto.
 func (x *CertificateValidationContext) GetVerifySubjectAltName() []string {
 	if x != nil {
 		return x.VerifySubjectAltName
@@ -822,7 +823,7 @@ var file_envoy_api_v2_auth_common_proto_rawDesc = []byte{
 	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x42, 0x08,
-	0x18, 0x01, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x12, 0x41, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x42, 0x06,
@@ -920,17 +921,17 @@ var file_envoy_api_v2_auth_common_proto_rawDesc = []byte{
 	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x12, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x54,
 	0x52, 0x55, 0x53, 0x54, 0x5f, 0x43, 0x48, 0x41, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x55, 0x4e, 0x54, 0x52, 0x55, 0x53, 0x54, 0x45, 0x44,
-	0x10, 0x01, 0x42, 0xa3, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0xf2,
-	0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x10, 0x01, 0x42, 0xa3, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e,
+	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f,
+	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x42,
+	0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/secret.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/secret.pb.go
index 5139efb3ffa..a7a2fd044c3 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/secret.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/secret.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/auth/secret.proto
 
 package auth
@@ -137,6 +137,7 @@ type Secret struct {
 	// Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to Type:
+	//
 	//	*Secret_TlsCertificate
 	//	*Secret_SessionTicketKeys
 	//	*Secret_ValidationContext
@@ -300,17 +301,17 @@ var file_envoy_api_v2_auth_secret_proto_rawDesc = []byte{
 	0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65,
 	0x63, 0x72, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53,
 	0x65, 0x63, 0x72, 0x65, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0xa3, 0x01,
-	0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74,
-	0x68, 0x42, 0x0b, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b,
-	0x12, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76,
+	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x42, 0x0b, 0x53, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61,
+	0x75, 0x74, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/tls.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/tls.pb.go
index d0f0ab2c954..b118512ddb1 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/tls.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/tls.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/auth/tls.proto
 
 package auth
@@ -33,9 +33,9 @@ type UpstreamTlsContext struct {
 	//
 	// .. attention::
 	//
-	//   Server certificate verification is not enabled by default. Configure
-	//   :ref:`trusted_ca<envoy_api_field_auth.CertificateValidationContext.trusted_ca>` to enable
-	//   verification.
+	//	Server certificate verification is not enabled by default. Configure
+	//	:ref:`trusted_ca<envoy_api_field_auth.CertificateValidationContext.trusted_ca>` to enable
+	//	verification.
 	CommonTlsContext *CommonTlsContext `protobuf:"bytes,1,opt,name=common_tls_context,json=commonTlsContext,proto3" json:"common_tls_context,omitempty"`
 	// SNI string to use when creating TLS backend connections.
 	Sni string `protobuf:"bytes,2,opt,name=sni,proto3" json:"sni,omitempty"`
@@ -43,7 +43,7 @@ type UpstreamTlsContext struct {
 	//
 	// .. attention::
 	//
-	//   TLS renegotiation is considered insecure and shouldn't be used unless absolutely necessary.
+	//	TLS renegotiation is considered insecure and shouldn't be used unless absolutely necessary.
 	AllowRenegotiation bool `protobuf:"varint,3,opt,name=allow_renegotiation,json=allowRenegotiation,proto3" json:"allow_renegotiation,omitempty"`
 	// Maximum number of session keys (Pre-Shared Keys for TLSv1.3+, Session IDs and Session Tickets
 	// for TLSv1.2 and older) to store for the purpose of session resumption.
@@ -127,11 +127,12 @@ type DownstreamTlsContext struct {
 	// [#not-implemented-hide:]
 	RequireSni *wrappers.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"`
 	// Types that are assignable to SessionTicketKeysType:
+	//
 	//	*DownstreamTlsContext_SessionTicketKeys
 	//	*DownstreamTlsContext_SessionTicketKeysSdsSecretConfig
 	//	*DownstreamTlsContext_DisableStatelessSessionResumption
 	SessionTicketKeysType isDownstreamTlsContext_SessionTicketKeysType `protobuf_oneof:"session_ticket_keys_type"`
-	// If specified, ``session_timeout`` will change the maximum lifetime (in seconds) of the TLS session.
+	// If specified, “session_timeout“ will change the maximum lifetime (in seconds) of the TLS session.
 	// Currently this value is used as a hint for the `TLS session ticket lifetime (for TLSv1.2) <https://tools.ietf.org/html/rfc5077#section-5.6>`_.
 	// Only seconds can be specified (fractional seconds are ignored).
 	SessionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"`
@@ -278,6 +279,7 @@ type CommonTlsContext struct {
 	// Configs for fetching TLS certificates via SDS API.
 	TlsCertificateSdsSecretConfigs []*SdsSecretConfig `protobuf:"bytes,6,rep,name=tls_certificate_sds_secret_configs,json=tlsCertificateSdsSecretConfigs,proto3" json:"tls_certificate_sds_secret_configs,omitempty"`
 	// Types that are assignable to ValidationContextType:
+	//
 	//	*CommonTlsContext_ValidationContext
 	//	*CommonTlsContext_ValidationContextSdsSecretConfig
 	//	*CommonTlsContext_CombinedValidationContext
@@ -611,17 +613,17 @@ var file_envoy_api_v2_auth_tls_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x53, 0x64, 0x73, 0x53,
 	0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x19, 0x0a, 0x17, 0x76,
 	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x42, 0xa0, 0x01, 0x0a,
-	0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68,
-	0x42, 0x08, 0x54, 0x6c, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
-	0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
-	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62,
+	0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x42, 0xa0, 0x01, 0xf2,
+	0x98, 0xfe, 0x8f, 0x05, 0x2b, 0x12, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
+	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x42, 0x08, 0x54, 0x6c, 0x73, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go
index d8ab2471e60..8e13f04b0e6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/cds.proto
 
 package apiv2
@@ -84,7 +84,7 @@ var file_envoy_api_v2_cds_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
 	0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x0a, 0x0a, 0x08, 0x43, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xed, 0x02, 0x0a, 0x17,
+	0x0a, 0x0a, 0x08, 0x43, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xe7, 0x02, 0x0a, 0x17,
 	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
 	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x57, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61,
 	0x6d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
@@ -98,26 +98,25 @@ var file_envoy_api_v2_cds_proto_rawDesc = []byte{
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f,
 	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01,
-	0x30, 0x01, 0x12, 0x79, 0x0a, 0x0d, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x30, 0x01, 0x12, 0x73, 0x0a, 0x0d, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74,
 	0x65, 0x72, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x22, 0x16, 0x2f, 0x76,
-	0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x1c, 0x8a,
-	0xa4, 0x96, 0xf3, 0x07, 0x16, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x8b, 0x01, 0x0a, 0x1a,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x43, 0x64, 0x73, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76,
-	0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x01, 0x2a, 0x22,
+	0x16, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x1c, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x16, 0x0a,
+	0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x8b, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x43, 0x64,
+	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70,
+	0x69, 0x76, 0x32, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster.pb.go
index 81bf5e0b92a..fa6af66dff7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/cluster.proto
 
 package apiv2
@@ -128,10 +128,9 @@ const (
 	//
 	// .. attention::
 	//
-	//   **This load balancing policy is deprecated**. Use CLUSTER_PROVIDED instead.
+	//	**This load balancing policy is deprecated**. Use CLUSTER_PROVIDED instead.
 	//
-	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 	Cluster_ORIGINAL_DST_LB Cluster_LbPolicy = 4
 	// Refer to the :ref:`Maglev load balancing policy<arch_overview_load_balancing_types_maglev>`
 	// for an explanation.
@@ -496,17 +495,17 @@ type Cluster struct {
 	//
 	// .. code-block:: yaml
 	//
-	//  transport_socket_matches:
-	//  - name: "enableMTLS"
-	//    match:
-	//      acceptMTLS: true
-	//    transport_socket:
-	//      name: envoy.transport_sockets.tls
-	//      config: { ... } # tls socket configuration
-	//  - name: "defaultToPlaintext"
-	//    match: {}
-	//    transport_socket:
-	//      name: envoy.transport_sockets.raw_buffer
+	//	transport_socket_matches:
+	//	- name: "enableMTLS"
+	//	  match:
+	//	    acceptMTLS: true
+	//	  transport_socket:
+	//	    name: envoy.transport_sockets.tls
+	//	    config: { ... } # tls socket configuration
+	//	- name: "defaultToPlaintext"
+	//	  match: {}
+	//	  transport_socket:
+	//	    name: envoy.transport_sockets.raw_buffer
 	//
 	// Connections to the endpoints whose metadata value under *envoy.transport_socket_match*
 	// having "acceptMTLS"/"true" key/value pair use the "enableMTLS" socket configuration.
@@ -537,14 +536,15 @@ type Cluster struct {
 	// The cluster name is used when emitting
 	// :ref:`statistics <config_cluster_manager_cluster_stats>` if :ref:`alt_stat_name
 	// <envoy_api_field_Cluster.alt_stat_name>` is not provided.
-	// Any ``:`` in the cluster name will be converted to ``_`` when emitting statistics.
+	// Any “:“ in the cluster name will be converted to “_“ when emitting statistics.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional alternative to the cluster name to be used while emitting stats.
-	// Any ``:`` in the name will be converted to ``_`` when emitting statistics. This should not be
+	// Any “:“ in the name will be converted to “_“ when emitting statistics. This should not be
 	// confused with :ref:`Router Filter Header
 	// <config_http_filters_router_x-envoy-upstream-alt-stat-name>`.
 	AltStatName string `protobuf:"bytes,28,opt,name=alt_stat_name,json=altStatName,proto3" json:"alt_stat_name,omitempty"`
 	// Types that are assignable to ClusterDiscoveryType:
+	//
 	//	*Cluster_Type
 	//	*Cluster_ClusterType
 	ClusterDiscoveryType isCluster_ClusterDiscoveryType `protobuf_oneof:"cluster_discovery_type"`
@@ -566,11 +566,10 @@ type Cluster struct {
 	//
 	// .. attention::
 	//
-	//   **This field is deprecated**. Set the
-	//   :ref:`load_assignment<envoy_api_field_Cluster.load_assignment>` field instead.
+	//	**This field is deprecated**. Set the
+	//	:ref:`load_assignment<envoy_api_field_Cluster.load_assignment>` field instead.
 	//
-	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 	Hosts []*core.Address `protobuf:"bytes,7,rep,name=hosts,proto3" json:"hosts,omitempty"`
 	// Setting this is required for specifying members of
 	// :ref:`STATIC<envoy_api_enum_value_Cluster.DiscoveryType.STATIC>`,
@@ -580,9 +579,8 @@ type Cluster struct {
 	//
 	// .. attention::
 	//
-	//   Setting this allows non-EDS cluster types to contain embedded EDS equivalent
-	//   :ref:`endpoint assignments<envoy_api_msg_ClusterLoadAssignment>`.
-	//
+	//	Setting this allows non-EDS cluster types to contain embedded EDS equivalent
+	//	:ref:`endpoint assignments<envoy_api_msg_ClusterLoadAssignment>`.
 	LoadAssignment *ClusterLoadAssignment `protobuf:"bytes,33,opt,name=load_assignment,json=loadAssignment,proto3" json:"load_assignment,omitempty"`
 	// Optional :ref:`active health checking <arch_overview_health_checking>`
 	// configuration for the cluster. If no
@@ -600,10 +598,10 @@ type Cluster struct {
 	//
 	// .. attention::
 	//
-	//   **This field is deprecated**. Use `transport_socket` with name `tls` instead. If both are
-	//   set, `transport_socket` takes priority.
+	//	**This field is deprecated**. Use `transport_socket` with name `tls` instead. If both are
+	//	set, `transport_socket` takes priority.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 	TlsContext *auth.UpstreamTlsContext `protobuf:"bytes,11,opt,name=tls_context,json=tlsContext,proto3" json:"tls_context,omitempty"`
 	// HTTP protocol options that are applied only to upstream HTTP connections.
 	// These options apply to all HTTP versions.
@@ -625,7 +623,7 @@ type Cluster struct {
 	// "envoy.filters.network.thrift_proxy". See the extension's documentation for details on
 	// specific options.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 	ExtensionProtocolOptions map[string]*_struct.Struct `protobuf:"bytes,35,rep,name=extension_protocol_options,json=extensionProtocolOptions,proto3" json:"extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The extension_protocol_options field is used to provide extension-specific protocol options
 	// for upstream connections. The key should match the extension filter name, such as
@@ -670,13 +668,13 @@ type Cluster struct {
 	// and :ref:`LOGICAL_DNS<envoy_api_enum_value_Cluster.DiscoveryType.LOGICAL_DNS>`
 	// this setting is ignored.
 	// Setting this value causes failure if the
-	// ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during
+	// “envoy.restart_features.use_apple_api_for_dns_lookups“ runtime value is true during
 	// server startup. Apple's API only allows overriding DNS resolvers via system settings.
 	DnsResolvers []*core.Address `protobuf:"bytes,18,rep,name=dns_resolvers,json=dnsResolvers,proto3" json:"dns_resolvers,omitempty"`
 	// [#next-major-version: Reconcile DNS options in a single message.]
 	// Always use TCP queries instead of UDP queries for DNS lookups.
 	// Setting this value causes failure if the
-	// ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during
+	// “envoy.restart_features.use_apple_api_for_dns_lookups“ runtime value is true during
 	// server startup. Apple' API only uses UDP for DNS resolution.
 	UseTcpForDnsLookups bool `protobuf:"varint,45,opt,name=use_tcp_for_dns_lookups,json=useTcpForDnsLookups,proto3" json:"use_tcp_for_dns_lookups,omitempty"`
 	// If specified, outlier detection will be enabled for this upstream cluster.
@@ -712,6 +710,7 @@ type Cluster struct {
 	// LbPolicy will generate an error at runtime.
 	//
 	// Types that are assignable to LbConfig:
+	//
 	//	*Cluster_RingHashLbConfig_
 	//	*Cluster_OriginalDstLbConfig_
 	//	*Cluster_LeastRequestLbConfig_
@@ -739,14 +738,14 @@ type Cluster struct {
 	//
 	// .. note::
 	//
-	//   This is currently only supported for connections created by tcp_proxy.
+	//	This is currently only supported for connections created by tcp_proxy.
 	//
 	// .. note::
 	//
-	//   The current implementation of this feature closes all connections immediately when
-	//   the unhealthy status is detected. If there are a large number of connections open
-	//   to an upstream host that becomes unhealthy, Envoy may spend a substantial amount of
-	//   time exclusively closing these connections, and not processing any other traffic.
+	//	The current implementation of this feature closes all connections immediately when
+	//	the unhealthy status is detected. If there are a large number of connections open
+	//	to an upstream host that becomes unhealthy, Envoy may spend a substantial amount of
+	//	time exclusively closing these connections, and not processing any other traffic.
 	CloseConnectionsOnHostHealthFailure bool `protobuf:"varint,31,opt,name=close_connections_on_host_health_failure,json=closeConnectionsOnHostHealthFailure,proto3" json:"close_connections_on_host_health_failure,omitempty"`
 	// If set to true, Envoy will ignore the health value of a host when processing its removal
 	// from service discovery. This means that if active health checking is used, Envoy will *not*
@@ -885,7 +884,7 @@ func (x *Cluster) GetLbPolicy() Cluster_LbPolicy {
 	return Cluster_ROUND_ROBIN
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 func (x *Cluster) GetHosts() []*core.Address {
 	if x != nil {
 		return x.Hosts
@@ -921,7 +920,7 @@ func (x *Cluster) GetCircuitBreakers() *cluster.CircuitBreakers {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 func (x *Cluster) GetTlsContext() *auth.UpstreamTlsContext {
 	if x != nil {
 		return x.TlsContext
@@ -957,7 +956,7 @@ func (x *Cluster) GetHttp2ProtocolOptions() *core.Http2ProtocolOptions {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 func (x *Cluster) GetExtensionProtocolOptions() map[string]*_struct.Struct {
 	if x != nil {
 		return x.ExtensionProtocolOptions
@@ -1576,10 +1575,10 @@ type Cluster_LbSubsetConfig struct {
 	//
 	// .. code-block:: json
 	//
-	//   { "subset_selectors": [
-	//       { "keys": [ "version" ] },
-	//       { "keys": [ "stage", "hardware_type" ] }
-	//   ]}
+	//	{ "subset_selectors": [
+	//	    { "keys": [ "version" ] },
+	//	    { "keys": [ "stage", "hardware_type" ] }
+	//	]}
 	//
 	// A subset is matched when the metadata from the selected route and
 	// weighted cluster contains the same keys and values as the subset's
@@ -1833,13 +1832,13 @@ type Cluster_OriginalDstLbConfig struct {
 	//
 	// .. attention::
 	//
-	//   This header isn't sanitized by default, so enabling this feature allows HTTP clients to
-	//   route traffic to arbitrary hosts and/or ports, which may have serious security
-	//   consequences.
+	//	This header isn't sanitized by default, so enabling this feature allows HTTP clients to
+	//	route traffic to arbitrary hosts and/or ports, which may have serious security
+	//	consequences.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	UseHttpHeader bool `protobuf:"varint,1,opt,name=use_http_header,json=useHttpHeader,proto3" json:"use_http_header,omitempty"`
 }
 
@@ -1894,9 +1893,11 @@ type Cluster_CommonLbConfig struct {
 	// To disable panic mode, set to 0%.
 	//
 	// .. note::
-	//   The specified percent will be truncated to the nearest 1%.
+	//
+	//	The specified percent will be truncated to the nearest 1%.
 	HealthyPanicThreshold *_type.Percent `protobuf:"bytes,1,opt,name=healthy_panic_threshold,json=healthyPanicThreshold,proto3" json:"healthy_panic_threshold,omitempty"`
 	// Types that are assignable to LocalityConfigSpecifier:
+	//
 	//	*Cluster_CommonLbConfig_ZoneAwareLbConfig_
 	//	*Cluster_CommonLbConfig_LocalityWeightedLbConfig_
 	LocalityConfigSpecifier isCluster_CommonLbConfig_LocalityConfigSpecifier `protobuf_oneof:"locality_config_specifier"`
@@ -2364,7 +2365,7 @@ type LoadBalancingPolicy_Policy struct {
 	// Optional config for the LB policy.
 	// No more than one of these two fields may be populated.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 	Config      *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	TypedConfig *any1.Any       `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"`
 }
@@ -2408,7 +2409,7 @@ func (x *LoadBalancingPolicy_Policy) GetName() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto.
 func (x *LoadBalancingPolicy_Policy) GetConfig() *_struct.Struct {
 	if x != nil {
 		return x.Config
@@ -2536,8 +2537,8 @@ var file_envoy_api_v2_cluster_proto_rawDesc = []byte{
 	0x12, 0x50, 0x0a, 0x0b, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18,
 	0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
 	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, 0x18, 0x01,
-	0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x0a, 0x74, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, 0xb8, 0xee,
+	0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x0a, 0x74, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65,
 	0x78, 0x74, 0x12, 0x73, 0x0a, 0x1e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x68,
 	0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74,
 	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76,
@@ -2569,7 +2570,7 @@ var file_envoy_api_v2_cluster_proto_rawDesc = []byte{
 	0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
 	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
 	0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x08, 0x18, 0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52,
 	0x18, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
 	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x20, 0x74, 0x79,
 	0x70, 0x65, 0x64, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72,
@@ -2912,8 +2913,8 @@ var file_envoy_api_v2_cluster_proto_rawDesc = []byte{
 	0x53, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09,
 	0x52, 0x49, 0x4e, 0x47, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52,
 	0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x03, 0x12, 0x1d, 0x0a, 0x0f, 0x4f, 0x52, 0x49, 0x47, 0x49,
-	0x4e, 0x41, 0x4c, 0x5f, 0x44, 0x53, 0x54, 0x5f, 0x4c, 0x42, 0x10, 0x04, 0x1a, 0x08, 0x08, 0x01,
-	0xa8, 0xf7, 0xb4, 0x8b, 0x02, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x41, 0x47, 0x4c, 0x45, 0x56,
+	0x4e, 0x41, 0x4c, 0x5f, 0x44, 0x53, 0x54, 0x5f, 0x4c, 0x42, 0x10, 0x04, 0x1a, 0x08, 0xa8, 0xf7,
+	0xb4, 0x8b, 0x02, 0x01, 0x08, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x41, 0x47, 0x4c, 0x45, 0x56,
 	0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x5f, 0x50, 0x52,
 	0x4f, 0x56, 0x49, 0x44, 0x45, 0x44, 0x10, 0x06, 0x12, 0x20, 0x0a, 0x1c, 0x4c, 0x4f, 0x41, 0x44,
 	0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x49, 0x4e, 0x47, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
@@ -2956,16 +2957,16 @@ var file_envoy_api_v2_cluster_proto_rawDesc = []byte{
 	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
 	0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c,
 	0x69, 0x76, 0x65, 0x52, 0x0c, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76,
-	0x65, 0x42, 0x8e, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
-	0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x42, 0x8e, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69,
+	0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
index 1a1646ccdde..aad217e7ec8 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/cluster/circuit_breaker.proto
 
 package cluster
@@ -107,8 +107,8 @@ type CircuitBreakers_Thresholds struct {
 	//
 	// .. note::
 	//
-	//    If this field is set, the retry budget will override any configured retry circuit
-	//    breaker.
+	//	If this field is set, the retry budget will override any configured retry circuit
+	//	breaker.
 	RetryBudget *CircuitBreakers_Thresholds_RetryBudget `protobuf:"bytes,8,opt,name=retry_budget,json=retryBudget,proto3" json:"retry_budget,omitempty"`
 	// If track_remaining is true, then stats will be published that expose
 	// the number of resources remaining until the circuit breakers open. If
@@ -116,8 +116,8 @@ type CircuitBreakers_Thresholds struct {
 	//
 	// .. note::
 	//
-	//    If a retry budget is used in lieu of the max_retries circuit breaker,
-	//    the remaining retry resources remaining will not be tracked.
+	//	If a retry budget is used in lieu of the max_retries circuit breaker,
+	//	the remaining retry resources remaining will not be tracked.
 	TrackRemaining bool `protobuf:"varint,6,opt,name=track_remaining,json=trackRemaining,proto3" json:"track_remaining,omitempty"`
 	// The maximum number of connection pools per cluster that Envoy will concurrently support at
 	// once. If not specified, the default is unlimited. Set this for clusters which create a
@@ -350,20 +350,20 @@ var file_envoy_api_v2_cluster_circuit_breaker_proto_rawDesc = []byte{
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
 	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x13, 0x6d, 0x69, 0x6e,
 	0x52, 0x65, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79,
-	0x42, 0xd4, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x13, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74,
-	0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0xaa, 0x02, 0x16, 0x45, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x19, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70,
-	0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53,
-	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0xd4, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x13,
+	0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0xaa, 0x02, 0x16, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56,
+	0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x19, 0x45, 0x6e,
+	0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go
index 6bdc69e3e73..f351042a51d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/cluster/filter.proto
 
 package cluster
@@ -101,20 +101,20 @@ var file_envoy_api_v2_cluster_filter_proto_rawDesc = []byte{
 	0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52,
-	0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xcc, 0x01, 0x0a,
-	0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x42, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0xaa,
-	0x02, 0x16, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x19, 0x45, 0x6e, 0x76, 0x6f, 0x79,
-	0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x4e, 0x53, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xcc, 0x01, 0xf2,
+	0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x0b, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0xaa, 0x02, 0x16, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41,
+	0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0xea,
+	0x02, 0x19, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32,
+	0x3a, 0x3a, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go
index f845f2a491e..eaa3ea4d5f5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/cluster/outlier_detection.proto
 
 package cluster
@@ -447,20 +447,20 @@ var file_envoy_api_v2_cluster_outlier_detection_proto_rawDesc = []byte{
 	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1e, 0x66,
 	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x42, 0xd6, 0x01,
-	0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x42, 0x15, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x76, 0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0xaa, 0x02, 0x16, 0x45, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x4e, 0x53, 0xea, 0x02, 0x19, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69,
-	0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0xf2,
-	0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x19, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x15, 0x4f, 0x75, 0x74,
+	0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0xaa, 0x02, 0x16, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32,
+	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x19, 0x45, 0x6e, 0x76,
+	0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x4e, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go
index 659852f5962..5ff806b8921 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/address.proto
 
 package core
@@ -137,7 +137,7 @@ type SocketAddress struct {
 
 	Protocol SocketAddress_Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=envoy.api.v2.core.SocketAddress_Protocol" json:"protocol,omitempty"`
 	// The address for this socket. :ref:`Listeners <config_listeners>` will bind
-	// to the address. An empty address is not allowed. Specify ``0.0.0.0`` or ``::``
+	// to the address. An empty address is not allowed. Specify “0.0.0.0“ or “::“
 	// to bind to any address. [#comment:TODO(zuercher) reinstate when implemented:
 	// It is possible to distinguish a Listener address via the prefix/suffix matching
 	// in :ref:`FilterChainMatch <envoy_api_msg_listener.FilterChainMatch>`.] When used
@@ -149,6 +149,7 @@ type SocketAddress struct {
 	// via :ref:`resolver_name <envoy_api_field_core.SocketAddress.resolver_name>`.
 	Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	// Types that are assignable to PortSpecifier:
+	//
 	//	*SocketAddress_PortValue
 	//	*SocketAddress_NamedPort
 	PortSpecifier isSocketAddress_PortSpecifier `protobuf_oneof:"port_specifier"`
@@ -159,9 +160,9 @@ type SocketAddress struct {
 	// *STRICT_DNS* or *LOGICAL_DNS* will generate an error at runtime.
 	ResolverName string `protobuf:"bytes,5,opt,name=resolver_name,json=resolverName,proto3" json:"resolver_name,omitempty"`
 	// When binding to an IPv6 address above, this enables `IPv4 compatibility
-	// <https://tools.ietf.org/html/rfc3493#page-11>`_. Binding to ``::`` will
+	// <https://tools.ietf.org/html/rfc3493#page-11>`_. Binding to “::“ will
 	// allow both IPv4 and IPv6 connections, with peer IPv4 addresses mapped into
-	// IPv6 space as ``::FFFF:<IPv4-address>``.
+	// IPv6 space as “::FFFF:<IPv4-address>“.
 	Ipv4Compat bool `protobuf:"varint,6,opt,name=ipv4_compat,json=ipv4Compat,proto3" json:"ipv4_compat,omitempty"`
 }
 
@@ -418,6 +419,7 @@ type Address struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Address:
+	//
 	//	*Address_SocketAddress
 	//	*Address_Pipe
 	Address isAddress_Address `protobuf_oneof:"address"`
@@ -499,7 +501,7 @@ type CidrRange struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// IPv4 or IPv6 address, e.g. ``192.0.0.0`` or ``2001:db8::``.
+	// IPv4 or IPv6 address, e.g. “192.0.0.0“ or “2001:db8::“.
 	AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"`
 	// Length of prefix, e.g. 0, 32. Defaults to 0 when unset.
 	PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"`
@@ -639,15 +641,15 @@ var file_envoy_api_v2_core_address_proto_rawDesc = []byte{
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
 	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18,
 	0x80, 0x01, 0x52, 0x09, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4c, 0x65, 0x6e, 0x42, 0x8f, 0x01,
-	0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x42, 0x0c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
-	0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62,
+	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/backoff.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/backoff.pb.go
index 16e2d2f61f8..950896ba74f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/backoff.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/backoff.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/backoff.proto
 
 package core
@@ -111,16 +111,16 @@ var file_envoy_api_v2_core_backoff_proto_rawDesc = []byte{
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x42, 0x8f, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0c, 0x42, 0x61,
-	0x63, 0x6b, 0x6f, 0x66, 0x66, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
-	0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x42, 0x8f, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a,
+	0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x42, 0x0c, 0x42, 0x61, 0x63, 0x6b, 0x6f, 0x66, 0x66, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go
index 6a5c973b752..8f557acac24 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/base.proto
 
 package core
@@ -473,12 +473,13 @@ type Node struct {
 	// by Envoy in management server RPCs.
 	// This field is deprecated in favor of the user_agent_name and user_agent_version values.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto.
 	BuildVersion string `protobuf:"bytes,5,opt,name=build_version,json=buildVersion,proto3" json:"build_version,omitempty"`
 	// Free-form string that identifies the entity requesting config.
 	// E.g. "envoy" or "grpc"
 	UserAgentName string `protobuf:"bytes,6,opt,name=user_agent_name,json=userAgentName,proto3" json:"user_agent_name,omitempty"`
 	// Types that are assignable to UserAgentVersionType:
+	//
 	//	*Node_UserAgentVersion
 	//	*Node_UserAgentBuildVersion
 	UserAgentVersionType isNode_UserAgentVersionType `protobuf_oneof:"user_agent_version_type"`
@@ -557,7 +558,7 @@ func (x *Node) GetLocality() *Locality {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto.
 func (x *Node) GetBuildVersion() string {
 	if x != nil {
 		return x.BuildVersion
@@ -651,9 +652,10 @@ func (*Node_UserAgentBuildVersion) isNode_UserAgentVersionType() {}
 // object to match against. There are some well defined metadata used today for
 // this purpose:
 //
-// * ``{"envoy.lb": {"canary": <bool> }}`` This indicates the canary status of an
-//   endpoint and is also used during header processing
-//   (x-envoy-upstream-canary) and for stats purposes.
+//   - “{"envoy.lb": {"canary": <bool> }}“ This indicates the canary status of an
+//     endpoint and is also used during header processing
+//     (x-envoy-upstream-canary) and for stats purposes.
+//
 // [#next-major-version: move to type/metadata/v2]
 type Metadata struct {
 	state         protoimpl.MessageState
@@ -1056,6 +1058,7 @@ type DataSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Specifier:
+	//
 	//	*DataSource_Filename
 	//	*DataSource_InlineBytes
 	//	*DataSource_InlineString
@@ -1282,6 +1285,7 @@ type AsyncDataSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Specifier:
+	//
 	//	*AsyncDataSource_Local
 	//	*AsyncDataSource_Remote
 	Specifier isAsyncDataSource_Specifier `protobuf_oneof:"specifier"`
@@ -1374,6 +1378,7 @@ type TransportSocket struct {
 	// See the supported transport socket implementations for further documentation.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*TransportSocket_Config
 	//	*TransportSocket_TypedConfig
 	ConfigType isTransportSocket_ConfigType `protobuf_oneof:"config_type"`
@@ -1425,7 +1430,7 @@ func (m *TransportSocket) GetConfigType() isTransportSocket_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto.
 func (x *TransportSocket) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*TransportSocket_Config); ok {
 		return x.Config
@@ -1445,7 +1450,7 @@ type isTransportSocket_ConfigType interface {
 }
 
 type TransportSocket_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -1462,11 +1467,11 @@ func (*TransportSocket_TypedConfig) isTransportSocket_ConfigType() {}
 //
 // .. note::
 //
-//   Parsing of the runtime key's data is implemented such that it may be represented as a
-//   :ref:`FractionalPercent <envoy_api_msg_type.FractionalPercent>` proto represented as JSON/YAML
-//   and may also be represented as an integer with the assumption that the value is an integral
-//   percentage out of 100. For instance, a runtime key lookup returning the value "42" would parse
-//   as a `FractionalPercent` whose numerator is 42 and denominator is HUNDRED.
+//	Parsing of the runtime key's data is implemented such that it may be represented as a
+//	:ref:`FractionalPercent <envoy_api_msg_type.FractionalPercent>` proto represented as JSON/YAML
+//	and may also be represented as an integer with the assumption that the value is an integral
+//	percentage out of 100. For instance, a runtime key lookup returning the value "42" would parse
+//	as a `FractionalPercent` whose numerator is 42 and denominator is HUNDRED.
 type RuntimeFractionalPercent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1701,10 +1706,10 @@ var file_envoy_api_v2_core_base_proto_rawDesc = []byte{
 	0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
 	0x4b, 0x65, 0x79, 0x22, 0x59, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c,
 	0x75, 0x65, 0x12, 0x23, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x20, 0x01, 0x28, 0x80, 0x80, 0x01, 0xc0, 0x01, 0x01, 0xc8,
-	0x01, 0x00, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x20, 0x01, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0,
+	0x01, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x72, 0x0a, 0x28, 0x80, 0x80,
-	0x01, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x89,
+	0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x89,
 	0x01, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70,
 	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
@@ -1797,16 +1802,16 @@ var file_envoy_api_v2_core_base_proto_rawDesc = []byte{
 	0x61, 0x66, 0x66, 0x69, 0x63, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0f,
 	0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
 	0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08,
-	0x4f, 0x55, 0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x42, 0x8c, 0x01, 0x0a, 0x1f, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x09,
-	0x42, 0x61, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,
-	0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x50, 0x0b, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x4f, 0x55, 0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x42, 0x8c, 0x01, 0xf2, 0x98, 0xfe,
+	0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x42, 0x09, 0x42, 0x61, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x50, 0x0b, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go
index f0492555e8e..6183219cfd1 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/config_source.proto
 
 package core
@@ -34,11 +34,11 @@ const (
 	// versioning. If a client does not support v2 (e.g. due to deprecation), this
 	// is an invalid value.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/config_source.proto.
 	ApiVersion_AUTO ApiVersion = 0
 	// Use xDS v2 API.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/config_source.proto.
 	ApiVersion_V2 ApiVersion = 1
 	// Use xDS v3 API.
 	ApiVersion_V3 ApiVersion = 2
@@ -92,7 +92,7 @@ const (
 	// Ideally this would be 'reserved 0' but one can't reserve the default
 	// value. Instead we throw an exception if this is ever used.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/config_source.proto.
 	ApiConfigSource_UNSUPPORTED_REST_LEGACY ApiConfigSource_ApiType = 0
 	// REST-JSON v2 API. The `canonical JSON encoding
 	// <https://developers.google.com/protocol-buffers/docs/proto3#json>`_ for
@@ -168,8 +168,8 @@ type ApiConfigSource struct {
 	//
 	// .. note::
 	//
-	//  The cluster with name ``cluster_name`` must be statically defined and its
-	//  type must not be ``EDS``.
+	//	The cluster with name ``cluster_name`` must be statically defined and its
+	//	type must not be ``EDS``.
 	ClusterNames []string `protobuf:"bytes,2,rep,name=cluster_names,json=clusterNames,proto3" json:"cluster_names,omitempty"`
 	// Multiple gRPC services be provided for GRPC. If > 1 cluster is defined,
 	// services will be cycled through if any kind of failure occurs.
@@ -440,6 +440,7 @@ type ConfigSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ConfigSourceSpecifier:
+	//
 	//	*ConfigSource_Path
 	//	*ConfigSource_ApiConfigSource
 	//	*ConfigSource_Ads
@@ -551,13 +552,13 @@ type ConfigSource_Path struct {
 	//
 	// .. note::
 	//
-	//  The path to the source must exist at config load time.
+	//	The path to the source must exist at config load time.
 	//
 	// .. note::
 	//
-	//   Envoy will only watch the file path for *moves.* This is because in general only moves
-	//   are atomic. The same method of swapping files as is demonstrated in the
-	//   :ref:`runtime documentation <config_runtime_symbolic_link_swap>` can be used here also.
+	//	Envoy will only watch the file path for *moves.* This is because in general only moves
+	//	are atomic. The same method of swapping files as is demonstrated in the
+	//	:ref:`runtime documentation <config_runtime_symbolic_link_swap>` can be used here also.
 	Path string `protobuf:"bytes,1,opt,name=path,proto3,oneof"`
 }
 
@@ -655,8 +656,8 @@ var file_envoy_api_v2_core_config_source_proto_rawDesc = []byte{
 	0x46, 0x69, 0x72, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x6e, 0x6c, 0x79,
 	0x22, 0x54, 0x0a, 0x07, 0x41, 0x70, 0x69, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x17, 0x55,
 	0x4e, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x52, 0x45, 0x53, 0x54, 0x5f,
-	0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x10, 0x00, 0x1a, 0x08, 0x08, 0x01, 0xa8, 0xf7, 0xb4, 0x8b,
-	0x02, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x52, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
+	0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x10, 0x00, 0x1a, 0x08, 0xa8, 0xf7, 0xb4, 0x8b, 0x02, 0x01,
+	0x08, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x52, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
 	0x47, 0x52, 0x50, 0x43, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x45, 0x4c, 0x54, 0x41, 0x5f,
 	0x47, 0x52, 0x50, 0x43, 0x10, 0x03, 0x22, 0x18, 0x0a, 0x16, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
 	0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
@@ -707,17 +708,17 @@ var file_envoy_api_v2_core_config_source_proto_rawDesc = []byte{
 	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x2a, 0x2e, 0x0a, 0x0a,
 	0x41, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x04, 0x41, 0x55,
 	0x54, 0x4f, 0x10, 0x00, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x0a, 0x0a, 0x02, 0x56, 0x32, 0x10, 0x01,
-	0x1a, 0x02, 0x08, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x33, 0x10, 0x02, 0x42, 0x94, 0x01, 0x0a,
-	0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x42, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2,
+	0x1a, 0x02, 0x08, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x33, 0x10, 0x02, 0x42, 0x94, 0x01, 0xf2,
 	0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x42, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
+	0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/event_service_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/event_service_config.pb.go
index 832c99a54b6..e226d33624a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/event_service_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/event_service_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/event_service_config.proto
 
 package core
@@ -30,6 +30,7 @@ type EventServiceConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ConfigSourceSpecifier:
+	//
 	//	*EventServiceConfig_GrpcService
 	ConfigSourceSpecifier isEventServiceConfig_ConfigSourceSpecifier `protobuf_oneof:"config_source_specifier"`
 }
@@ -113,17 +114,17 @@ var file_envoy_api_v2_core_event_service_config_proto_rawDesc = []byte{
 	0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x67,
 	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x1e, 0x0a, 0x17, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x9a, 0x01, 0x0a, 0x1f, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x17,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x9a, 0x01, 0xf2, 0x98, 0xfe,
+	0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x42, 0x17, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_method_list.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_method_list.pb.go
index 867108ea917..7002f130cad 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_method_list.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_method_list.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/grpc_method_list.proto
 
 package core
@@ -150,16 +150,16 @@ var file_envoy_api_v2_core_grpc_method_list_proto_rawDesc = []byte{
 	0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x68, 0x6f,
 	0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xfa,
 	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4e,
-	0x61, 0x6d, 0x65, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x13, 0x47, 0x72, 0x70, 0x63, 0x4d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12,
-	0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70,
+	0x61, 0x6d, 0x65, 0x73, 0x42, 0x96, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x13, 0x47, 0x72,
+	0x70, 0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go
index 464a1709115..00f2c19f158 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/grpc_service.proto
 
 package core
@@ -35,6 +35,7 @@ type GrpcService struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to TargetSpecifier:
+	//
 	//	*GrpcService_EnvoyGrpc_
 	//	*GrpcService_GoogleGrpc_
 	TargetSpecifier isGrpcService_TargetSpecifier `protobuf_oneof:"target_specifier"`
@@ -43,7 +44,7 @@ type GrpcService struct {
 	Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Additional metadata to include in streams initiated to the GrpcService.
 	// This can be used for scenarios in which additional ad hoc authorization
-	// headers (e.g. ``x-foo-bar: baz-key``) are to be injected.
+	// headers (e.g. “x-foo-bar: baz-key“) are to be injected.
 	InitialMetadata []*HeaderValue `protobuf:"bytes,5,rep,name=initial_metadata,json=initialMetadata,proto3" json:"initial_metadata,omitempty"`
 }
 
@@ -204,11 +205,12 @@ type GrpcService_GoogleGrpc struct {
 	// service.
 	//
 	// .. csv-table::
-	//    :header: Name, Type, Description
-	//    :widths: 1, 1, 2
 	//
-	//    streams_total, Counter, Total number of streams opened
-	//    streams_closed_<gRPC status code>, Counter, Total streams closed with <gRPC status code>
+	//	:header: Name, Type, Description
+	//	:widths: 1, 1, 2
+	//
+	//	streams_total, Counter, Total number of streams opened
+	//	streams_closed_<gRPC status code>, Counter, Total streams closed with <gRPC status code>
 	StatPrefix string `protobuf:"bytes,4,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 	// The name of the Google gRPC credentials factory to use. This must have been registered with
 	// Envoy. If this is empty, a default credentials factory will be used that sets up channel
@@ -408,6 +410,7 @@ type GrpcService_GoogleGrpc_ChannelCredentials struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to CredentialSpecifier:
+	//
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_LocalCredentials
@@ -507,6 +510,7 @@ type GrpcService_GoogleGrpc_CallCredentials struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to CredentialSpecifier:
+	//
 	//	*GrpcService_GoogleGrpc_CallCredentials_AccessToken
 	//	*GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine
 	//	*GrpcService_GoogleGrpc_CallCredentials_GoogleRefreshToken
@@ -791,6 +795,7 @@ type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin struct
 
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config
 	//	*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig
 	ConfigType isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_ConfigType `protobuf_oneof:"config_type"`
@@ -842,7 +847,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) G
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/grpc_service.proto.
 func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config); ok {
 		return x.Config
@@ -862,7 +867,7 @@ type isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Conf
 }
 
 type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/grpc_service.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -1214,16 +1219,16 @@ var file_envoy_api_v2_core_grpc_service_proto_rawDesc = []byte{
 	0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
 	0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x17, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
 	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x4a,
-	0x04, 0x08, 0x04, 0x10, 0x05, 0x42, 0x93, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x10, 0x47, 0x72, 0x70, 0x63, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x04, 0x08, 0x04, 0x10, 0x05, 0x42, 0x93, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x10, 0x47,
+	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go
index 8b236361a64..9f8f35b9833 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/health_check.proto
 
 package core
@@ -137,6 +137,7 @@ type HealthCheck struct {
 	// Reuse health check connection between health checks. Default is true.
 	ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"`
 	// Types that are assignable to HealthChecker:
+	//
 	//	*HealthCheck_HttpHealthCheck_
 	//	*HealthCheck_TcpHealthCheck_
 	//	*HealthCheck_GrpcHealthCheck_
@@ -410,6 +411,7 @@ type HealthCheck_Payload struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Payload:
+	//
 	//	*HealthCheck_Payload_Text
 	//	*HealthCheck_Payload_Binary
 	Payload isHealthCheck_Payload_Payload `protobuf_oneof:"payload"`
@@ -510,10 +512,10 @@ type HealthCheck_HttpHealthCheck struct {
 	//
 	// .. attention::
 	//
-	//   This field has been deprecated in favor of `service_name_matcher` for better flexibility
-	//   over matching with service-cluster name.
+	//	This field has been deprecated in favor of `service_name_matcher` for better flexibility
+	//	over matching with service-cluster name.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 	ServiceName string `protobuf:"bytes,5,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// Specifies a list of HTTP headers that should be added to each request that is sent to the
 	// health checked cluster. For more information, including details on header value syntax, see
@@ -527,7 +529,7 @@ type HealthCheck_HttpHealthCheck struct {
 	// Deprecated, use :ref:`codec_client_type
 	// <envoy_api_field_core.HealthCheck.HttpHealthCheck.codec_client_type>` instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 	UseHttp2 bool `protobuf:"varint,7,opt,name=use_http2,json=useHttp2,proto3" json:"use_http2,omitempty"`
 	// Specifies a list of HTTP response statuses considered healthy. If provided, replaces default
 	// 200-only policy - 200 must be included explicitly as needed. Ranges follow half-open
@@ -603,7 +605,7 @@ func (x *HealthCheck_HttpHealthCheck) GetReceive() *HealthCheck_Payload {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 func (x *HealthCheck_HttpHealthCheck) GetServiceName() string {
 	if x != nil {
 		return x.ServiceName
@@ -625,7 +627,7 @@ func (x *HealthCheck_HttpHealthCheck) GetRequestHeadersToRemove() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 func (x *HealthCheck_HttpHealthCheck) GetUseHttp2() bool {
 	if x != nil {
 		return x.UseHttp2
@@ -718,7 +720,7 @@ type HealthCheck_RedisHealthCheck struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// If set, optionally perform ``EXISTS <key>`` instead of ``PING``. A return value
+	// If set, optionally perform “EXISTS <key>“ instead of “PING“. A return value
 	// from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other
 	// than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance
 	// by setting the specified key to any value and waiting for traffic to drain.
@@ -844,6 +846,7 @@ type HealthCheck_CustomHealthCheck struct {
 	// being instantiated. See :api:`envoy/config/health_checker` for reference.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*HealthCheck_CustomHealthCheck_Config
 	//	*HealthCheck_CustomHealthCheck_TypedConfig
 	ConfigType isHealthCheck_CustomHealthCheck_ConfigType `protobuf_oneof:"config_type"`
@@ -895,7 +898,7 @@ func (m *HealthCheck_CustomHealthCheck) GetConfigType() isHealthCheck_CustomHeal
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 func (x *HealthCheck_CustomHealthCheck) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_Config); ok {
 		return x.Config
@@ -915,7 +918,7 @@ type isHealthCheck_CustomHealthCheck_ConfigType interface {
 }
 
 type HealthCheck_CustomHealthCheck_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -1146,8 +1149,8 @@ var file_envoy_api_v2_core_health_check_proto_rawDesc = []byte{
 	0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x08, 0x20, 0x03,
 	0x28, 0x09, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x25, 0x0a, 0x09, 0x75, 0x73,
-	0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x08, 0x18,
-	0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x08, 0x75, 0x73, 0x65, 0x48, 0x74, 0x74, 0x70,
+	0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x08, 0xb8,
+	0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x08, 0x75, 0x73, 0x65, 0x48, 0x74, 0x74, 0x70,
 	0x32, 0x12, 0x43, 0x0a, 0x11, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74,
 	0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x52,
@@ -1202,16 +1205,16 @@ var file_envoy_api_v2_core_health_check_proto_rawDesc = []byte{
 	0x45, 0x41, 0x4c, 0x54, 0x48, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x52, 0x41, 0x49,
 	0x4e, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55,
 	0x54, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x45, 0x47, 0x52, 0x41, 0x44, 0x45, 0x44, 0x10,
-	0x05, 0x42, 0x93, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x10, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65,
-	0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x05, 0x42, 0x93, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x10, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go
index 5923956ab95..3517d687902 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/http_uri.proto
 
 package core
@@ -35,8 +35,7 @@ type HttpUri struct {
 	//
 	// .. code-block:: yaml
 	//
-	//    uri: https://www.googleapis.com/oauth2/v1/certs
-	//
+	//	uri: https://www.googleapis.com/oauth2/v1/certs
 	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
 	// Specify how `uri` is to be fetched. Today, this requires an explicit
 	// cluster, but in the future we may support dynamic cluster creation or
@@ -44,6 +43,7 @@ type HttpUri struct {
 	// <https://github.com/envoyproxy/envoy/issues/1606>`_.
 	//
 	// Types that are assignable to HttpUpstreamType:
+	//
 	//	*HttpUri_Cluster
 	HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"`
 	// Sets the maximum duration in milliseconds that a response can take to arrive upon request.
@@ -122,8 +122,7 @@ type HttpUri_Cluster struct {
 	//
 	// .. code-block:: yaml
 	//
-	//    cluster: jwks_cluster
-	//
+	//	cluster: jwks_cluster
 	Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3,oneof"`
 }
 
@@ -153,16 +152,16 @@ var file_envoy_api_v2_core_http_uri_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, 0x32,
 	0x00, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x42, 0x19, 0x0a, 0x12, 0x68, 0x74,
 	0x74, 0x70, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x8f, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x55,
-	0x72, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x8f, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0c, 0x48,
+	0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go
index ed8fceace1f..cbf066eab17 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/protocol.proto
 
 package core
@@ -202,8 +202,9 @@ type HttpProtocolOptions struct {
 	// If not specified, this defaults to 1 hour. To disable idle timeouts explicitly set this to 0.
 	//
 	// .. warning::
-	//   Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP
-	//   FIN packets, etc.
+	//
+	//	Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP
+	//	FIN packets, etc.
 	IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
 	// The maximum duration of a connection. The duration is defined as a period since a connection
 	// was established. If not set, there is no max duration. When max_connection_duration is reached
@@ -319,11 +320,11 @@ type Http1ProtocolOptions struct {
 	//
 	// .. attention::
 	//
-	//   Note that this only happens when Envoy is chunk encoding which occurs when:
-	//   - The request is HTTP/1.1.
-	//   - Is neither a HEAD only request nor a HTTP Upgrade.
-	//   - Not a response to a HEAD request.
-	//   - The content length header is not present.
+	//	Note that this only happens when Envoy is chunk encoding which occurs when:
+	//	- The request is HTTP/1.1.
+	//	- Is neither a HEAD only request nor a HTTP Upgrade.
+	//	- Not a response to a HEAD request.
+	//	- The content length header is not present.
 	EnableTrailers bool `protobuf:"varint,5,opt,name=enable_trailers,json=enableTrailers,proto3" json:"enable_trailers,omitempty"`
 }
 
@@ -439,20 +440,20 @@ type Http2ProtocolOptions struct {
 	AllowMetadata bool `protobuf:"varint,6,opt,name=allow_metadata,json=allowMetadata,proto3" json:"allow_metadata,omitempty"`
 	// Limit the number of pending outbound downstream frames of all types (frames that are waiting to
 	// be written into the socket). Exceeding this limit triggers flood mitigation and connection is
-	// terminated. The ``http2.outbound_flood`` stat tracks the number of terminated connections due
+	// terminated. The “http2.outbound_flood“ stat tracks the number of terminated connections due
 	// to flood mitigation. The default limit is 10000.
 	// [#comment:TODO: implement same limits for upstream outbound frames as well.]
 	MaxOutboundFrames *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"`
 	// Limit the number of pending outbound downstream frames of types PING, SETTINGS and RST_STREAM,
 	// preventing high memory utilization when receiving continuous stream of these frames. Exceeding
 	// this limit triggers flood mitigation and connection is terminated. The
-	// ``http2.outbound_control_flood`` stat tracks the number of terminated connections due to flood
+	// “http2.outbound_control_flood“ stat tracks the number of terminated connections due to flood
 	// mitigation. The default limit is 1000.
 	// [#comment:TODO: implement same limits for upstream outbound frames as well.]
 	MaxOutboundControlFrames *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"`
 	// Limit the number of consecutive inbound frames of types HEADERS, CONTINUATION and DATA with an
 	// empty payload and no end stream flag. Those frames have no legitimate use and are abusive, but
-	// might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood``
+	// might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood“
 	// stat tracks the number of connections terminated due to flood mitigation.
 	// Setting this to 0 will terminate connection upon receiving first frame with an empty payload
 	// and no end stream flag. The default limit is 1.
@@ -462,9 +463,9 @@ type Http2ProtocolOptions struct {
 	// of PRIORITY frames received over the lifetime of connection exceeds the value calculated
 	// using this formula::
 	//
-	//     max_inbound_priority_frames_per_stream * (1 + inbound_streams)
+	//	max_inbound_priority_frames_per_stream * (1 + inbound_streams)
 	//
-	// the connection is terminated. The ``http2.inbound_priority_frames_flood`` stat tracks
+	// the connection is terminated. The “http2.inbound_priority_frames_flood“ stat tracks
 	// the number of connections terminated due to flood mitigation. The default limit is 100.
 	// [#comment:TODO: implement same limits for upstream inbound frames as well.]
 	MaxInboundPriorityFramesPerStream *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"`
@@ -472,10 +473,10 @@ type Http2ProtocolOptions struct {
 	// of WINDOW_UPDATE frames received over the lifetime of connection exceeds the value calculated
 	// using this formula::
 	//
-	//     1 + 2 * (inbound_streams +
-	//              max_inbound_window_update_frames_per_data_frame_sent * outbound_data_frames)
+	//	1 + 2 * (inbound_streams +
+	//	         max_inbound_window_update_frames_per_data_frame_sent * outbound_data_frames)
 	//
-	// the connection is terminated. The ``http2.inbound_priority_frames_flood`` stat tracks
+	// the connection is terminated. The “http2.inbound_priority_frames_flood“ stat tracks
 	// the number of connections terminated due to flood mitigation. The default limit is 10.
 	// Setting this to 1 should be enough to support HTTP/2 implementations with basic flow control,
 	// but more complex implementations that try to estimate available bandwidth require at least 2.
@@ -501,11 +502,11 @@ type Http2ProtocolOptions struct {
 	//
 	// .. code-block:: text
 	//
-	//   ID    Field Name
-	//   ----------------
-	//   0x1   hpack_table_size
-	//   0x3   max_concurrent_streams
-	//   0x4   initial_stream_window_size
+	//	ID    Field Name
+	//	----------------
+	//	0x1   hpack_table_size
+	//	0x3   max_concurrent_streams
+	//	0x4   initial_stream_window_size
 	//
 	// Collisions will trigger config validation failure on load/update. Likewise, inconsistencies
 	// between custom parameters with the same identifier will trigger a failure.
@@ -693,6 +694,7 @@ type Http1ProtocolOptions_HeaderKeyFormat struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to HeaderFormat:
+	//
 	//	*Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_
 	HeaderFormat isHttp1ProtocolOptions_HeaderKeyFormat_HeaderFormat `protobuf_oneof:"header_format"`
 }
@@ -946,7 +948,7 @@ var file_envoy_api_v2_core_protocol_proto_rawDesc = []byte{
 	0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x1a, 0x11, 0x0a, 0x0f, 0x50,
 	0x72, 0x6f, 0x70, 0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x42, 0x14,
 	0x0a, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12,
-	0x03, 0xf8, 0x42, 0x01, 0x22, 0xa9, 0x0b, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72,
+	0x03, 0xf8, 0x42, 0x01, 0x22, 0xa6, 0x0b, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72,
 	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a,
 	0x10, 0x68, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a,
 	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
@@ -1026,35 +1028,34 @@ var file_envoy_api_v2_core_protocol_proto_rawDesc = []byte{
 	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x65,
 	0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x52,
 	0x18, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x1a, 0xa4, 0x01, 0x0a, 0x11, 0x53, 0x65,
+	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x1a, 0xa1, 0x01, 0x0a, 0x11, 0x53, 0x65,
 	0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12,
-	0x51, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x4e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x42, 0x13, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x18, 0x80, 0x80, 0x04, 0x28, 0x01, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69,
-	0x65, 0x72, 0x12, 0x3c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x22, 0x74, 0x0a, 0x13, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5d, 0x0a, 0x16, 0x68, 0x74, 0x74, 0x70, 0x32,
-	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70,
-	0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x52, 0x14, 0x68, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x90, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0d, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,
-	0x2f, 0x63, 0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x65, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x2a, 0x06, 0x18, 0x80, 0x80,
+	0x04, 0x28, 0x01, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12,
+	0x3c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x74, 0x0a,
+	0x13, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5d, 0x0a, 0x16, 0x68, 0x74, 0x74, 0x70, 0x32, 0x5f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x14, 0x68,
+	0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x42, 0x90, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0d, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
+	0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/socket_option.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/socket_option.pb.go
index 901250ed208..addb02b685e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/socket_option.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/socket_option.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/core/socket_option.proto
 
 package core
@@ -90,6 +90,7 @@ type SocketOption struct {
 	// The numeric name as passed to setsockopt
 	Name int64 `protobuf:"varint,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to Value:
+	//
 	//	*SocketOption_IntValue
 	//	*SocketOption_BufValue
 	Value isSocketOption_Value `protobuf_oneof:"value"`
@@ -229,16 +230,16 @@ var file_envoy_api_v2_core_socket_option_proto_rawDesc = []byte{
 	0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x13, 0x0a,
 	0x0f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x45, 0x4e, 0x49, 0x4e, 0x47,
 	0x10, 0x02, 0x42, 0x0c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x42, 0x94, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x42, 0x11, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x42, 0x94, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1f, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x11, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x38, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go
index 3425cac690d..fd267691969 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/discovery.proto
 
 package apiv2
@@ -154,17 +154,17 @@ type DiscoveryResponse struct {
 	// [#not-implemented-hide:]
 	// Canary is used to support two Envoy command line flags:
 	//
-	// * --terminate-on-canary-transition-failure. When set, Envoy is able to
-	//   terminate if it detects that configuration is stuck at canary. Consider
-	//   this example sequence of updates:
+	//   - --terminate-on-canary-transition-failure. When set, Envoy is able to
+	//     terminate if it detects that configuration is stuck at canary. Consider
+	//     this example sequence of updates:
 	//   - Management server applies a canary config successfully.
 	//   - Management server rolls back to a production config.
 	//   - Envoy rejects the new production config.
-	//   Since there is no sensible way to continue receiving configuration
-	//   updates, Envoy will then terminate and apply production config from a
-	//   clean slate.
-	// * --dry-run-canary. When set, a canary response will never be applied, only
-	//   validated via a dry run.
+	//     Since there is no sensible way to continue receiving configuration
+	//     updates, Envoy will then terminate and apply production config from a
+	//     clean slate.
+	//   - --dry-run-canary. When set, a canary response will never be applied, only
+	//     validated via a dry run.
 	Canary bool `protobuf:"varint,3,opt,name=canary,proto3" json:"canary,omitempty"`
 	// Type URL for resources. Identifies the xDS API when muxing over ADS.
 	// Must be consistent with the type_url in the 'resources' repeated Any (if non-empty).
@@ -691,16 +691,16 @@ var file_envoy_api_v2_discovery_proto_rawDesc = []byte{
 	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x93, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69,
-	0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1c, 0x12, 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x93, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1c, 0x12,
+	0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64,
+	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42,
+	0x0e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go
index e8a4489a970..0c0351ab9eb 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/eds.proto
 
 package apiv2
@@ -84,7 +84,7 @@ var file_envoy_api_v2_eds_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
 	0x32, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x0a, 0x0a, 0x08, 0x45, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0x80, 0x03, 0x0a,
+	0x22, 0x0a, 0x0a, 0x08, 0x45, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xfa, 0x02, 0x0a,
 	0x18, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x58, 0x0a, 0x0f, 0x53, 0x74, 0x72,
 	0x65, 0x61, 0x6d, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x1e, 0x2e, 0x65,
@@ -98,27 +98,27 @@ var file_envoy_api_v2_eds_proto_rawDesc = []byte{
 	0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44,
 	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x7b, 0x0a, 0x0e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x45,
+	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x75, 0x0a, 0x0e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x45,
 	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x19, 0x22, 0x17, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x3a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03,
-	0x3a, 0x01, 0x2a, 0x1a, 0x2a, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42,
-	0x8c, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x08,
-	0x45, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b,
-	0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1b, 0x12, 0x19, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x50, 0x05,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
+	0x65, 0x72, 0x79, 0x3a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x1a, 0x2a, 0x8a,
+	0xa4, 0x96, 0xf3, 0x07, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41,
+	0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x8c, 0x01, 0xf2, 0x98, 0xfe, 0x8f,
+	0x05, 0x1b, 0x12, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x42, 0x08, 0x45, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint.pb.go
index 488e9f8f4eb..903041d2bcd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/endpoint.proto
 
 package apiv2
@@ -132,15 +132,17 @@ type ClusterLoadAssignment_Policy struct {
 	//
 	// .. code-block:: json
 	//
-	//  { "drop_overloads": [
-	//      { "category": "throttle", "drop_percentage": 60 }
-	//      { "category": "lb", "drop_percentage": 50 }
-	//  ]}
+	//	{ "drop_overloads": [
+	//	    { "category": "throttle", "drop_percentage": 60 }
+	//	    { "category": "lb", "drop_percentage": 50 }
+	//	]}
 	//
 	// The actual drop percentages applied to the traffic at the clients will be
-	//    "throttle"_drop = 60%
-	//    "lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
-	//    actual_outgoing_load = 20% // remaining after applying all categories.
+	//
+	//	"throttle"_drop = 60%
+	//	"lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
+	//	actual_outgoing_load = 20% // remaining after applying all categories.
+	//
 	// [#not-implemented-hide:]
 	DropOverloads []*ClusterLoadAssignment_Policy_DropOverload `protobuf:"bytes,2,rep,name=drop_overloads,json=dropOverloads,proto3" json:"drop_overloads,omitempty"`
 	// Priority levels and localities are considered overprovisioned with this
@@ -153,7 +155,7 @@ type ClusterLoadAssignment_Policy struct {
 	//
 	// .. code-block:: json
 	//
-	//  { "overprovisioning_factor": 100 }
+	//	{ "overprovisioning_factor": 100 }
 	//
 	// Read more at :ref:`priority levels <arch_overview_load_balancing_priority_levels>` and
 	// :ref:`localities <arch_overview_load_balancing_locality_weighted_lb>`.
@@ -172,7 +174,7 @@ type ClusterLoadAssignment_Policy struct {
 	// <arch_overview_load_balancing_overprovisioning_factor>` suggests.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/endpoint.proto.
 	DisableOverprovisioning bool `protobuf:"varint,5,opt,name=disable_overprovisioning,json=disableOverprovisioning,proto3" json:"disable_overprovisioning,omitempty"`
 }
 
@@ -229,7 +231,7 @@ func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *duration.Duratio
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/endpoint.proto.
 func (x *ClusterLoadAssignment_Policy) GetDisableOverprovisioning() bool {
 	if x != nil {
 		return x.DisableOverprovisioning
@@ -370,16 +372,16 @@ var file_envoy_api_v2_endpoint_proto_rawDesc = []byte{
 	0x79, 0x12, 0x35, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
 	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x90, 0x01, 0x0a,
-	0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0d, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
-	0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62,
+	0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x90, 0x01, 0xf2,
+	0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x42, 0x0d, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go
index 9b7e3d72c54..23948ecbf0c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/endpoint/endpoint.proto
 
 package endpoint
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint_components.pb.go
index 462682f28fd..5a4d837fae5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/endpoint/endpoint_components.proto
 
 package endpoint
@@ -34,19 +34,19 @@ type Endpoint struct {
 	//
 	// .. attention::
 	//
-	//   The form of host address depends on the given cluster type. For STATIC or EDS,
-	//   it is expected to be a direct IP address (or something resolvable by the
-	//   specified :ref:`resolver <envoy_api_field_core.SocketAddress.resolver_name>`
-	//   in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
-	//   and will be resolved via DNS.
+	//	The form of host address depends on the given cluster type. For STATIC or EDS,
+	//	it is expected to be a direct IP address (or something resolvable by the
+	//	specified :ref:`resolver <envoy_api_field_core.SocketAddress.resolver_name>`
+	//	in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
+	//	and will be resolved via DNS.
 	Address *core.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	// The optional health check configuration is used as configuration for the
 	// health checker to contact the health checked host.
 	//
 	// .. attention::
 	//
-	//   This takes into effect only for upstream clusters with
-	//   :ref:`active health checking <arch_overview_health_checking>` enabled.
+	//	This takes into effect only for upstream clusters with
+	//	:ref:`active health checking <arch_overview_health_checking>` enabled.
 	HealthCheckConfig *Endpoint_HealthCheckConfig `protobuf:"bytes,2,opt,name=health_check_config,json=healthCheckConfig,proto3" json:"health_check_config,omitempty"`
 	// The hostname associated with this endpoint. This hostname is not used for routing or address
 	// resolution. If provided, it will be associated with the endpoint, and can be used for features
@@ -118,6 +118,7 @@ type LbEndpoint struct {
 	// Upstream host identifier or a named reference.
 	//
 	// Types that are assignable to HostIdentifier:
+	//
 	//	*LbEndpoint_Endpoint
 	//	*LbEndpoint_EndpointName
 	HostIdentifier isLbEndpoint_HostIdentifier `protobuf_oneof:"host_identifier"`
@@ -495,18 +496,18 @@ var file_envoy_api_v2_endpoint_endpoint_components_proto_rawDesc = []byte{
 	0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
 	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70,
-	0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79, 0x42, 0xa6, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x42, 0x17, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e,
-	0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,
-	0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12,
-	0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79, 0x42, 0xa6, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x17, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go
index bca1888e028..f3f0d363e67 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/endpoint/load_report.proto
 
 package endpoint
@@ -629,17 +629,17 @@ var file_envoy_api_v2_endpoint_load_report_proto_rawDesc = []byte{
 	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65,
 	0x67, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x72, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x5f,
 	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x64, 0x72, 0x6f,
-	0x70, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x9e, 0x01, 0x0a, 0x23, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x42, 0x0f, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x70, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x9e, 0x01, 0xf2, 0x98, 0xfe, 0x8f,
+	0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x0f, 0x4c, 0x6f, 0x61, 0x64, 0x52,
+	0x65, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
+	0x32, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go
index 75ea2917014..3aa13964a12 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/lds.proto
 
 package apiv2
@@ -84,7 +84,7 @@ var file_envoy_api_v2_lds_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
 	0x32, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x0a, 0x0a, 0x08, 0x4c, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xf3, 0x02, 0x0a,
+	0x22, 0x0a, 0x0a, 0x08, 0x4c, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xed, 0x02, 0x0a,
 	0x18, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x61, 0x0a, 0x0e, 0x44, 0x65, 0x6c,
 	0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x23, 0x2e, 0x65, 0x6e,
@@ -98,26 +98,26 @@ var file_envoy_api_v2_lds_proto_rawDesc = []byte{
 	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
 	0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44,
 	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x7b, 0x0a, 0x0e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4c,
+	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x75, 0x0a, 0x0e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4c,
 	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x19, 0x22, 0x17, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x3a, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03,
-	0x3a, 0x01, 0x2a, 0x1a, 0x1d, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x42, 0x8c, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x42, 0x08, 0x4c, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1b, 0x12, 0x19,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x01, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
+	0x65, 0x72, 0x79, 0x3a, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x1a, 0x1d, 0x8a,
+	0xa4, 0x96, 0xf3, 0x07, 0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x8c, 0x01, 0xf2,
+	0x98, 0xfe, 0x8f, 0x05, 0x1b, 0x12, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x4c, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x50, 0x05, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener.pb.go
index 0dc0cc0f2e9..8b147020daa 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/listener.proto
 
 package apiv2
@@ -109,15 +109,15 @@ type Listener struct {
 	//
 	// .. attention::
 	//
-	//   This field is deprecated. Use :ref:`an original_dst <config_listener_filters_original_dst>`
-	//   :ref:`listener filter <envoy_api_field_Listener.listener_filters>` instead.
+	//	This field is deprecated. Use :ref:`an original_dst <config_listener_filters_original_dst>`
+	//	:ref:`listener filter <envoy_api_field_Listener.listener_filters>` instead.
 	//
-	//   Note that hand off to another listener is *NOT* performed without this flag. Once
-	//   :ref:`FilterChainMatch <envoy_api_msg_listener.FilterChainMatch>` is implemented this flag
-	//   will be removed, as filter chain matching can be used to select a filter chain based on the
-	//   restored destination address.
+	//	Note that hand off to another listener is *NOT* performed without this flag. Once
+	//	:ref:`FilterChainMatch <envoy_api_msg_listener.FilterChainMatch>` is implemented this flag
+	//	will be removed, as filter chain matching can be used to select a filter chain based on the
+	//	restored destination address.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/listener.proto.
 	UseOriginalDst *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_original_dst,json=useOriginalDst,proto3" json:"use_original_dst,omitempty"`
 	// Soft limit on size of the listener’s new connection read and write buffers.
 	// If unspecified, an implementation defined default is applied (1MiB).
@@ -147,9 +147,9 @@ type Listener struct {
 	//
 	// .. attention::
 	//
-	//   Some listener filters, such as :ref:`Proxy Protocol filter
-	//   <config_listener_filters_proxy_protocol>`, should not be used with this option. It will cause
-	//   unexpected behavior when a connection is created.
+	//	Some listener filters, such as :ref:`Proxy Protocol filter
+	//	<config_listener_filters_proxy_protocol>`, should not be used with this option. It will cause
+	//	unexpected behavior when a connection is created.
 	ContinueOnListenerFiltersTimeout bool `protobuf:"varint,17,opt,name=continue_on_listener_filters_timeout,json=continueOnListenerFiltersTimeout,proto3" json:"continue_on_listener_filters_timeout,omitempty"`
 	// Whether the listener should be set as a transparent socket.
 	// When this flag is set to true, connections can be redirected to the listener using an
@@ -209,8 +209,8 @@ type Listener struct {
 	//
 	// .. note::
 	//
-	//  Currently only one ApiListener can be installed; and it can only be done via bootstrap config,
-	//  not LDS.
+	//	Currently only one ApiListener can be installed; and it can only be done via bootstrap config,
+	//	not LDS.
 	//
 	// [#next-major-version: In the v3 API, instead of this messy approach where the socket
 	// listener fields are directly in the top-level Listener message and the API listener types
@@ -292,7 +292,7 @@ func (x *Listener) GetFilterChains() []*listener.FilterChain {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/listener.proto.
 func (x *Listener) GetUseOriginalDst() *wrappers.BoolValue {
 	if x != nil {
 		return x.UseOriginalDst
@@ -484,6 +484,7 @@ type Listener_ConnectionBalanceConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to BalanceType:
+	//
 	//	*Listener_ConnectionBalanceConfig_ExactBalance_
 	BalanceType isListener_ConnectionBalanceConfig_BalanceType `protobuf_oneof:"balance_type"`
 }
@@ -737,16 +738,16 @@ var file_envoy_api_v2_listener_proto_rawDesc = []byte{
 	0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x29, 0x0a, 0x09, 0x44, 0x72, 0x61,
 	0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c,
 	0x54, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x4f, 0x44, 0x49, 0x46, 0x59, 0x5f, 0x4f, 0x4e,
-	0x4c, 0x59, 0x10, 0x01, 0x4a, 0x04, 0x08, 0x0e, 0x10, 0x0f, 0x42, 0x90, 0x01, 0x0a, 0x1a, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b,
-	0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70,
+	0x4c, 0x59, 0x10, 0x01, 0x4a, 0x04, 0x08, 0x0e, 0x10, 0x0f, 0x42, 0x90, 0x01, 0xf2, 0x98, 0xfe,
+	0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x42, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go
index cdbfc0a38a7..c0ec1443563 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/listener/listener.proto
 
 package listener
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener_components.pb.go
index 611edb861dd..9118df6d0c3 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/listener/listener_components.proto
 
 package listener
@@ -92,6 +92,7 @@ type Filter struct {
 	// instantiated. See the supported filters for further documentation.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*Filter_Config
 	//	*Filter_TypedConfig
 	ConfigType isFilter_ConfigType `protobuf_oneof:"config_type"`
@@ -143,7 +144,7 @@ func (m *Filter) GetConfigType() isFilter_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 func (x *Filter) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*Filter_Config); ok {
 		return x.Config
@@ -163,7 +164,7 @@ type isFilter_ConfigType interface {
 }
 
 type Filter_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -195,9 +196,9 @@ func (*Filter_TypedConfig) isFilter_ConfigType() {}
 //
 // For criteria that allow ranges or wildcards, the most specific value in any
 // of the configured filter chains that matches the incoming connection is going
-// to be used (e.g. for SNI ``www.example.com`` the most specific match would be
-// ``www.example.com``, then ``*.example.com``, then ``*.com``, then any filter
-// chain without ``server_names`` requirements).
+// to be used (e.g. for SNI “www.example.com“ the most specific match would be
+// “www.example.com“, then “*.example.com“, then “*.com“, then any filter
+// chain without “server_names“ requirements).
 //
 // [#comment: Implemented rules are kept in the preference order, with deprecated fields
 // listed at the end, because that's how we want to list them in the docs.
@@ -236,15 +237,15 @@ type FilterChainMatch struct {
 	// a filter chain match. Those values will be compared against the server names of a new
 	// connection, when detected by one of the listener filters.
 	//
-	// The server name will be matched against all wildcard domains, i.e. ``www.example.com``
-	// will be first matched against ``www.example.com``, then ``*.example.com``, then ``*.com``.
+	// The server name will be matched against all wildcard domains, i.e. “www.example.com“
+	// will be first matched against “www.example.com“, then “*.example.com“, then “*.com“.
 	//
-	// Note that partial wildcards are not supported, and values like ``*w.example.com`` are invalid.
+	// Note that partial wildcards are not supported, and values like “*w.example.com“ are invalid.
 	//
 	// .. attention::
 	//
-	//   See the :ref:`FAQ entry <faq_how_to_setup_sni>` on how to configure SNI for more
-	//   information.
+	//	See the :ref:`FAQ entry <faq_how_to_setup_sni>` on how to configure SNI for more
+	//	information.
 	ServerNames []string `protobuf:"bytes,11,rep,name=server_names,json=serverNames,proto3" json:"server_names,omitempty"`
 	// If non-empty, a transport protocol to consider when determining a filter chain match.
 	// This value will be compared against the transport protocol of a new connection, when
@@ -252,9 +253,9 @@ type FilterChainMatch struct {
 	//
 	// Suggested values include:
 	//
-	// * ``raw_buffer`` - default, used when no transport protocol is detected,
-	// * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
-	//   when TLS protocol is detected.
+	//   - “raw_buffer“ - default, used when no transport protocol is detected,
+	//   - “tls“ - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
+	//     when TLS protocol is detected.
 	TransportProtocol string `protobuf:"bytes,9,opt,name=transport_protocol,json=transportProtocol,proto3" json:"transport_protocol,omitempty"`
 	// If non-empty, a list of application protocols (e.g. ALPN for TLS protocol) to consider when
 	// determining a filter chain match. Those values will be compared against the application
@@ -262,19 +263,19 @@ type FilterChainMatch struct {
 	//
 	// Suggested values include:
 	//
-	// * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector
-	//   <config_listener_filters_tls_inspector>`,
-	// * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
+	//   - “http/1.1“ - set by :ref:`envoy.filters.listener.tls_inspector
+	//     <config_listener_filters_tls_inspector>`,
+	//   - “h2“ - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
 	//
 	// .. attention::
 	//
-	//   Currently, only :ref:`TLS Inspector <config_listener_filters_tls_inspector>` provides
-	//   application protocol detection based on the requested
-	//   `ALPN <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_ values.
+	//	Currently, only :ref:`TLS Inspector <config_listener_filters_tls_inspector>` provides
+	//	application protocol detection based on the requested
+	//	`ALPN <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_ values.
 	//
-	//   However, the use of ALPN is pretty much limited to the HTTP/2 traffic on the Internet,
-	//   and matching on values other than ``h2`` is going to lead to a lot of false negatives,
-	//   unless all connecting clients are known to use ALPN.
+	//	However, the use of ALPN is pretty much limited to the HTTP/2 traffic on the Internet,
+	//	and matching on values other than ``h2`` is going to lead to a lot of false negatives,
+	//	unless all connecting clients are known to use ALPN.
 	ApplicationProtocols []string `protobuf:"bytes,10,rep,name=application_protocols,json=applicationProtocols,proto3" json:"application_protocols,omitempty"`
 }
 
@@ -394,10 +395,10 @@ type FilterChain struct {
 	//
 	// .. attention::
 	//
-	//   **This field is deprecated**. Use `transport_socket` with name `tls` instead. If both are
-	//   set, `transport_socket` takes priority.
+	//	**This field is deprecated**. Use `transport_socket` with name `tls` instead. If both are
+	//	set, `transport_socket` takes priority.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 	TlsContext *auth.DownstreamTlsContext `protobuf:"bytes,2,opt,name=tls_context,json=tlsContext,proto3" json:"tls_context,omitempty"`
 	// A list of individual network filters that make up the filter chain for
 	// connections established with the listener. Order matters as the filters are
@@ -464,7 +465,7 @@ func (x *FilterChain) GetFilterChainMatch() *FilterChainMatch {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 func (x *FilterChain) GetTlsContext() *auth.DownstreamTlsContext {
 	if x != nil {
 		return x.TlsContext
@@ -516,22 +517,22 @@ func (x *FilterChain) GetName() string {
 //
 // .. code-block:: yaml
 //
-//  destination_port_range:
-//   start: 3306
-//   end: 3307
+//	destination_port_range:
+//	 start: 3306
+//	 end: 3307
 //
 // * Matches if the destination port is 3306 or 15000.
 //
 // .. code-block:: yaml
 //
-//  or_match:
-//    rules:
-//      - destination_port_range:
-//          start: 3306
-//          end: 3307
-//      - destination_port_range:
-//          start: 15000
-//          end: 15001
+//	or_match:
+//	  rules:
+//	    - destination_port_range:
+//	        start: 3306
+//	        end: 3307
+//	    - destination_port_range:
+//	        start: 15000
+//	        end: 15001
 //
 // [#next-free-field: 6]
 type ListenerFilterChainMatchPredicate struct {
@@ -540,6 +541,7 @@ type ListenerFilterChainMatchPredicate struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*ListenerFilterChainMatchPredicate_OrMatch
 	//	*ListenerFilterChainMatchPredicate_AndMatch
 	//	*ListenerFilterChainMatchPredicate_NotMatch
@@ -677,6 +679,7 @@ type ListenerFilter struct {
 	// See the supported filters for further documentation.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*ListenerFilter_Config
 	//	*ListenerFilter_TypedConfig
 	ConfigType isListenerFilter_ConfigType `protobuf_oneof:"config_type"`
@@ -732,7 +735,7 @@ func (m *ListenerFilter) GetConfigType() isListenerFilter_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 func (x *ListenerFilter) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*ListenerFilter_Config); ok {
 		return x.Config
@@ -759,7 +762,7 @@ type isListenerFilter_ConfigType interface {
 }
 
 type ListenerFilter_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -984,20 +987,20 @@ var file_envoy_api_v2_listener_listener_components_proto_rawDesc = []byte{
 	0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52,
 	0x0e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42,
 	0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0xdd,
-	0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0xaa,
-	0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e, 0x76, 0x6f,
-	0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06,
+	0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x17,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e,
+	0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0xaa, 0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e,
+	0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a,
+	0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/quic_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/quic_config.pb.go
index 6a13da380ef..38fb7fdac18 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/quic_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/quic_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/listener/quic_config.proto
 
 package listener
@@ -125,20 +125,20 @@ var file_envoy_api_v2_listener_quic_config_proto_rawDesc = []byte{
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
 	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x16, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x48, 0x61,
 	0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x42, 0xd5,
-	0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x0f, 0x51, 0x75, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0xaa, 0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e,
-	0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a,
-	0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xf2, 0x98,
-	0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x0f,
+	0x51, 0x75, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0xaa,
+	0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e, 0x76, 0x6f,
+	0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/udp_listener_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/udp_listener_config.pb.go
index 84e69fbcc8b..5465c0f8cd7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/udp_listener_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/udp_listener_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/listener/udp_listener_config.proto
 
 package listener
@@ -36,6 +36,7 @@ type UdpListenerConfig struct {
 	// "raw_udp_listener", config is not needed.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*UdpListenerConfig_Config
 	//	*UdpListenerConfig_TypedConfig
 	ConfigType isUdpListenerConfig_ConfigType `protobuf_oneof:"config_type"`
@@ -87,7 +88,7 @@ func (m *UdpListenerConfig) GetConfigType() isUdpListenerConfig_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/listener/udp_listener_config.proto.
 func (x *UdpListenerConfig) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*UdpListenerConfig_Config); ok {
 		return x.Config
@@ -107,7 +108,7 @@ type isUdpListenerConfig_ConfigType interface {
 }
 
 type UdpListenerConfig_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/listener/udp_listener_config.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -186,20 +187,20 @@ var file_envoy_api_v2_listener_udp_listener_config_proto_rawDesc = []byte{
 	0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74,
 	0x79, 0x70, 0x65, 0x22, 0x1c, 0x0a, 0x1a, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x61, 0x77,
 	0x55, 0x64, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x42, 0xdc, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x16, 0x55, 0x64, 0x70, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0xaa, 0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e,
-	0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x67, 0x42, 0xdc, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x42, 0x16, 0x55, 0x64, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,
+	0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0xaa, 0x02, 0x17, 0x45, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x4e, 0x53, 0xea, 0x02, 0x1a, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69,
+	0x3a, 0x3a, 0x56, 0x32, 0x3a, 0x3a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x53,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go
index 33ea66009f9..e8b1a20ffbd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/rds.proto
 
 package apiv2
@@ -84,7 +84,7 @@ var file_envoy_api_v2_rds_proto_rawDesc = []byte{
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
 	0x32, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0a, 0x0a,
-	0x08, 0x52, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xee, 0x02, 0x0a, 0x15, 0x52, 0x6f,
+	0x08, 0x52, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xe8, 0x02, 0x0a, 0x15, 0x52, 0x6f,
 	0x75, 0x74, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x75,
 	0x74, 0x65, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
@@ -97,37 +97,37 @@ var file_envoy_api_v2_rds_proto_rawDesc = []byte{
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65,
 	0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x75, 0x0a, 0x0b, 0x46, 0x65,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x6f, 0x0a, 0x0b, 0x46, 0x65,
 	0x74, 0x63, 0x68, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x16, 0x22, 0x14, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x3a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01,
-	0x2a, 0x1a, 0x27, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xab, 0x01, 0x0a, 0x1b, 0x56,
-	0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x64, 0x0a, 0x11, 0x44, 0x65,
-	0x6c, 0x74, 0x61, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x12,
-	0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44,
-	0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01,
-	0x1a, 0x26, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72,
-	0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x42, 0x89, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e,
+	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x3a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x27, 0x8a, 0xa4, 0x96,
+	0xf3, 0x07, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x32, 0xab, 0x01, 0x0a, 0x1b, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c,
+	0x48, 0x6f, 0x73, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x12, 0x64, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x56, 0x69, 0x72,
+	0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69,
+	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65,
+	0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x1a, 0x26, 0x8a, 0xa4, 0x96, 0xf3,
+	0x07, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f,
+	0x73, 0x74, 0x42, 0x89, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x52, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74,
 	0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98,
-	0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x01, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x50, 0x05,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route.pb.go
index 77c77a5aeb7..656e5284570 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/route.proto
 
 package apiv2
@@ -279,7 +279,7 @@ var file_envoy_api_v2_route_proto_rawDesc = []byte{
 	0x68, 0x64, 0x73, 0x52, 0x04, 0x76, 0x68, 0x64, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x69, 0x6e, 0x74,
 	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a,
-	0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x13, 0x69, 0x6e, 0x74, 0x65,
+	0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x13, 0x69, 0x6e, 0x74, 0x65,
 	0x72, 0x6e, 0x61, 0x6c, 0x4f, 0x6e, 0x6c, 0x79, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12,
 	0x66, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64,
 	0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
@@ -290,7 +290,7 @@ var file_envoy_api_v2_route_proto_rawDesc = []byte{
 	0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72,
 	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d,
-	0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x17, 0x72,
+	0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x17, 0x72,
 	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f,
 	0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x64, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64,
@@ -301,8 +301,8 @@ var file_envoy_api_v2_route_proto_rawDesc = []byte{
 	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4b, 0x0a, 0x19,
 	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f,
 	0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x42,
-	0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01,
-	0x00, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01,
+	0x01, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
 	0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x4c, 0x0a, 0x23, 0x6d, 0x6f, 0x73,
 	0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x73,
@@ -318,16 +318,16 @@ var file_envoy_api_v2_route_proto_rawDesc = []byte{
 	0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
 	0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x8a, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32,
-	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x17, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x8a, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x17, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0a, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b,
+	0x61, 0x70, 0x69, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
index 7fc36226034..2805551be21 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/route/route.proto
 
 package route
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route_components.pb.go
index 8c109eec69f..83f7f4b0e3e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/route/route_components.proto
 
 package route
@@ -258,18 +258,18 @@ type VirtualHost struct {
 	// virtual host. Wildcard hosts are supported in the suffix or prefix form.
 	//
 	// Domain search order:
-	//  1. Exact domain names: ``www.foo.com``.
-	//  2. Suffix domain wildcards: ``*.foo.com`` or ``*-bar.foo.com``.
-	//  3. Prefix domain wildcards: ``foo.*`` or ``foo-*``.
-	//  4. Special wildcard ``*`` matching any domain.
+	//  1. Exact domain names: “www.foo.com“.
+	//  2. Suffix domain wildcards: “*.foo.com“ or “*-bar.foo.com“.
+	//  3. Prefix domain wildcards: “foo.*“ or “foo-*“.
+	//  4. Special wildcard “*“ matching any domain.
 	//
 	// .. note::
 	//
-	//   The wildcard will not match the empty string.
-	//   e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``.
-	//   The longest wildcards match first.
-	//   Only a single virtual host in the entire route configuration can match on ``*``. A domain
-	//   must be unique across all virtual hosts or the config will fail to load.
+	//	The wildcard will not match the empty string.
+	//	e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``.
+	//	The longest wildcards match first.
+	//	Only a single virtual host in the entire route configuration can match on ``*``. A domain
+	//	must be unique across all virtual hosts or the config will fail to load.
 	//
 	// Domains cannot contain control characters. This is validated by the well_known_regex HTTP_HEADER_VALUE.
 	Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"`
@@ -313,7 +313,7 @@ type VirtualHost struct {
 	// specific; see the :ref:`HTTP filter documentation <config_http_filters>`
 	// for if and how it is utilized.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,12,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The per_filter_config field can be used to provide virtual host-specific
 	// configurations for filters. The key should match the filter name, such as
@@ -470,7 +470,7 @@ func (x *VirtualHost) GetCors() *CorsPolicy {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *VirtualHost) GetPerFilterConfig() map[string]*_struct.Struct {
 	if x != nil {
 		return x.PerFilterConfig
@@ -580,8 +580,9 @@ func (x *FilterAction) GetAction() *any1.Any {
 //
 // .. attention::
 //
-//   Envoy supports routing on HTTP method via :ref:`header matching
-//   <envoy_api_msg_route.HeaderMatcher>`.
+//	Envoy supports routing on HTTP method via :ref:`header matching
+//	<envoy_api_msg_route.HeaderMatcher>`.
+//
 // [#next-free-field: 18]
 type Route struct {
 	state         protoimpl.MessageState
@@ -593,6 +594,7 @@ type Route struct {
 	// Route matching parameters.
 	Match *RouteMatch `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"`
 	// Types that are assignable to Action:
+	//
 	//	*Route_Route
 	//	*Route_Redirect
 	//	*Route_DirectResponse
@@ -612,7 +614,7 @@ type Route struct {
 	// specific; see the :ref:`HTTP filter documentation <config_http_filters>` for
 	// if and how it is utilized.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The typed_per_filter_config field can be used to provide route-specific
 	// configurations for filters. The key should match the filter name, such as
@@ -744,7 +746,7 @@ func (x *Route) GetDecorator() *Decorator {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *Route) GetPerFilterConfig() map[string]*_struct.Struct {
 	if x != nil {
 		return x.PerFilterConfig
@@ -922,6 +924,7 @@ type RouteMatch struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PathSpecifier:
+	//
 	//	*RouteMatch_Prefix
 	//	*RouteMatch_Path
 	//	*RouteMatch_Regex
@@ -941,11 +944,11 @@ type RouteMatch struct {
 	//
 	// .. note::
 	//
-	//    Parsing this field is implemented such that the runtime key's data may be represented
-	//    as a FractionalPercent proto represented as JSON/YAML and may also be represented as an
-	//    integer with the assumption that the value is an integral percentage out of 100. For
-	//    instance, a runtime key lookup returning the value "42" would parse as a FractionalPercent
-	//    whose numerator is 42 and denominator is HUNDRED. This preserves legacy semantics.
+	//	Parsing this field is implemented such that the runtime key's data may be represented
+	//	as a FractionalPercent proto represented as JSON/YAML and may also be represented as an
+	//	integer with the assumption that the value is an integral percentage out of 100. For
+	//	instance, a runtime key lookup returning the value "42" would parse as a FractionalPercent
+	//	whose numerator is 42 and denominator is HUNDRED. This preserves legacy semantics.
 	RuntimeFraction *core.RuntimeFractionalPercent `protobuf:"bytes,9,opt,name=runtime_fraction,json=runtimeFraction,proto3" json:"runtime_fraction,omitempty"`
 	// Specifies a set of headers that the route should match on. The router will
 	// check the request’s headers against all the specified headers in the route
@@ -1023,7 +1026,7 @@ func (x *RouteMatch) GetPath() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *RouteMatch) GetRegex() string {
 	if x, ok := x.GetPathSpecifier().(*RouteMatch_Regex); ok {
 		return x.Regex
@@ -1105,16 +1108,17 @@ type RouteMatch_Regex struct {
 	//
 	// Examples:
 	//
-	// * The regex ``/b[io]t`` matches the path */bit*
-	// * The regex ``/b[io]t`` matches the path */bot*
-	// * The regex ``/b[io]t`` does not match the path */bite*
-	// * The regex ``/b[io]t`` does not match the path */bit/bot*
+	// * The regex “/b[io]t“ matches the path */bit*
+	// * The regex “/b[io]t“ matches the path */bot*
+	// * The regex “/b[io]t“ does not match the path */bite*
+	// * The regex “/b[io]t“ does not match the path */bit/bot*
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `safe_regex` as it is not safe for use with
-	//   untrusted input in all cases.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `safe_regex` as it is not safe for use with
+	//	untrusted input in all cases.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Regex string `protobuf:"bytes,3,opt,name=regex,proto3,oneof"`
 }
 
@@ -1153,19 +1157,21 @@ type CorsPolicy struct {
 	// An origin is allowed if either allow_origin or allow_origin_regex match.
 	//
 	// .. attention::
-	//  This field has been deprecated in favor of `allow_origin_string_match`.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `allow_origin_string_match`.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	AllowOrigin []string `protobuf:"bytes,1,rep,name=allow_origin,json=allowOrigin,proto3" json:"allow_origin,omitempty"`
 	// Specifies regex patterns that match allowed origins.
 	//
 	// An origin is allowed if either allow_origin or allow_origin_regex match.
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `allow_origin_string_match` as it is not safe for
-	//   use with untrusted input in all cases.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `allow_origin_string_match` as it is not safe for
+	//	use with untrusted input in all cases.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	AllowOriginRegex []string `protobuf:"bytes,8,rep,name=allow_origin_regex,json=allowOriginRegex,proto3" json:"allow_origin_regex,omitempty"`
 	// Specifies string patterns that match allowed origins. An origin is allowed if any of the
 	// string matchers match.
@@ -1181,13 +1187,14 @@ type CorsPolicy struct {
 	// Specifies whether the resource allows credentials.
 	AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"`
 	// Types that are assignable to EnabledSpecifier:
+	//
 	//	*CorsPolicy_Enabled
 	//	*CorsPolicy_FilterEnabled
 	EnabledSpecifier isCorsPolicy_EnabledSpecifier `protobuf_oneof:"enabled_specifier"`
 	// Specifies the % of requests for which the CORS policies will be evaluated and tracked, but not
 	// enforced.
 	//
-	// This field is intended to be used when ``filter_enabled`` and ``enabled`` are off. One of those
+	// This field is intended to be used when “filter_enabled“ and “enabled“ are off. One of those
 	// fields have to explicitly disable the filter in order for this setting to take effect.
 	//
 	// If :ref:`runtime_key <envoy_api_field_core.RuntimeFractionalPercent.runtime_key>` is specified,
@@ -1228,7 +1235,7 @@ func (*CorsPolicy) Descriptor() ([]byte, []int) {
 	return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{5}
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *CorsPolicy) GetAllowOrigin() []string {
 	if x != nil {
 		return x.AllowOrigin
@@ -1236,7 +1243,7 @@ func (x *CorsPolicy) GetAllowOrigin() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *CorsPolicy) GetAllowOriginRegex() []string {
 	if x != nil {
 		return x.AllowOriginRegex
@@ -1293,7 +1300,7 @@ func (m *CorsPolicy) GetEnabledSpecifier() isCorsPolicy_EnabledSpecifier {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *CorsPolicy) GetEnabled() *wrappers.BoolValue {
 	if x, ok := x.GetEnabledSpecifier().(*CorsPolicy_Enabled); ok {
 		return x.Enabled
@@ -1324,17 +1331,17 @@ type CorsPolicy_Enabled struct {
 	//
 	// .. attention::
 	//
-	//   **This field is deprecated**. Set the
-	//   :ref:`filter_enabled<envoy_api_field_route.CorsPolicy.filter_enabled>` field instead.
+	//	**This field is deprecated**. Set the
+	//	:ref:`filter_enabled<envoy_api_field_route.CorsPolicy.filter_enabled>` field instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Enabled *wrappers.BoolValue `protobuf:"bytes,7,opt,name=enabled,proto3,oneof"`
 }
 
 type CorsPolicy_FilterEnabled struct {
 	// Specifies the % of requests for which the CORS filter is enabled.
 	//
-	// If neither ``enabled``, ``filter_enabled``, nor ``shadow_enabled`` are specified, the CORS
+	// If neither “enabled“, “filter_enabled“, nor “shadow_enabled“ are specified, the CORS
 	// filter will be enabled for 100% of the requests.
 	//
 	// If :ref:`runtime_key <envoy_api_field_core.RuntimeFractionalPercent.runtime_key>` is
@@ -1353,6 +1360,7 @@ type RouteAction struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ClusterSpecifier:
+	//
 	//	*RouteAction_Cluster
 	//	*RouteAction_ClusterHeader
 	//	*RouteAction_WeightedClusters
@@ -1378,25 +1386,25 @@ type RouteAction struct {
 	//
 	// .. attention::
 	//
-	//   Pay careful attention to the use of trailing slashes in the
-	//   :ref:`route's match <envoy_api_field_route.Route.match>` prefix value.
-	//   Stripping a prefix from a path requires multiple Routes to handle all cases. For example,
-	//   rewriting */prefix* to */* and */prefix/etc* to */etc* cannot be done in a single
-	//   :ref:`Route <envoy_api_msg_route.Route>`, as shown by the below config entries:
-	//
-	//   .. code-block:: yaml
-	//
-	//     - match:
-	//         prefix: "/prefix/"
-	//       route:
-	//         prefix_rewrite: "/"
-	//     - match:
-	//         prefix: "/prefix"
-	//       route:
-	//         prefix_rewrite: "/"
-	//
-	//   Having above entries in the config, requests to */prefix* will be stripped to */*, while
-	//   requests to */prefix/etc* will be stripped to */etc*.
+	//	Pay careful attention to the use of trailing slashes in the
+	//	:ref:`route's match <envoy_api_field_route.Route.match>` prefix value.
+	//	Stripping a prefix from a path requires multiple Routes to handle all cases. For example,
+	//	rewriting */prefix* to */* and */prefix/etc* to */etc* cannot be done in a single
+	//	:ref:`Route <envoy_api_msg_route.Route>`, as shown by the below config entries:
+	//
+	//	.. code-block:: yaml
+	//
+	//	  - match:
+	//	      prefix: "/prefix/"
+	//	    route:
+	//	      prefix_rewrite: "/"
+	//	  - match:
+	//	      prefix: "/prefix"
+	//	    route:
+	//	      prefix_rewrite: "/"
+	//
+	//	Having above entries in the config, requests to */prefix* will be stripped to */*, while
+	//	requests to */prefix/etc* will be stripped to */etc*.
 	PrefixRewrite string `protobuf:"bytes,5,opt,name=prefix_rewrite,json=prefixRewrite,proto3" json:"prefix_rewrite,omitempty"`
 	// Indicates that during forwarding, portions of the path that match the
 	// pattern should be rewritten, even allowing the substitution of capture
@@ -1412,22 +1420,23 @@ type RouteAction struct {
 	//
 	// Examples using Google's `RE2 <https://github.com/google/re2>`_ engine:
 	//
-	// * The path pattern ``^/service/([^/]+)(/.*)$`` paired with a substitution
-	//   string of ``\2/instance/\1`` would transform ``/service/foo/v1/api``
-	//   into ``/v1/api/instance/foo``.
+	//   - The path pattern “^/service/([^/]+)(/.*)$“ paired with a substitution
+	//     string of “\2/instance/\1“ would transform “/service/foo/v1/api“
+	//     into “/v1/api/instance/foo“.
 	//
-	// * The pattern ``one`` paired with a substitution string of ``two`` would
-	//   transform ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/two/zzz``.
+	//   - The pattern “one“ paired with a substitution string of “two“ would
+	//     transform “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/two/zzz“.
 	//
-	// * The pattern ``^(.*?)one(.*)$`` paired with a substitution string of
-	//   ``\1two\2`` would replace only the first occurrence of ``one``,
-	//   transforming path ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/one/zzz``.
+	//   - The pattern “^(.*?)one(.*)$“ paired with a substitution string of
+	//     “\1two\2“ would replace only the first occurrence of “one“,
+	//     transforming path “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/one/zzz“.
 	//
-	// * The pattern ``(?i)/xxx/`` paired with a substitution string of ``/yyy/``
-	//   would do a case-insensitive match and transform path ``/aaa/XxX/bbb`` to
-	//   ``/aaa/yyy/bbb``.
+	//   - The pattern “(?i)/xxx/“ paired with a substitution string of “/yyy/“
+	//     would do a case-insensitive match and transform path “/aaa/XxX/bbb“ to
+	//     “/aaa/yyy/bbb“.
 	RegexRewrite *matcher.RegexMatchAndSubstitute `protobuf:"bytes,32,opt,name=regex_rewrite,json=regexRewrite,proto3" json:"regex_rewrite,omitempty"`
 	// Types that are assignable to HostRewriteSpecifier:
+	//
 	//	*RouteAction_HostRewrite
 	//	*RouteAction_AutoHostRewrite
 	//	*RouteAction_AutoHostRewriteHeader
@@ -1439,10 +1448,10 @@ type RouteAction struct {
 	//
 	// .. note::
 	//
-	//   This timeout includes all retries. See also
-	//   :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
-	//   :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
-	//   :ref:`retry overview <arch_overview_http_routing_retry>`.
+	//	This timeout includes all retries. See also
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
+	//	:ref:`retry overview <arch_overview_http_routing_retry>`.
 	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout,
 	// although the connection manager wide :ref:`stream_idle_timeout
@@ -1476,10 +1485,11 @@ type RouteAction struct {
 	// Indicates that the route has a request mirroring policy.
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `request_mirror_policies` which supports one or
-	//   more mirroring policies.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `request_mirror_policies` which supports one or
+	//	more mirroring policies.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	RequestMirrorPolicy *RouteAction_RequestMirrorPolicy `protobuf:"bytes,10,opt,name=request_mirror_policy,json=requestMirrorPolicy,proto3" json:"request_mirror_policy,omitempty"`
 	// Indicates that the route has request mirroring policies.
 	RequestMirrorPolicies []*RouteAction_RequestMirrorPolicy `protobuf:"bytes,30,rep,name=request_mirror_policies,json=requestMirrorPolicies,proto3" json:"request_mirror_policies,omitempty"`
@@ -1521,12 +1531,12 @@ type RouteAction struct {
 	//
 	// .. note::
 	//
-	//    If a timeout is specified using :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, it takes
-	//    precedence over `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_, when
-	//    both are present. See also
-	//    :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
-	//    :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
-	//    :ref:`retry overview <arch_overview_http_routing_retry>`.
+	//	If a timeout is specified using :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, it takes
+	//	precedence over `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_, when
+	//	both are present. See also
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
+	//	:ref:`retry overview <arch_overview_http_routing_retry>`.
 	MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"`
 	// If present, Envoy will adjust the timeout provided by the `grpc-timeout` header by subtracting
 	// the provided duration from the header. This is useful in allowing Envoy to set its global
@@ -1703,7 +1713,7 @@ func (x *RouteAction) GetRetryPolicyTypedConfig() *any1.Any {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *RouteAction) GetRequestMirrorPolicy() *RouteAction_RequestMirrorPolicy {
 	if x != nil {
 		return x.RequestMirrorPolicy
@@ -1813,12 +1823,12 @@ type RouteAction_ClusterHeader struct {
 	//
 	// .. attention::
 	//
-	//   Internally, Envoy always uses the HTTP/2 *:authority* header to represent the HTTP/1
-	//   *Host* header. Thus, if attempting to match on *Host*, match on *:authority* instead.
+	//	Internally, Envoy always uses the HTTP/2 *:authority* header to represent the HTTP/1
+	//	*Host* header. Thus, if attempting to match on *Host*, match on *:authority* instead.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	ClusterHeader string `protobuf:"bytes,2,opt,name=cluster_header,json=clusterHeader,proto3,oneof"`
 }
 
@@ -1851,7 +1861,7 @@ type RouteAction_AutoHostRewrite struct {
 	// Indicates that during forwarding, the host header will be swapped with
 	// the hostname of the upstream host chosen by the cluster manager. This
 	// option is applicable only when the destination cluster for a route is of
-	// type ``STRICT_DNS``,  ``LOGICAL_DNS`` or ``STATIC``. For ``STATIC`` clusters, the
+	// type “STRICT_DNS“,  “LOGICAL_DNS“ or “STATIC“. For “STATIC“ clusters, the
 	// hostname attribute of the endpoint must be configured. Setting this to true
 	// with other cluster types has no effect.
 	AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"`
@@ -1864,12 +1874,12 @@ type RouteAction_AutoHostRewriteHeader struct {
 	//
 	// .. attention::
 	//
-	//   Pay attention to the potential security implications of using this option. Provided header
-	//   must come from trusted source.
+	//	Pay attention to the potential security implications of using this option. Provided header
+	//	must come from trusted source.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	AutoHostRewriteHeader string `protobuf:"bytes,29,opt,name=auto_host_rewrite_header,json=autoHostRewriteHeader,proto3,oneof"`
 }
 
@@ -1900,11 +1910,11 @@ type RetryPolicy struct {
 	//
 	// .. note::
 	//
-	//   If left unspecified, Envoy will use the global
-	//   :ref:`route timeout <envoy_api_field_route.RouteAction.timeout>` for the request.
-	//   Consequently, when using a :ref:`5xx <config_http_filters_router_x-envoy-retry-on>` based
-	//   retry policy, a request that times out will not be retried as the total timeout budget
-	//   would have been exhausted.
+	//	If left unspecified, Envoy will use the global
+	//	:ref:`route timeout <envoy_api_field_route.RouteAction.timeout>` for the request.
+	//	Consequently, when using a :ref:`5xx <config_http_filters_router_x-envoy-retry-on>` based
+	//	retry policy, a request that times out will not be retried as the total timeout budget
+	//	would have been exhausted.
 	PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"`
 	// Specifies an implementation of a RetryPriority which is used to determine the
 	// distribution of load across priorities used for retries. Refer to
@@ -2057,10 +2067,10 @@ type HedgePolicy struct {
 	// This means that a retry will be issued without resetting the original request, leaving multiple upstream requests in flight.
 	// The first request to complete successfully will be the one returned to the caller.
 	//
-	// * At any time, a successful response (i.e. not triggering any of the retry-on conditions) would be returned to the client.
-	// * Before per-try timeout, an error response (per retry-on conditions) would be retried immediately or returned ot the client
-	//   if there are no more retries left.
-	// * After per-try timeout, an error response would be discarded, as a retry in the form of a hedged request is already in progress.
+	//   - At any time, a successful response (i.e. not triggering any of the retry-on conditions) would be returned to the client.
+	//   - Before per-try timeout, an error response (per retry-on conditions) would be retried immediately or returned ot the client
+	//     if there are no more retries left.
+	//   - After per-try timeout, an error response would be discarded, as a retry in the form of a hedged request is already in progress.
 	//
 	// Note: For this to have effect, you must have a :ref:`RetryPolicy <envoy_api_msg_route.RetryPolicy>` that retries at least
 	// one error code and specifies a maximum number of retries.
@@ -2135,6 +2145,7 @@ type RedirectAction struct {
 	//     set to `:443`, the port will be removed after the redirection
 	//
 	// Types that are assignable to SchemeRewriteSpecifier:
+	//
 	//	*RedirectAction_HttpsRedirect
 	//	*RedirectAction_SchemeRedirect
 	SchemeRewriteSpecifier isRedirectAction_SchemeRewriteSpecifier `protobuf_oneof:"scheme_rewrite_specifier"`
@@ -2143,6 +2154,7 @@ type RedirectAction struct {
 	// The port value of the URL will be swapped with this value.
 	PortRedirect uint32 `protobuf:"varint,8,opt,name=port_redirect,json=portRedirect,proto3" json:"port_redirect,omitempty"`
 	// Types that are assignable to PathRewriteSpecifier:
+	//
 	//	*RedirectAction_PathRedirect
 	//	*RedirectAction_PrefixRewrite
 	PathRewriteSpecifier isRedirectAction_PathRewriteSpecifier `protobuf_oneof:"path_rewrite_specifier"`
@@ -2285,12 +2297,12 @@ type RedirectAction_PathRedirect struct {
 	//
 	// For example, let's say we have the following routes:
 	//
-	// - match: { path: "/old-path-1" }
-	//   redirect: { path_redirect: "/new-path-1" }
-	// - match: { path: "/old-path-2" }
-	//   redirect: { path_redirect: "/new-path-2", strip-query: "true" }
-	// - match: { path: "/old-path-3" }
-	//   redirect: { path_redirect: "/new-path-3?foo=1", strip_query: "true" }
+	//   - match: { path: "/old-path-1" }
+	//     redirect: { path_redirect: "/new-path-1" }
+	//   - match: { path: "/old-path-2" }
+	//     redirect: { path_redirect: "/new-path-2", strip-query: "true" }
+	//   - match: { path: "/old-path-3" }
+	//     redirect: { path_redirect: "/new-path-3?foo=1", strip_query: "true" }
 	//
 	// 1. if request uri is "/old-path-1?bar=1", users will be redirected to "/new-path-1?bar=1"
 	// 2. if request uri is "/old-path-2?bar=1", users will be redirected to "/new-path-2"
@@ -2305,8 +2317,8 @@ type RedirectAction_PrefixRewrite struct {
 	//
 	// .. attention::
 	//
-	//   Pay attention to the use of trailing slashes as mentioned in
-	//   :ref:`RouteAction's prefix_rewrite <envoy_api_field_route.RouteAction.prefix_rewrite>`.
+	//	Pay attention to the use of trailing slashes as mentioned in
+	//	:ref:`RouteAction's prefix_rewrite <envoy_api_field_route.RouteAction.prefix_rewrite>`.
 	PrefixRewrite string `protobuf:"bytes,5,opt,name=prefix_rewrite,json=prefixRewrite,proto3,oneof"`
 }
 
@@ -2326,9 +2338,9 @@ type DirectResponseAction struct {
 	//
 	// .. note::
 	//
-	//   Headers can be specified using *response_headers_to_add* in the enclosing
-	//   :ref:`envoy_api_msg_route.Route`, :ref:`envoy_api_msg_RouteConfiguration` or
-	//   :ref:`envoy_api_msg_route.VirtualHost`.
+	//	Headers can be specified using *response_headers_to_add* in the enclosing
+	//	:ref:`envoy_api_msg_route.Route`, :ref:`envoy_api_msg_RouteConfiguration` or
+	//	:ref:`envoy_api_msg_route.VirtualHost`.
 	Body *core.DataSource `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
 }
 
@@ -2388,9 +2400,9 @@ type Decorator struct {
 	//
 	// .. note::
 	//
-	//   For ingress (inbound) requests, or egress (outbound) responses, this value may be overridden
-	//   by the :ref:`x-envoy-decorator-operation
-	//   <config_http_filters_router_x-envoy-decorator-operation>` header.
+	//	For ingress (inbound) requests, or egress (outbound) responses, this value may be overridden
+	//	by the :ref:`x-envoy-decorator-operation
+	//	<config_http_filters_router_x-envoy-decorator-operation>` header.
 	Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"`
 	// Whether the decorated details should be propagated to the other party. The default is true.
 	Propagate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"`
@@ -2552,9 +2564,9 @@ func (x *Tracing) GetCustomTags() []*v2.CustomTag {
 //
 // .. note::
 //
-//    Virtual clusters are a useful tool, but we do not recommend setting up a virtual cluster for
-//    every application endpoint. This is both not easily maintainable and as well the matching and
-//    statistics output are not free.
+//	Virtual clusters are a useful tool, but we do not recommend setting up a virtual cluster for
+//	every application endpoint. This is both not easily maintainable and as well the matching and
+//	statistics output are not free.
 type VirtualCluster struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2566,15 +2578,16 @@ type VirtualCluster struct {
 	//
 	// Examples:
 	//
-	// * The regex ``/rides/\d+`` matches the path */rides/0*
-	// * The regex ``/rides/\d+`` matches the path */rides/123*
-	// * The regex ``/rides/\d+`` does not match the path */rides/123/456*
+	// * The regex “/rides/\d+“ matches the path */rides/0*
+	// * The regex “/rides/\d+“ matches the path */rides/123*
+	// * The regex “/rides/\d+“ does not match the path */rides/123/456*
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `headers` as it is not safe for use with
-	//   untrusted input in all cases.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `headers` as it is not safe for use with
+	//	untrusted input in all cases.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Pattern string `protobuf:"bytes,1,opt,name=pattern,proto3" json:"pattern,omitempty"`
 	// Specifies a list of header matchers to use for matching requests. Each specified header must
 	// match. The pseudo-headers `:path` and `:method` can be used to match the request path and
@@ -2588,9 +2601,10 @@ type VirtualCluster struct {
 	// etc.
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `headers`.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `headers`.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Method core.RequestMethod `protobuf:"varint,3,opt,name=method,proto3,enum=envoy.api.v2.core.RequestMethod" json:"method,omitempty"`
 }
 
@@ -2626,7 +2640,7 @@ func (*VirtualCluster) Descriptor() ([]byte, []int) {
 	return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{13}
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *VirtualCluster) GetPattern() string {
 	if x != nil {
 		return x.Pattern
@@ -2648,7 +2662,7 @@ func (x *VirtualCluster) GetName() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *VirtualCluster) GetMethod() core.RequestMethod {
 	if x != nil {
 		return x.Method
@@ -2668,7 +2682,7 @@ type RateLimit struct {
 	//
 	// .. note::
 	//
-	//   The filter supports a range of 0 - 10 inclusively for stage numbers.
+	//	The filter supports a range of 0 - 10 inclusively for stage numbers.
 	Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"`
 	// The key to be set in runtime to disable this rate limit configuration.
 	DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"`
@@ -2736,28 +2750,30 @@ func (x *RateLimit) GetActions() []*RateLimit_Action {
 
 // .. attention::
 //
-//   Internally, Envoy always uses the HTTP/2 *:authority* header to represent the HTTP/1 *Host*
-//   header. Thus, if attempting to match on *Host*, match on *:authority* instead.
+//	Internally, Envoy always uses the HTTP/2 *:authority* header to represent the HTTP/1 *Host*
+//	header. Thus, if attempting to match on *Host*, match on *:authority* instead.
 //
 // .. attention::
 //
-//   To route on HTTP method, use the special HTTP/2 *:method* header. This works for both
-//   HTTP/1 and HTTP/2 as Envoy normalizes headers. E.g.,
+//	To route on HTTP method, use the special HTTP/2 *:method* header. This works for both
+//	HTTP/1 and HTTP/2 as Envoy normalizes headers. E.g.,
 //
-//   .. code-block:: json
+//	.. code-block:: json
 //
-//     {
-//       "name": ":method",
-//       "exact_match": "POST"
-//     }
+//	  {
+//	    "name": ":method",
+//	    "exact_match": "POST"
+//	  }
 //
 // .. attention::
-//   In the absence of any header match specifier, match will default to :ref:`present_match
-//   <envoy_api_field_route.HeaderMatcher.present_match>`. i.e, a request that has the :ref:`name
-//   <envoy_api_field_route.HeaderMatcher.name>` header will match, regardless of the header's
-//   value.
 //
-//  [#next-major-version: HeaderMatcher should be refactored to use StringMatcher.]
+//	 In the absence of any header match specifier, match will default to :ref:`present_match
+//	 <envoy_api_field_route.HeaderMatcher.present_match>`. i.e, a request that has the :ref:`name
+//	 <envoy_api_field_route.HeaderMatcher.name>` header will match, regardless of the header's
+//	 value.
+//
+//	[#next-major-version: HeaderMatcher should be refactored to use StringMatcher.]
+//
 // [#next-free-field: 12]
 type HeaderMatcher struct {
 	state         protoimpl.MessageState
@@ -2769,6 +2785,7 @@ type HeaderMatcher struct {
 	// Specifies how the header match will be performed to route the request.
 	//
 	// Types that are assignable to HeaderMatchSpecifier:
+	//
 	//	*HeaderMatcher_ExactMatch
 	//	*HeaderMatcher_RegexMatch
 	//	*HeaderMatcher_SafeRegexMatch
@@ -2781,7 +2798,7 @@ type HeaderMatcher struct {
 	//
 	// Examples:
 	//
-	// * The regex ``\d{3}`` does not match the value *1234*, so it will match when inverted.
+	// * The regex “\d{3}“ does not match the value *1234*, so it will match when inverted.
 	// * The range [-10,0) will match the value -1, so it will not match when inverted.
 	InvertMatch bool `protobuf:"varint,8,opt,name=invert_match,json=invertMatch,proto3" json:"invert_match,omitempty"`
 }
@@ -2839,7 +2856,7 @@ func (x *HeaderMatcher) GetExactMatch() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *HeaderMatcher) GetRegexMatch() string {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_RegexMatch); ok {
 		return x.RegexMatch
@@ -2906,15 +2923,16 @@ type HeaderMatcher_RegexMatch struct {
 	//
 	// Examples:
 	//
-	// * The regex ``\d{3}`` matches the value *123*
-	// * The regex ``\d{3}`` does not match the value *1234*
-	// * The regex ``\d{3}`` does not match the value *123.456*
+	// * The regex “\d{3}“ matches the value *123*
+	// * The regex “\d{3}“ does not match the value *1234*
+	// * The regex “\d{3}“ does not match the value *123.456*
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `safe_regex_match` as it is not safe for use
-	//   with untrusted input in all cases.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `safe_regex_match` as it is not safe for use
+	//	with untrusted input in all cases.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	RegexMatch string `protobuf:"bytes,5,opt,name=regex_match,json=regexMatch,proto3,oneof"`
 }
 
@@ -2935,8 +2953,8 @@ type HeaderMatcher_RangeMatch struct {
 	//
 	// Examples:
 	//
-	// * For range [-10,0), route will match for header value -1, but not for 0, "somestring", 10.9,
-	//   "-1somestring"
+	//   - For range [-10,0), route will match for header value -1, but not for 0, "somestring", 10.9,
+	//     "-1somestring"
 	RangeMatch *_type.Int64Range `protobuf:"bytes,6,opt,name=range_match,json=rangeMatch,proto3,oneof"`
 }
 
@@ -2996,21 +3014,24 @@ type QueryParameterMatcher struct {
 	// key appears with a value (e.g., "?debug=true") or not (e.g., "?debug")
 	//
 	// ..attention::
-	//   This field is deprecated. Use an `exact` match inside the `string_match` field.
 	//
-	// Deprecated: Do not use.
+	//	This field is deprecated. Use an `exact` match inside the `string_match` field.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
 	// Specifies whether the query parameter value is a regular expression.
 	// Defaults to false. The entire query parameter value (i.e., the part to
 	// the right of the equals sign in "key=value") must match the regex.
-	// E.g., the regex ``\d+$`` will match *123* but not *a123* or *123a*.
+	// E.g., the regex “\d+$“ will match *123* but not *a123* or *123a*.
 	//
 	// ..attention::
-	//   This field is deprecated. Use a `safe_regex` match inside the `string_match` field.
 	//
-	// Deprecated: Do not use.
+	//	This field is deprecated. Use a `safe_regex` match inside the `string_match` field.
+	//
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Regex *wrappers.BoolValue `protobuf:"bytes,4,opt,name=regex,proto3" json:"regex,omitempty"`
 	// Types that are assignable to QueryParameterMatchSpecifier:
+	//
 	//	*QueryParameterMatcher_StringMatch
 	//	*QueryParameterMatcher_PresentMatch
 	QueryParameterMatchSpecifier isQueryParameterMatcher_QueryParameterMatchSpecifier `protobuf_oneof:"query_parameter_match_specifier"`
@@ -3055,7 +3076,7 @@ func (x *QueryParameterMatcher) GetName() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *QueryParameterMatcher) GetValue() string {
 	if x != nil {
 		return x.Value
@@ -3063,7 +3084,7 @@ func (x *QueryParameterMatcher) GetValue() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *QueryParameterMatcher) GetRegex() *wrappers.BoolValue {
 	if x != nil {
 		return x.Regex
@@ -3158,7 +3179,7 @@ type WeightedCluster_ClusterWeight struct {
 	// specific; see the :ref:`HTTP filter documentation <config_http_filters>`
 	// for if and how it is utilized.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The per_filter_config field can be used to provide weighted cluster-specific
 	// configurations for filters. The key should match the filter name, such as
@@ -3249,7 +3270,7 @@ func (x *WeightedCluster_ClusterWeight) GetResponseHeadersToRemove() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *WeightedCluster_ClusterWeight) GetPerFilterConfig() map[string]*_struct.Struct {
 	if x != nil {
 		return x.PerFilterConfig
@@ -3371,7 +3392,7 @@ func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue {
 //
 // .. note::
 //
-//   Shadowing will not be triggered if the primary cluster does not exist.
+//	Shadowing will not be triggered if the primary cluster does not exist.
 type RouteAction_RequestMirrorPolicy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3389,14 +3410,14 @@ type RouteAction_RequestMirrorPolicy struct {
 	//
 	// .. attention::
 	//
-	//   **This field is deprecated**. Set the
-	//   :ref:`runtime_fraction
-	//   <envoy_api_field_route.RouteAction.RequestMirrorPolicy.runtime_fraction>`
-	//   field instead. Mirroring occurs if both this and
-	//   <envoy_api_field_route.RouteAction.RequestMirrorPolicy.runtime_fraction>`
-	//   are not set.
+	//	**This field is deprecated**. Set the
+	//	:ref:`runtime_fraction
+	//	<envoy_api_field_route.RouteAction.RequestMirrorPolicy.runtime_fraction>`
+	//	field instead. Mirroring occurs if both this and
+	//	<envoy_api_field_route.RouteAction.RequestMirrorPolicy.runtime_fraction>`
+	//	are not set.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	RuntimeKey string `protobuf:"bytes,2,opt,name=runtime_key,json=runtimeKey,proto3" json:"runtime_key,omitempty"`
 	// If not specified, all requests to the target cluster will be mirrored.
 	//
@@ -3450,7 +3471,7 @@ func (x *RouteAction_RequestMirrorPolicy) GetCluster() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *RouteAction_RequestMirrorPolicy) GetRuntimeKey() string {
 	if x != nil {
 		return x.RuntimeKey
@@ -3481,6 +3502,7 @@ type RouteAction_HashPolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PolicySpecifier:
+	//
 	//	*RouteAction_HashPolicy_Header_
 	//	*RouteAction_HashPolicy_Cookie_
 	//	*RouteAction_HashPolicy_ConnectionProperties_
@@ -3496,13 +3518,13 @@ type RouteAction_HashPolicy struct {
 	// list of hash polices.
 	// For example, if the following hash methods are configured:
 	//
-	//  ========= ========
-	//  specifier terminal
-	//  ========= ========
-	//  Header A  true
-	//  Header B  false
-	//  Header C  false
-	//  ========= ========
+	//	========= ========
+	//	specifier terminal
+	//	========= ========
+	//	Header A  true
+	//	Header B  false
+	//	Header C  false
+	//	========= ========
 	//
 	// The generateHash process ends if policy "header A" generates a hash, as
 	// it's a terminal policy.
@@ -3745,18 +3767,18 @@ func (x *RouteAction_HashPolicy_Header) GetHeaderName() string {
 
 // Envoy supports two types of cookie affinity:
 //
-// 1. Passive. Envoy takes a cookie that's present in the cookies header and
-//    hashes on its value.
+//  1. Passive. Envoy takes a cookie that's present in the cookies header and
+//     hashes on its value.
 //
-// 2. Generated. Envoy generates and sets a cookie with an expiration (TTL)
-//    on the first request from the client in its response to the client,
-//    based on the endpoint the request gets sent to. The client then
-//    presents this on the next and all subsequent requests. The hash of
-//    this is sufficient to ensure these requests get sent to the same
-//    endpoint. The cookie is generated by hashing the source and
-//    destination ports and addresses so that multiple independent HTTP2
-//    streams on the same connection will independently receive the same
-//    cookie, even if they arrive at the Envoy simultaneously.
+//  2. Generated. Envoy generates and sets a cookie with an expiration (TTL)
+//     on the first request from the client in its response to the client,
+//     based on the endpoint the request gets sent to. The client then
+//     presents this on the next and all subsequent requests. The hash of
+//     this is sufficient to ensure these requests get sent to the same
+//     endpoint. The cookie is generated by hashing the source and
+//     destination ports and addresses so that multiple independent HTTP2
+//     streams on the same connection will independently receive the same
+//     cookie, even if they arrive at the Envoy simultaneously.
 type RouteAction_HashPolicy_Cookie struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3983,6 +4005,7 @@ type RetryPolicy_RetryPriority struct {
 
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*RetryPolicy_RetryPriority_Config
 	//	*RetryPolicy_RetryPriority_TypedConfig
 	ConfigType isRetryPolicy_RetryPriority_ConfigType `protobuf_oneof:"config_type"`
@@ -4034,7 +4057,7 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *RetryPolicy_RetryPriority) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_Config); ok {
 		return x.Config
@@ -4054,7 +4077,7 @@ type isRetryPolicy_RetryPriority_ConfigType interface {
 }
 
 type RetryPolicy_RetryPriority_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -4073,6 +4096,7 @@ type RetryPolicy_RetryHostPredicate struct {
 
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*RetryPolicy_RetryHostPredicate_Config
 	//	*RetryPolicy_RetryHostPredicate_TypedConfig
 	ConfigType isRetryPolicy_RetryHostPredicate_ConfigType `protobuf_oneof:"config_type"`
@@ -4124,7 +4148,7 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 func (x *RetryPolicy_RetryHostPredicate) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_Config); ok {
 		return x.Config
@@ -4144,7 +4168,7 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface {
 }
 
 type RetryPolicy_RetryHostPredicate_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -4226,6 +4250,7 @@ type RateLimit_Action struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ActionSpecifier:
+	//
 	//	*RateLimit_Action_SourceCluster_
 	//	*RateLimit_Action_DestinationCluster_
 	//	*RateLimit_Action_RequestHeaders_
@@ -4366,7 +4391,7 @@ func (*RateLimit_Action_HeaderValueMatch_) isRateLimit_Action_ActionSpecifier()
 //
 // .. code-block:: cpp
 //
-//   ("source_cluster", "<local service cluster>")
+//	("source_cluster", "<local service cluster>")
 //
 // <local service cluster> is derived from the :option:`--service-cluster` option.
 type RateLimit_Action_SourceCluster struct {
@@ -4411,18 +4436,18 @@ func (*RateLimit_Action_SourceCluster) Descriptor() ([]byte, []int) {
 //
 // .. code-block:: cpp
 //
-//   ("destination_cluster", "<routed target cluster>")
+//	("destination_cluster", "<routed target cluster>")
 //
 // Once a request matches against a route table rule, a routed cluster is determined by one of
 // the following :ref:`route table configuration <envoy_api_msg_RouteConfiguration>`
 // settings:
 //
-// * :ref:`cluster <envoy_api_field_route.RouteAction.cluster>` indicates the upstream cluster
-//   to route to.
-// * :ref:`weighted_clusters <envoy_api_field_route.RouteAction.weighted_clusters>`
-//   chooses a cluster randomly from a set of clusters with attributed weight.
-// * :ref:`cluster_header <envoy_api_field_route.RouteAction.cluster_header>` indicates which
-//   header in the request contains the target cluster.
+//   - :ref:`cluster <envoy_api_field_route.RouteAction.cluster>` indicates the upstream cluster
+//     to route to.
+//   - :ref:`weighted_clusters <envoy_api_field_route.RouteAction.weighted_clusters>`
+//     chooses a cluster randomly from a set of clusters with attributed weight.
+//   - :ref:`cluster_header <envoy_api_field_route.RouteAction.cluster_header>` indicates which
+//     header in the request contains the target cluster.
 type RateLimit_Action_DestinationCluster struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4466,7 +4491,7 @@ func (*RateLimit_Action_DestinationCluster) Descriptor() ([]byte, []int) {
 //
 // .. code-block:: cpp
 //
-//   ("<descriptor_key>", "<header_value_queried_from_header>")
+//	("<descriptor_key>", "<header_value_queried_from_header>")
 type RateLimit_Action_RequestHeaders struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4531,7 +4556,7 @@ func (x *RateLimit_Action_RequestHeaders) GetDescriptorKey() string {
 //
 // .. code-block:: cpp
 //
-//   ("remote_address", "<trusted address from x-forwarded-for>")
+//	("remote_address", "<trusted address from x-forwarded-for>")
 type RateLimit_Action_RemoteAddress struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4574,7 +4599,7 @@ func (*RateLimit_Action_RemoteAddress) Descriptor() ([]byte, []int) {
 //
 // .. code-block:: cpp
 //
-//   ("generic_key", "<descriptor_value>")
+//	("generic_key", "<descriptor_value>")
 type RateLimit_Action_GenericKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4627,7 +4652,7 @@ func (x *RateLimit_Action_GenericKey) GetDescriptorValue() string {
 //
 // .. code-block:: cpp
 //
-//   ("header_match", "<descriptor_value>")
+//	("header_match", "<descriptor_value>")
 type RateLimit_Action_HeaderValueMatch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4739,7 +4764,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
 	0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x64,
 	0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42,
-	0x0f, 0x92, 0x01, 0x0c, 0x08, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00,
+	0x0f, 0x92, 0x01, 0x0c, 0x08, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02,
 	0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x6f, 0x75,
 	0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52,
@@ -5008,8 +5033,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x70,
 	0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x14, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, 0x05, 0x72,
-	0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0x18, 0x01, 0xfa, 0x42,
-	0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x48, 0x00, 0x52, 0x05,
+	0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x72,
+	0x03, 0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x05,
 	0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x4b, 0x0a, 0x0a, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65,
 	0x67, 0x65, 0x78, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x52,
@@ -5058,11 +5083,11 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x74, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42,
 	0x01, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, 0xaa, 0x05, 0x0a, 0x0a, 0x43, 0x6f, 0x72, 0x73,
 	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x2b, 0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f,
-	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0x18, 0x01,
-	0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x0b, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x72, 0x69,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xb8, 0xee,
+	0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x0b, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x72, 0x69,
 	0x67, 0x69, 0x6e, 0x12, 0x3d, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69,
 	0x67, 0x69, 0x6e, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x42,
-	0x0f, 0x18, 0x01, 0xfa, 0x42, 0x0a, 0x92, 0x01, 0x07, 0x22, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08,
+	0x0f, 0xfa, 0x42, 0x0a, 0x92, 0x01, 0x07, 0x22, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0x18, 0x01,
 	0x52, 0x10, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x67,
 	0x65, 0x78, 0x12, 0x5c, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67,
 	0x69, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
@@ -5086,7 +5111,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x61, 0x6c, 0x73, 0x12, 0x40, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x07,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x08, 0x18, 0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x48, 0x00, 0x52, 0x07, 0x65, 0x6e,
+	0x42, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x07, 0x65, 0x6e,
 	0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x54, 0x0a, 0x0e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f,
 	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
@@ -5104,7 +5129,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x48, 0x00,
 	0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x0e, 0x63, 0x6c, 0x75,
 	0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00,
+	0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01,
 	0x48, 0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x12, 0x52, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6c,
 	0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
@@ -5126,7 +5151,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
 	0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x32, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69,
 	0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0d, 0x70, 0x72,
+	0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0d, 0x70, 0x72,
 	0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x50, 0x0a, 0x0d, 0x72,
 	0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x20, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
@@ -5134,7 +5159,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52,
 	0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x4c, 0x0a,
 	0x0c, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x27, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00,
+	0x01, 0x28, 0x09, 0x42, 0x27, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02,
 	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x16, 0x0a, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77,
 	0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x48, 0x01, 0x52, 0x0b,
 	0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x48, 0x0a, 0x11, 0x61,
@@ -5144,8 +5169,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x75, 0x65, 0x48, 0x01, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65,
 	0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x61, 0x0a, 0x18, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x68, 0x6f,
 	0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09, 0x42, 0x26, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01,
-	0x01, 0xc8, 0x01, 0x00, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x15, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74,
+	0x72, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09, 0x42, 0x26, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x15, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74,
 	0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48,
 	0x01, 0x52, 0x15, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69,
 	0x74, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65,
@@ -5236,8 +5261,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x12, 0x21, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73,
 	0x74, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b,
-	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0x18, 0x01, 0xb8, 0xee, 0xf2, 0xd2,
-	0x05, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x56,
+	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01,
+	0x18, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x56,
 	0x0a, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x63, 0x74, 0x69,
 	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e,
@@ -5281,8 +5306,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74,
 	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x1a, 0x38, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc0,
-	0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d,
 	0x65, 0x1a, 0x66, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e,
 	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
 	0x20, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18,
@@ -5302,8 +5327,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01,
 	0x1a, 0x75, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x12, 0x2e, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01,
-	0x02, 0xc8, 0x01, 0x00, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x02, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70,
 	0x65, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07,
@@ -5426,16 +5451,16 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69,
 	0x72, 0x65, 0x63, 0x74, 0x12, 0x30, 0x0a, 0x0d, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x64,
 	0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08,
-	0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0c, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65,
+	0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0c, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65,
 	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72,
 	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70,
 	0x6f, 0x72, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x32, 0x0a, 0x0d, 0x70,
 	0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x48,
+	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48,
 	0x01, 0x52, 0x0c, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12,
 	0x34, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01,
-	0x02, 0xc8, 0x01, 0x00, 0x48, 0x01, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x65,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x65,
 	0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x66, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74,
@@ -5490,8 +5515,8 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54,
 	0x61, 0x67, 0x73, 0x22, 0xda, 0x01, 0x0a, 0x0e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43,
 	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0x18, 0x01, 0xfa, 0x42, 0x05, 0x72, 0x03,
-	0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x28, 0x80,
+	0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65,
 	0x72, 0x6e, 0x12, 0x3b, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
@@ -5501,7 +5526,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
 	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x42, 0x08,
-	0x18, 0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
 	0x22, 0xd3, 0x09, 0x0a, 0x09, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x3b,
 	0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
@@ -5555,7 +5580,7 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x70, 0x0a, 0x0e, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x0b, 0x68,
 	0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52,
+	0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52,
 	0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0e, 0x64,
 	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x20, 0x01, 0x52, 0x0d, 0x64, 0x65,
@@ -5581,13 +5606,13 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x10, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
 	0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xdf, 0x03, 0x0a, 0x0d, 0x48, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc0,
-	0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x65,
 	0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
 	0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x33,
 	0x0a, 0x0b, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x10, 0x18, 0x01, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0xb8,
-	0xee, 0xf2, 0xd2, 0x05, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61,
+	0x01, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2,
+	0xd2, 0x05, 0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61,
 	0x74, 0x63, 0x68, 0x12, 0x4c, 0x0a, 0x10, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x65,
 	0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
@@ -5614,11 +5639,11 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x65, 0x72, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x20, 0x01, 0x28, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x08, 0x18, 0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x09, 0x42, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c,
 	0x75, 0x65, 0x12, 0x3a, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0x18,
-	0x01, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x50,
+	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xb8,
+	0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x50,
 	0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
 	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
@@ -5628,17 +5653,17 @@ var file_envoy_api_v2_route_route_components_proto_rawDesc = []byte{
 	0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65,
 	0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x21, 0x0a, 0x1f, 0x71, 0x75, 0x65, 0x72, 0x79,
 	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x9a, 0x01, 0x0a, 0x20, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x42,
-	0x14, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x17, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x9a, 0x01, 0xf2, 0x98, 0xfe,
+	0x8f, 0x05, 0x17, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x42, 0x14, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f,
+	0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
+	0x32, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/scoped_route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/scoped_route.pb.go
index 3808fdeeb28..6217617f30f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/scoped_route.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/scoped_route.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/scoped_route.proto
 
 package apiv2
@@ -38,17 +38,17 @@ const (
 //
 // .. code::
 //
-//   ...
-//   scoped_routes:
-//     name: foo-scoped-routes
-//     scope_key_builder:
-//       fragments:
-//         - header_value_extractor:
-//             name: X-Route-Selector
-//             element_separator: ,
-//             element:
-//               separator: =
-//               key: vip
+//	...
+//	scoped_routes:
+//	  name: foo-scoped-routes
+//	  scope_key_builder:
+//	    fragments:
+//	      - header_value_extractor:
+//	          name: X-Route-Selector
+//	          element_separator: ","
+//	          element:
+//	            separator: =
+//	            key: vip
 //
 // ScopedRouteConfiguration resources (specified statically via
 // :ref:`scoped_route_configurations_list<envoy_api_field_config.filter.network.http_connection_manager.v2.ScopedRoutes.scoped_route_configurations_list>`
@@ -56,31 +56,30 @@ const (
 //
 // .. code::
 //
-//  (1)
-//   name: route-scope1
-//   route_configuration_name: route-config1
-//   key:
-//      fragments:
-//        - string_key: 172.10.10.20
+//	(1)
+//	 name: route-scope1
+//	 route_configuration_name: route-config1
+//	 key:
+//	    fragments:
+//	      - string_key: 172.10.10.20
 //
-//  (2)
-//   name: route-scope2
-//   route_configuration_name: route-config2
-//   key:
-//     fragments:
-//       - string_key: 172.20.20.30
+//	(2)
+//	 name: route-scope2
+//	 route_configuration_name: route-config2
+//	 key:
+//	   fragments:
+//	     - string_key: 172.20.20.30
 //
 // A request from a client such as:
 //
 // .. code::
 //
-//     GET / HTTP/1.1
-//     Host: foo.com
-//     X-Route-Selector: vip=172.10.10.20
+//	GET / HTTP/1.1
+//	Host: foo.com
+//	X-Route-Selector: vip=172.10.10.20
 //
 // would result in the routing table defined by the `route-config1`
 // RouteConfiguration being assigned to the HTTP request/stream.
-//
 type ScopedRouteConfiguration struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -210,6 +209,7 @@ type ScopedRouteConfiguration_Key_Fragment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Type:
+	//
 	//	*ScopedRouteConfiguration_Key_Fragment_StringKey
 	Type isScopedRouteConfiguration_Key_Fragment_Type `protobuf_oneof:"type"`
 }
@@ -305,16 +305,16 @@ var file_envoy_api_v2_scoped_route_proto_rawDesc = []byte{
 	0x73, 0x1a, 0x38, 0x0a, 0x08, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a,
 	0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x48, 0x00, 0x52, 0x09, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x42, 0x0b,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x90, 0x01, 0x0a, 0x1a,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x10, 0x53, 0x63, 0x6f, 0x70,
-	0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x17, 0x12,
-	0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06,
+	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x90, 0x01, 0xf2, 0x98,
+	0xfe, 0x8f, 0x05, 0x17, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42,
+	0x10, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go
index 6322e117157..243fc1aad99 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/api/v2/srds.proto
 
 package apiv2
@@ -85,7 +85,7 @@ var file_envoy_api_v2_srds_proto_rawDesc = []byte{
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f,
 	0x76, 0x32, 0x2f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0b, 0x0a, 0x09, 0x53, 0x72, 0x64, 0x73, 0x44, 0x75, 0x6d,
-	0x6d, 0x79, 0x32, 0x95, 0x03, 0x0a, 0x1c, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
+	0x6d, 0x79, 0x32, 0x8e, 0x03, 0x0a, 0x1c, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
 	0x74, 0x65, 0x73, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x12, 0x5b, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x63, 0x6f,
 	0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
@@ -99,28 +99,27 @@ var file_envoy_api_v2_srds_proto_rawDesc = []byte{
 	0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44,
 	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x82, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68,
-	0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x1b, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x3a, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x2d, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x2d, 0x8a, 0xa4, 0x96,
-	0xf3, 0x07, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x8a, 0x01, 0x0a, 0x1a, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x09, 0x53, 0x72, 0x64, 0x73, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76,
-	0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x7c, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x53,
+	0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x69, 0x73,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x2d, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x73, 0x1a, 0x2d, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x27, 0x0a, 0x25, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65,
+	0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x8a, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74,
+	0x65, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x1a, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x09, 0x53, 0x72, 0x64, 0x73, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32,
+	0x50, 0x05, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.go
index 6d0f52456b8..062c8c9dce4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/accesslog/v3/accesslog.proto
 
 package accesslogv3
@@ -185,6 +185,7 @@ type AccessLog struct {
 	// [#extension-category: envoy.access_loggers]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*AccessLog_TypedConfig
 	ConfigType isAccessLog_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -266,6 +267,7 @@ type AccessLogFilter struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to FilterSpecifier:
+	//
 	//	*AccessLogFilter_StatusCodeFilter
 	//	*AccessLogFilter_DurationFilter
 	//	*AccessLogFilter_NotHealthCheckFilter
@@ -754,7 +756,7 @@ type RuntimeFilter struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Runtime key to get an optional overridden numerator for use in the
-	// ``percent_sampled`` field. If found in runtime, this value will replace the
+	// “percent_sampled“ field. If found in runtime, this value will replace the
 	// default numerator.
 	RuntimeKey string `protobuf:"bytes,1,opt,name=runtime_key,json=runtimeKey,proto3" json:"runtime_key,omitempty"`
 	// The default sampling percentage. If not specified, defaults to 0% with
@@ -766,9 +768,9 @@ type RuntimeFilter struct {
 	// is present, the filter will consistently sample across multiple hosts based
 	// on the runtime key value and the value extracted from
 	// :ref:`x-request-id<config_http_conn_man_headers_x-request-id>`. If it is
-	// missing, or ``use_independent_randomness`` is set to true, the filter will
+	// missing, or “use_independent_randomness“ is set to true, the filter will
 	// randomly sample based on the runtime key value alone.
-	// ``use_independent_randomness`` can be used for logging kill switches within
+	// “use_independent_randomness“ can be used for logging kill switches within
 	// complex nested :ref:`AndFilter
 	// <envoy_v3_api_msg_config.accesslog.v3.AndFilter>` and :ref:`OrFilter
 	// <envoy_v3_api_msg_config.accesslog.v3.OrFilter>` blocks that are easier to
@@ -1233,6 +1235,7 @@ type ExtensionFilter struct {
 	// Custom configuration that depends on the filter being instantiated.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*ExtensionFilter_TypedConfig
 	ConfigType isExtensionFilter_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -1509,96 +1512,97 @@ var file_envoy_config_accesslog_v3_accesslog_proto_rawDesc = []byte{
 	0x3a, 0x34, 0x9a, 0xc5, 0x88, 0x1e, 0x2f, 0x0a, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63,
 	0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xea, 0x01, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x97, 0x01,
-	0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x80, 0x01,
-	0xfa, 0x42, 0x7d, 0x92, 0x01, 0x7a, 0x22, 0x78, 0x72, 0x76, 0x52, 0x02, 0x4c, 0x48, 0x52, 0x02,
-	0x55, 0x48, 0x52, 0x02, 0x55, 0x54, 0x52, 0x02, 0x4c, 0x52, 0x52, 0x02, 0x55, 0x52, 0x52, 0x02,
-	0x55, 0x46, 0x52, 0x02, 0x55, 0x43, 0x52, 0x02, 0x55, 0x4f, 0x52, 0x02, 0x4e, 0x52, 0x52, 0x02,
-	0x44, 0x49, 0x52, 0x02, 0x46, 0x49, 0x52, 0x02, 0x52, 0x4c, 0x52, 0x04, 0x55, 0x41, 0x45, 0x58,
-	0x52, 0x04, 0x52, 0x4c, 0x53, 0x45, 0x52, 0x02, 0x44, 0x43, 0x52, 0x03, 0x55, 0x52, 0x58, 0x52,
-	0x02, 0x53, 0x49, 0x52, 0x02, 0x49, 0x48, 0x52, 0x03, 0x44, 0x50, 0x45, 0x52, 0x05, 0x55, 0x4d,
-	0x53, 0x44, 0x52, 0x52, 0x04, 0x52, 0x46, 0x43, 0x46, 0x52, 0x04, 0x4e, 0x46, 0x43, 0x46, 0x52,
-	0x02, 0x44, 0x54, 0x52, 0x03, 0x55, 0x50, 0x45, 0x52, 0x02, 0x4e, 0x43, 0x52, 0x02, 0x4f, 0x4d,
-	0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xf5, 0x01, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0xa2, 0x01,
+	0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x8b, 0x01,
+	0xfa, 0x42, 0x87, 0x01, 0x92, 0x01, 0x83, 0x01, 0x22, 0x80, 0x01, 0x72, 0x7e, 0x52, 0x02, 0x4c,
+	0x48, 0x52, 0x02, 0x55, 0x48, 0x52, 0x02, 0x55, 0x54, 0x52, 0x02, 0x4c, 0x52, 0x52, 0x02, 0x55,
+	0x52, 0x52, 0x02, 0x55, 0x46, 0x52, 0x02, 0x55, 0x43, 0x52, 0x02, 0x55, 0x4f, 0x52, 0x02, 0x4e,
+	0x52, 0x52, 0x02, 0x44, 0x49, 0x52, 0x02, 0x46, 0x49, 0x52, 0x02, 0x52, 0x4c, 0x52, 0x04, 0x55,
+	0x41, 0x45, 0x58, 0x52, 0x04, 0x52, 0x4c, 0x53, 0x45, 0x52, 0x02, 0x44, 0x43, 0x52, 0x03, 0x55,
+	0x52, 0x58, 0x52, 0x02, 0x53, 0x49, 0x52, 0x02, 0x49, 0x48, 0x52, 0x03, 0x44, 0x50, 0x45, 0x52,
+	0x05, 0x55, 0x4d, 0x53, 0x44, 0x52, 0x52, 0x04, 0x52, 0x46, 0x43, 0x46, 0x52, 0x04, 0x4e, 0x46,
+	0x43, 0x46, 0x52, 0x02, 0x44, 0x54, 0x52, 0x03, 0x55, 0x50, 0x45, 0x52, 0x02, 0x4e, 0x43, 0x52,
+	0x02, 0x4f, 0x4d, 0x52, 0x02, 0x44, 0x46, 0x52, 0x02, 0x44, 0x4f, 0x52, 0x05, 0x66, 0x6c, 0x61,
+	0x67, 0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x80,
+	0x04, 0x0a, 0x10, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x12, 0x5d, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
+	0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x92, 0x01,
+	0x07, 0x22, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0xb8, 0x02, 0x0a,
+	0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4b, 0x10, 0x00, 0x12,
+	0x0c, 0x0a, 0x08, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a,
+	0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x4e,
+	0x56, 0x41, 0x4c, 0x49, 0x44, 0x5f, 0x41, 0x52, 0x47, 0x55, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x03,
+	0x12, 0x15, 0x0a, 0x11, 0x44, 0x45, 0x41, 0x44, 0x4c, 0x49, 0x4e, 0x45, 0x5f, 0x45, 0x58, 0x43,
+	0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46,
+	0x4f, 0x55, 0x4e, 0x44, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x4c, 0x52, 0x45, 0x41, 0x44,
+	0x59, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x06, 0x12, 0x15, 0x0a, 0x11, 0x50, 0x45,
+	0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x4e, 0x49, 0x45, 0x44, 0x10,
+	0x07, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x5f, 0x45, 0x58,
+	0x48, 0x41, 0x55, 0x53, 0x54, 0x45, 0x44, 0x10, 0x08, 0x12, 0x17, 0x0a, 0x13, 0x46, 0x41, 0x49,
+	0x4c, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e,
+	0x10, 0x09, 0x12, 0x0b, 0x0a, 0x07, 0x41, 0x42, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x0a, 0x12,
+	0x10, 0x0a, 0x0c, 0x4f, 0x55, 0x54, 0x5f, 0x4f, 0x46, 0x5f, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x10,
+	0x0b, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x49, 0x4d, 0x50, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54,
+	0x45, 0x44, 0x10, 0x0c, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c,
+	0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c,
+	0x45, 0x10, 0x0e, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4c, 0x4f, 0x53, 0x53,
+	0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x4e, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49,
+	0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x10, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c,
 	0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32,
-	0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x22, 0x80, 0x04, 0x0a, 0x10, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x5d, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0d,
-	0xfa, 0x42, 0x0a, 0x92, 0x01, 0x07, 0x22, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64,
-	0x65, 0x22, 0xb8, 0x02, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02,
-	0x4f, 0x4b, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x45, 0x44,
-	0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x12,
-	0x14, 0x0a, 0x10, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x5f, 0x41, 0x52, 0x47, 0x55, 0x4d,
-	0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x44, 0x45, 0x41, 0x44, 0x4c, 0x49, 0x4e,
-	0x45, 0x5f, 0x45, 0x58, 0x43, 0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09,
-	0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x41,
-	0x4c, 0x52, 0x45, 0x41, 0x44, 0x59, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x06, 0x12,
-	0x15, 0x0a, 0x11, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45,
-	0x4e, 0x49, 0x45, 0x44, 0x10, 0x07, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52,
-	0x43, 0x45, 0x5f, 0x45, 0x58, 0x48, 0x41, 0x55, 0x53, 0x54, 0x45, 0x44, 0x10, 0x08, 0x12, 0x17,
-	0x0a, 0x13, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x44,
-	0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x09, 0x12, 0x0b, 0x0a, 0x07, 0x41, 0x42, 0x4f, 0x52, 0x54,
-	0x45, 0x44, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x55, 0x54, 0x5f, 0x4f, 0x46, 0x5f, 0x52,
-	0x41, 0x4e, 0x47, 0x45, 0x10, 0x0b, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x49, 0x4d, 0x50, 0x4c,
-	0x45, 0x4d, 0x45, 0x4e, 0x54, 0x45, 0x44, 0x10, 0x0c, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x54,
-	0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x41, 0x56, 0x41,
-	0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x0e, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x41, 0x54, 0x41,
-	0x5f, 0x4c, 0x4f, 0x53, 0x53, 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x4e, 0x41, 0x55, 0x54,
-	0x48, 0x45, 0x4e, 0x54, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x10, 0x3a, 0x38, 0x9a, 0xc5,
-	0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xda, 0x01, 0x0a, 0x0e, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x40, 0x0a, 0x07, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x16, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x5f, 0x69, 0x66, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x6f, 0x74, 0x5f,
-	0x66, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
-	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x66,
-	0x4b, 0x65, 0x79, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x36, 0x9a, 0xc5, 0x88,
-	0x1e, 0x31, 0x0a, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f,
-	0x67, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x22, 0x76, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0e, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0d, 0xfa, 0x42, 0x0a,
-	0x92, 0x01, 0x07, 0x22, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x74, 0x79, 0x70, 0x65,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0xb6, 0x01, 0x0a, 0x0f,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48,
-	0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x37,
-	0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x42, 0x91, 0x01, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33,
-	0x42, 0x0e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f,
-	0x67, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x22, 0xda, 0x01, 0x0a, 0x0e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x12, 0x40, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x16, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f,
+	0x69, 0x66, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x66, 0x6f, 0x75, 0x6e, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x66, 0x4b, 0x65, 0x79, 0x4e, 0x6f,
+	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x36, 0x9a, 0xc5, 0x88, 0x1e, 0x31, 0x0a, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x76,
+	0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12,
+	0x4b, 0x0a, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x26,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x61, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c,
+	0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x92, 0x01, 0x07, 0x22, 0x05,
+	0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07,
+	0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65,
+	0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0xb6, 0x01, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39,
+	0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79,
+	0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32,
+	0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e,
+	0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42,
+	0x91, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67,
+	0x2e, 0x76, 0x33, 0x42, 0x0e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f,
+	0x67, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.validate.go
index e8486a5584d..63104a547b6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3/accesslog.pb.validate.go
@@ -2107,7 +2107,7 @@ func (m *ResponseFlagFilter) validate(all bool) error {
 		if _, ok := _ResponseFlagFilter_Flags_InLookup[item]; !ok {
 			err := ResponseFlagFilterValidationError{
 				field:  fmt.Sprintf("Flags[%v]", idx),
-				reason: "value must be in list [LH UH UT LR UR UF UC UO NR DI FI RL UAEX RLSE DC URX SI IH DPE UMSDR RFCF NFCF DT UPE NC OM]",
+				reason: "value must be in list [LH UH UT LR UR UF UC UO NR DI FI RL UAEX RLSE DC URX SI IH DPE UMSDR RFCF NFCF DT UPE NC OM DF DO]",
 			}
 			if !all {
 				return err
@@ -2224,6 +2224,8 @@ var _ResponseFlagFilter_Flags_InLookup = map[string]struct{}{
 	"UPE":   {},
 	"NC":    {},
 	"OM":    {},
+	"DF":    {},
+	"DO":    {},
 }
 
 // Validate checks the field values on GrpcStatusFilter with the rules defined
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.go
index 522d6ea5084..c05715899fe 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/bootstrap/v3/bootstrap.proto
 
 package bootstrapv3
@@ -149,7 +149,7 @@ func (CustomInlineHeader_InlineHeaderType) EnumDescriptor() ([]byte, []int) {
 }
 
 // Bootstrap :ref:`configuration overview <config_overview_bootstrap>`.
-// [#next-free-field: 38]
+// [#next-free-field: 41]
 type Bootstrap struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -181,13 +181,13 @@ type Bootstrap struct {
 	// override). Field names will be prefixed with “udpa.node.” when included in
 	// context parameters.
 	//
-	// For example, if node_context_params is ``["user_agent_name", "metadata"]``,
+	// For example, if node_context_params is “["user_agent_name", "metadata"]“,
 	// the implied context parameters might be::
 	//
-	//   node.user_agent_name: "envoy"
-	//   node.metadata.foo: "{\"bar\": \"baz\"}"
-	//   node.metadata.some: "42"
-	//   node.metadata.thing: "\"thing\""
+	//	node.user_agent_name: "envoy"
+	//	node.metadata.foo: "{\"bar\": \"baz\"}"
+	//	node.metadata.some: "42"
+	//	node.metadata.thing: "\"thing\""
 	//
 	// [#not-implemented-hide:]
 	NodeContextParams []string `protobuf:"bytes,26,rep,name=node_context_params,json=nodeContextParams,proto3" json:"node_context_params,omitempty"`
@@ -205,23 +205,26 @@ type Bootstrap struct {
 	FlagsPath string `protobuf:"bytes,5,opt,name=flags_path,json=flagsPath,proto3" json:"flags_path,omitempty"`
 	// Optional set of stats sinks.
 	StatsSinks []*v31.StatsSink `protobuf:"bytes,6,rep,name=stats_sinks,json=statsSinks,proto3" json:"stats_sinks,omitempty"`
+	// Options to control behaviors of deferred creation compatible stats.
+	DeferredStatOptions *Bootstrap_DeferredStatOptions `protobuf:"bytes,39,opt,name=deferred_stat_options,json=deferredStatOptions,proto3" json:"deferred_stat_options,omitempty"`
 	// Configuration for internal processing of stats.
 	StatsConfig *v31.StatsConfig `protobuf:"bytes,13,opt,name=stats_config,json=statsConfig,proto3" json:"stats_config,omitempty"`
 	// Optional duration between flushes to configured stats sinks. For
 	// performance reasons Envoy latches counters and only flushes counters and
 	// gauges at a periodic interval. If not specified the default is 5000ms (5
-	// seconds). Only one of ``stats_flush_interval`` or ``stats_flush_on_admin``
+	// seconds). Only one of “stats_flush_interval“ or “stats_flush_on_admin“
 	// can be set.
 	// Duration must be at least 1ms and at most 5 min.
 	StatsFlushInterval *duration.Duration `protobuf:"bytes,7,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"`
 	// Types that are assignable to StatsFlush:
+	//
 	//	*Bootstrap_StatsFlushOnAdmin
 	StatsFlush isBootstrap_StatsFlush `protobuf_oneof:"stats_flush"`
 	// Optional watchdog configuration.
 	// This is for a single watchdog configuration for the entire system.
-	// Deprecated in favor of ``watchdogs`` which has finer granularity.
+	// Deprecated in favor of “watchdogs“ which has finer granularity.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 	Watchdog *Watchdog `protobuf:"bytes,8,opt,name=watchdog,proto3" json:"watchdog,omitempty"`
 	// Optional watchdogs configuration.
 	// This is used for specifying different watchdogs for the different subsystems.
@@ -230,10 +233,11 @@ type Bootstrap struct {
 	// Configuration for an external tracing provider.
 	//
 	// .. attention::
-	//  This field has been deprecated in favor of :ref:`HttpConnectionManager.Tracing.provider
-	//  <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.provider>`.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of :ref:`HttpConnectionManager.Tracing.provider
+	//	<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.provider>`.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 	Tracing *v32.Tracing `protobuf:"bytes,9,opt,name=tracing,proto3" json:"tracing,omitempty"`
 	// Configuration for the runtime configuration provider. If not
 	// specified, a “null” provider will be used which will result in all defaults
@@ -269,10 +273,10 @@ type Bootstrap struct {
 	// when :ref:`dns_resolvers <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolvers>` and
 	// :ref:`use_tcp_for_dns_lookups <envoy_v3_api_field_config.cluster.v3.Cluster.use_tcp_for_dns_lookups>` are
 	// specified.
-	// This field is deprecated in favor of ``dns_resolution_config``
+	// This field is deprecated in favor of “dns_resolution_config“
 	// which aggregates all of the DNS resolver configuration in a single message.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 	UseTcpForDnsLookups bool `protobuf:"varint,20,opt,name=use_tcp_for_dns_lookups,json=useTcpForDnsLookups,proto3" json:"use_tcp_for_dns_lookups,omitempty"`
 	// DNS resolution configuration which includes the underlying dns resolver addresses and options.
 	// This may be overridden on a per-cluster basis in cds_config, when
@@ -281,18 +285,18 @@ type Bootstrap struct {
 	// This field is deprecated in favor of
 	// :ref:`typed_dns_resolver_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.typed_dns_resolver_config>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 	DnsResolutionConfig *v3.DnsResolutionConfig `protobuf:"bytes,30,opt,name=dns_resolution_config,json=dnsResolutionConfig,proto3" json:"dns_resolution_config,omitempty"`
 	// DNS resolver type configuration extension. This extension can be used to configure c-ares, apple,
 	// or any other DNS resolver types and the related parameters.
 	// For example, an object of
 	// :ref:`CaresDnsResolverConfig <envoy_v3_api_msg_extensions.network.dns_resolver.cares.v3.CaresDnsResolverConfig>`
-	// can be packed into this ``typed_dns_resolver_config``. This configuration replaces the
+	// can be packed into this “typed_dns_resolver_config“. This configuration replaces the
 	// :ref:`dns_resolution_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.dns_resolution_config>`
 	// configuration.
-	// During the transition period when both ``dns_resolution_config`` and ``typed_dns_resolver_config`` exists,
-	// when ``typed_dns_resolver_config`` is in place, Envoy will use it and ignore ``dns_resolution_config``.
-	// When ``typed_dns_resolver_config`` is missing, the default behavior is in place.
+	// During the transition period when both “dns_resolution_config“ and “typed_dns_resolver_config“ exists,
+	// when “typed_dns_resolver_config“ is in place, Envoy will use it and ignore “dns_resolution_config“.
+	// When “typed_dns_resolver_config“ is missing, the default behavior is in place.
 	// [#extension-category: envoy.network.dns_resolver]
 	TypedDnsResolverConfig *v3.TypedExtensionConfig `protobuf:"bytes,31,opt,name=typed_dns_resolver_config,json=typedDnsResolverConfig,proto3" json:"typed_dns_resolver_config,omitempty"`
 	// Specifies optional bootstrap extensions to be instantiated at startup time.
@@ -305,19 +309,20 @@ type Bootstrap struct {
 	// Configuration sources that will participate in
 	// xdstp:// URL authority resolution. The algorithm is as
 	// follows:
-	// 1. The authority field is taken from the xdstp:// URL, call
-	//    this ``resource_authority``.
-	// 2. ``resource_authority`` is compared against the authorities in any peer
-	//    ``ConfigSource``. The peer ``ConfigSource`` is the configuration source
-	//    message which would have been used unconditionally for resolution
-	//    with opaque resource names. If there is a match with an authority, the
-	//    peer ``ConfigSource`` message is used.
-	// 3. ``resource_authority`` is compared sequentially with the authorities in
-	//    each configuration source in ``config_sources``. The first ``ConfigSource``
-	//    to match wins.
-	// 4. As a fallback, if no configuration source matches, then
-	//    ``default_config_source`` is used.
-	// 5. If ``default_config_source`` is not specified, resolution fails.
+	//  1. The authority field is taken from the xdstp:// URL, call
+	//     this “resource_authority“.
+	//  2. “resource_authority“ is compared against the authorities in any peer
+	//     “ConfigSource“. The peer “ConfigSource“ is the configuration source
+	//     message which would have been used unconditionally for resolution
+	//     with opaque resource names. If there is a match with an authority, the
+	//     peer “ConfigSource“ message is used.
+	//  3. “resource_authority“ is compared sequentially with the authorities in
+	//     each configuration source in “config_sources“. The first “ConfigSource“
+	//     to match wins.
+	//  4. As a fallback, if no configuration source matches, then
+	//     “default_config_source“ is used.
+	//  5. If “default_config_source“ is not specified, resolution fails.
+	//
 	// [#not-implemented-hide:]
 	ConfigSources []*v3.ConfigSource `protobuf:"bytes,22,rep,name=config_sources,json=configSources,proto3" json:"config_sources,omitempty"`
 	// Default configuration source for xdstp:// URLs if all
@@ -358,16 +363,20 @@ type Bootstrap struct {
 	//
 	// .. note::
 	//
-	//    There are no in-repo extensions currently, and the :repo:`XdsConfigTracker <envoy/config/xds_config_tracker.h>`
-	//    interface should be implemented before using.
-	//    See :repo:`xds_config_tracker_integration_test <test/integration/xds_config_tracker_integration_test.cc>`
-	//    for an example usage of the interface.
+	//	There are no in-repo extensions currently, and the :repo:`XdsConfigTracker <envoy/config/xds_config_tracker.h>`
+	//	interface should be implemented before using.
+	//	See :repo:`xds_config_tracker_integration_test <test/integration/xds_config_tracker_integration_test.cc>`
+	//	for an example usage of the interface.
 	XdsConfigTrackerExtension *v3.TypedExtensionConfig `protobuf:"bytes,36,opt,name=xds_config_tracker_extension,json=xdsConfigTrackerExtension,proto3" json:"xds_config_tracker_extension,omitempty"`
 	// [#not-implemented-hide:]
 	// This controls the type of listener manager configured for Envoy. Currently
 	// Envoy only supports ListenerManager for this field and Envoy Mobile
 	// supports ApiListenerManager.
 	ListenerManager *v3.TypedExtensionConfig `protobuf:"bytes,37,opt,name=listener_manager,json=listenerManager,proto3" json:"listener_manager,omitempty"`
+	// Optional application log configuration.
+	ApplicationLogConfig *Bootstrap_ApplicationLogConfig `protobuf:"bytes,38,opt,name=application_log_config,json=applicationLogConfig,proto3" json:"application_log_config,omitempty"`
+	// Optional gRPC async manager config.
+	GrpcAsyncClientManagerConfig *Bootstrap_GrpcAsyncClientManagerConfig `protobuf:"bytes,40,opt,name=grpc_async_client_manager_config,json=grpcAsyncClientManagerConfig,proto3" json:"grpc_async_client_manager_config,omitempty"`
 }
 
 func (x *Bootstrap) Reset() {
@@ -458,6 +467,13 @@ func (x *Bootstrap) GetStatsSinks() []*v31.StatsSink {
 	return nil
 }
 
+func (x *Bootstrap) GetDeferredStatOptions() *Bootstrap_DeferredStatOptions {
+	if x != nil {
+		return x.DeferredStatOptions
+	}
+	return nil
+}
+
 func (x *Bootstrap) GetStatsConfig() *v31.StatsConfig {
 	if x != nil {
 		return x.StatsConfig
@@ -486,7 +502,7 @@ func (x *Bootstrap) GetStatsFlushOnAdmin() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 func (x *Bootstrap) GetWatchdog() *Watchdog {
 	if x != nil {
 		return x.Watchdog
@@ -501,7 +517,7 @@ func (x *Bootstrap) GetWatchdogs() *Watchdogs {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 func (x *Bootstrap) GetTracing() *v32.Tracing {
 	if x != nil {
 		return x.Tracing
@@ -551,7 +567,7 @@ func (x *Bootstrap) GetStatsServerVersionOverride() *wrappers.UInt64Value {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 func (x *Bootstrap) GetUseTcpForDnsLookups() bool {
 	if x != nil {
 		return x.UseTcpForDnsLookups
@@ -559,7 +575,7 @@ func (x *Bootstrap) GetUseTcpForDnsLookups() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 func (x *Bootstrap) GetDnsResolutionConfig() *v3.DnsResolutionConfig {
 	if x != nil {
 		return x.DnsResolutionConfig
@@ -658,14 +674,28 @@ func (x *Bootstrap) GetListenerManager() *v3.TypedExtensionConfig {
 	return nil
 }
 
+func (x *Bootstrap) GetApplicationLogConfig() *Bootstrap_ApplicationLogConfig {
+	if x != nil {
+		return x.ApplicationLogConfig
+	}
+	return nil
+}
+
+func (x *Bootstrap) GetGrpcAsyncClientManagerConfig() *Bootstrap_GrpcAsyncClientManagerConfig {
+	if x != nil {
+		return x.GrpcAsyncClientManagerConfig
+	}
+	return nil
+}
+
 type isBootstrap_StatsFlush interface {
 	isBootstrap_StatsFlush()
 }
 
 type Bootstrap_StatsFlushOnAdmin struct {
 	// Flush stats to sinks only when queried for on the admin interface. If set,
-	// a flush timer is not created. Only one of ``stats_flush_on_admin`` or
-	// ``stats_flush_interval`` can be set.
+	// a flush timer is not created. Only one of “stats_flush_on_admin“ or
+	// “stats_flush_interval“ can be set.
 	StatsFlushOnAdmin bool `protobuf:"varint,29,opt,name=stats_flush_on_admin,json=statsFlushOnAdmin,proto3,oneof"`
 }
 
@@ -685,9 +715,9 @@ type Admin struct {
 	// The path to write the access log for the administration server. If no
 	// access log is desired specify ‘/dev/null’. This is only required if
 	// :ref:`address <envoy_v3_api_field_config.bootstrap.v3.Admin.address>` is set.
-	// Deprecated in favor of ``access_log`` which offers more options.
+	// Deprecated in favor of “access_log“ which offers more options.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 	AccessLogPath string `protobuf:"bytes,1,opt,name=access_log_path,json=accessLogPath,proto3" json:"access_log_path,omitempty"`
 	// The cpu profiler output path for the administration server. If no profile
 	// path is specified, the default is ‘/var/log/envoy/envoy.prof’.
@@ -742,7 +772,7 @@ func (x *Admin) GetAccessLog() []*v34.AccessLog {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/bootstrap/v3/bootstrap.proto.
 func (x *Admin) GetAccessLogPath() string {
 	if x != nil {
 		return x.AccessLogPath
@@ -779,6 +809,7 @@ func (x *Admin) GetIgnoreGlobalConnLimit() bool {
 }
 
 // Cluster manager :ref:`architecture overview <arch_overview_cluster_manager>`.
+// [#next-free-field: 6]
 type ClusterManager struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -787,7 +818,7 @@ type ClusterManager struct {
 	// Name of the local cluster (i.e., the cluster that owns the Envoy running
 	// this configuration). In order to enable :ref:`zone aware routing
 	// <arch_overview_load_balancing_zone_aware_routing>` this option must be set.
-	// If ``local_cluster_name`` is defined then :ref:`clusters
+	// If “local_cluster_name“ is defined then :ref:`clusters
 	// <envoy_v3_api_msg_config.cluster.v3.Cluster>` must be defined in the :ref:`Bootstrap
 	// static cluster resources
 	// <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.StaticResources.clusters>`. This is unrelated to
@@ -800,10 +831,14 @@ type ClusterManager struct {
 	// This may be overridden on a per-cluster basis by upstream_bind_config in the cds_config.
 	UpstreamBindConfig *v3.BindConfig `protobuf:"bytes,3,opt,name=upstream_bind_config,json=upstreamBindConfig,proto3" json:"upstream_bind_config,omitempty"`
 	// A management server endpoint to stream load stats to via
-	// ``StreamLoadStats``. This must have :ref:`api_type
+	// “StreamLoadStats“. This must have :ref:`api_type
 	// <envoy_v3_api_field_config.core.v3.ApiConfigSource.api_type>` :ref:`GRPC
 	// <envoy_v3_api_enum_value_config.core.v3.ApiConfigSource.ApiType.GRPC>`.
 	LoadStatsConfig *v3.ApiConfigSource `protobuf:"bytes,4,opt,name=load_stats_config,json=loadStatsConfig,proto3" json:"load_stats_config,omitempty"`
+	// Whether the ClusterManager will create clusters on the worker threads
+	// inline during requests. This will save memory and CPU cycles in cases where
+	// there are lots of inactive clusters and > 1 worker thread.
+	EnableDeferredClusterCreation bool `protobuf:"varint,5,opt,name=enable_deferred_cluster_creation,json=enableDeferredClusterCreation,proto3" json:"enable_deferred_cluster_creation,omitempty"`
 }
 
 func (x *ClusterManager) Reset() {
@@ -866,6 +901,13 @@ func (x *ClusterManager) GetLoadStatsConfig() *v3.ApiConfigSource {
 	return nil
 }
 
+func (x *ClusterManager) GetEnableDeferredClusterCreation() bool {
+	if x != nil {
+		return x.EnableDeferredClusterCreation
+	}
+	return false
+}
+
 // Allows you to specify different watchdog configs for different subsystems.
 // This allows finer tuned policies for the watchdog. If a subsystem is omitted
 // the default values for that system will be used.
@@ -936,31 +978,31 @@ type Watchdog struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Register actions that will fire on given WatchDog events.
-	// See ``WatchDogAction`` for priority of events.
+	// See “WatchDogAction“ for priority of events.
 	Actions []*Watchdog_WatchdogAction `protobuf:"bytes,7,rep,name=actions,proto3" json:"actions,omitempty"`
 	// The duration after which Envoy counts a nonresponsive thread in the
-	// ``watchdog_miss`` statistic. If not specified the default is 200ms.
+	// “watchdog_miss“ statistic. If not specified the default is 200ms.
 	MissTimeout *duration.Duration `protobuf:"bytes,1,opt,name=miss_timeout,json=missTimeout,proto3" json:"miss_timeout,omitempty"`
 	// The duration after which Envoy counts a nonresponsive thread in the
-	// ``watchdog_mega_miss`` statistic. If not specified the default is
+	// “watchdog_mega_miss“ statistic. If not specified the default is
 	// 1000ms.
 	MegamissTimeout *duration.Duration `protobuf:"bytes,2,opt,name=megamiss_timeout,json=megamissTimeout,proto3" json:"megamiss_timeout,omitempty"`
 	// If a watched thread has been nonresponsive for this duration, assume a
 	// programming error and kill the entire Envoy process. Set to 0 to disable
 	// kill behavior. If not specified the default is 0 (disabled).
 	KillTimeout *duration.Duration `protobuf:"bytes,3,opt,name=kill_timeout,json=killTimeout,proto3" json:"kill_timeout,omitempty"`
-	// Defines the maximum jitter used to adjust the ``kill_timeout`` if ``kill_timeout`` is
+	// Defines the maximum jitter used to adjust the “kill_timeout“ if “kill_timeout“ is
 	// enabled. Enabling this feature would help to reduce risk of synchronized
 	// watchdog kill events across proxies due to external triggers. Set to 0 to
 	// disable. If not specified the default is 0 (disabled).
 	MaxKillTimeoutJitter *duration.Duration `protobuf:"bytes,6,opt,name=max_kill_timeout_jitter,json=maxKillTimeoutJitter,proto3" json:"max_kill_timeout_jitter,omitempty"`
-	// If ``max(2, ceil(registered_threads * Fraction(*multikill_threshold*)))``
+	// If “max(2, ceil(registered_threads * Fraction(*multikill_threshold*)))“
 	// threads have been nonresponsive for at least this duration kill the entire
 	// Envoy process. Set to 0 to disable this behavior. If not specified the
 	// default is 0 (disabled).
 	MultikillTimeout *duration.Duration `protobuf:"bytes,4,opt,name=multikill_timeout,json=multikillTimeout,proto3" json:"multikill_timeout,omitempty"`
-	// Sets the threshold for ``multikill_timeout`` in terms of the percentage of
-	// nonresponsive threads required for the ``multikill_timeout``.
+	// Sets the threshold for “multikill_timeout“ in terms of the percentage of
+	// nonresponsive threads required for the “multikill_timeout“.
 	// If not specified the default is 0.
 	MultikillThreshold *v35.Percent `protobuf:"bytes,5,opt,name=multikill_threshold,json=multikillThreshold,proto3" json:"multikill_threshold,omitempty"`
 }
@@ -1051,8 +1093,8 @@ func (x *Watchdog) GetMultikillThreshold() *v35.Percent {
 // If using an unsafe action that could get stuck or deadlock, it important to
 // have an out of band system to terminate the process.
 //
-// The interface for the extension is ``Envoy::Server::Configuration::FatalAction``.
-// ``FatalAction`` extensions live in the ``envoy.extensions.fatal_actions`` API
+// The interface for the extension is “Envoy::Server::Configuration::FatalAction“.
+// “FatalAction“ extensions live in the “envoy.extensions.fatal_actions“ API
 // namespace.
 type FatalAction struct {
 	state         protoimpl.MessageState
@@ -1060,7 +1102,7 @@ type FatalAction struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Extension specific configuration for the action. It's expected to conform
-	// to the ``Envoy::Server::Configuration::FatalAction`` interface.
+	// to the “Envoy::Server::Configuration::FatalAction“ interface.
 	Config *v3.TypedExtensionConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 }
 
@@ -1204,6 +1246,7 @@ type RuntimeLayer struct {
 	// :http:get:`/runtime` output.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to LayerSpecifier:
+	//
 	//	*RuntimeLayer_StaticLayer
 	//	*RuntimeLayer_DiskLayer_
 	//	*RuntimeLayer_AdminLayer_
@@ -1379,14 +1422,14 @@ func (x *LayeredRuntime) GetLayers() []*RuntimeLayer {
 //
 // .. code-block:: text
 //
-//   foo: bar
-//   foo: eep
+//	foo: bar
+//	foo: eep
 //
 // Then they will eventually be folded into:
 //
 // .. code-block:: text
 //
-//   foo: bar, eep
+//	foo: bar, eep
 //
 // Inline headers provide O(1) search performance, but each inline header imposes
 // an additional memory overhead on all instances of the corresponding type of
@@ -1617,6 +1660,249 @@ func (x *Bootstrap_DynamicResources) GetAdsConfig() *v3.ApiConfigSource {
 	return nil
 }
 
+type Bootstrap_ApplicationLogConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Optional field to set the application logs format. If this field is set, it will override
+	// the default log format. Setting both this field and :option:`--log-format` command line
+	// option is not allowed, and will cause a bootstrap error.
+	LogFormat *Bootstrap_ApplicationLogConfig_LogFormat `protobuf:"bytes,1,opt,name=log_format,json=logFormat,proto3" json:"log_format,omitempty"`
+}
+
+func (x *Bootstrap_ApplicationLogConfig) Reset() {
+	*x = Bootstrap_ApplicationLogConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Bootstrap_ApplicationLogConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Bootstrap_ApplicationLogConfig) ProtoMessage() {}
+
+func (x *Bootstrap_ApplicationLogConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Bootstrap_ApplicationLogConfig.ProtoReflect.Descriptor instead.
+func (*Bootstrap_ApplicationLogConfig) Descriptor() ([]byte, []int) {
+	return file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP(), []int{0, 2}
+}
+
+func (x *Bootstrap_ApplicationLogConfig) GetLogFormat() *Bootstrap_ApplicationLogConfig_LogFormat {
+	if x != nil {
+		return x.LogFormat
+	}
+	return nil
+}
+
+type Bootstrap_DeferredStatOptions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// When the flag is enabled, Envoy will lazily initialize a subset of the stats (see below).
+	// This will save memory and CPU cycles when creating the objects that own these stats, if those
+	// stats are never referenced throughout the lifetime of the process. However, it will incur additional
+	// memory overhead for these objects, and a small increase of CPU usage when a at least one of the stats
+	// is updated for the first time.
+	// Groups of stats that will be lazily initialized:
+	// - Cluster traffic stats: a subgroup of the :ref:`cluster statistics <config_cluster_manager_cluster_stats>`
+	// that are used when requests are routed to the cluster.
+	EnableDeferredCreationStats bool `protobuf:"varint,1,opt,name=enable_deferred_creation_stats,json=enableDeferredCreationStats,proto3" json:"enable_deferred_creation_stats,omitempty"`
+}
+
+func (x *Bootstrap_DeferredStatOptions) Reset() {
+	*x = Bootstrap_DeferredStatOptions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Bootstrap_DeferredStatOptions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Bootstrap_DeferredStatOptions) ProtoMessage() {}
+
+func (x *Bootstrap_DeferredStatOptions) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Bootstrap_DeferredStatOptions.ProtoReflect.Descriptor instead.
+func (*Bootstrap_DeferredStatOptions) Descriptor() ([]byte, []int) {
+	return file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP(), []int{0, 3}
+}
+
+func (x *Bootstrap_DeferredStatOptions) GetEnableDeferredCreationStats() bool {
+	if x != nil {
+		return x.EnableDeferredCreationStats
+	}
+	return false
+}
+
+type Bootstrap_GrpcAsyncClientManagerConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Optional field to set the expiration time for the cached gRPC client object.
+	// The minimal value is 5s and the default is 50s.
+	MaxCachedEntryIdleDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_cached_entry_idle_duration,json=maxCachedEntryIdleDuration,proto3" json:"max_cached_entry_idle_duration,omitempty"`
+}
+
+func (x *Bootstrap_GrpcAsyncClientManagerConfig) Reset() {
+	*x = Bootstrap_GrpcAsyncClientManagerConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Bootstrap_GrpcAsyncClientManagerConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Bootstrap_GrpcAsyncClientManagerConfig) ProtoMessage() {}
+
+func (x *Bootstrap_GrpcAsyncClientManagerConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[14]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Bootstrap_GrpcAsyncClientManagerConfig.ProtoReflect.Descriptor instead.
+func (*Bootstrap_GrpcAsyncClientManagerConfig) Descriptor() ([]byte, []int) {
+	return file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP(), []int{0, 4}
+}
+
+func (x *Bootstrap_GrpcAsyncClientManagerConfig) GetMaxCachedEntryIdleDuration() *duration.Duration {
+	if x != nil {
+		return x.MaxCachedEntryIdleDuration
+	}
+	return nil
+}
+
+type Bootstrap_ApplicationLogConfig_LogFormat struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to LogFormat:
+	//
+	//	*Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat
+	//	*Bootstrap_ApplicationLogConfig_LogFormat_TextFormat
+	LogFormat isBootstrap_ApplicationLogConfig_LogFormat_LogFormat `protobuf_oneof:"log_format"`
+}
+
+func (x *Bootstrap_ApplicationLogConfig_LogFormat) Reset() {
+	*x = Bootstrap_ApplicationLogConfig_LogFormat{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Bootstrap_ApplicationLogConfig_LogFormat) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Bootstrap_ApplicationLogConfig_LogFormat) ProtoMessage() {}
+
+func (x *Bootstrap_ApplicationLogConfig_LogFormat) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Bootstrap_ApplicationLogConfig_LogFormat.ProtoReflect.Descriptor instead.
+func (*Bootstrap_ApplicationLogConfig_LogFormat) Descriptor() ([]byte, []int) {
+	return file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP(), []int{0, 2, 0}
+}
+
+func (m *Bootstrap_ApplicationLogConfig_LogFormat) GetLogFormat() isBootstrap_ApplicationLogConfig_LogFormat_LogFormat {
+	if m != nil {
+		return m.LogFormat
+	}
+	return nil
+}
+
+func (x *Bootstrap_ApplicationLogConfig_LogFormat) GetJsonFormat() *_struct.Struct {
+	if x, ok := x.GetLogFormat().(*Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat); ok {
+		return x.JsonFormat
+	}
+	return nil
+}
+
+func (x *Bootstrap_ApplicationLogConfig_LogFormat) GetTextFormat() string {
+	if x, ok := x.GetLogFormat().(*Bootstrap_ApplicationLogConfig_LogFormat_TextFormat); ok {
+		return x.TextFormat
+	}
+	return ""
+}
+
+type isBootstrap_ApplicationLogConfig_LogFormat_LogFormat interface {
+	isBootstrap_ApplicationLogConfig_LogFormat_LogFormat()
+}
+
+type Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat struct {
+	// Flush application logs in JSON format. The configured JSON struct can
+	// support all the format flags specified in the :option:`--log-format`
+	// command line options section, except for the “%v“ and “%_“ flags.
+	JsonFormat *_struct.Struct `protobuf:"bytes,1,opt,name=json_format,json=jsonFormat,proto3,oneof"`
+}
+
+type Bootstrap_ApplicationLogConfig_LogFormat_TextFormat struct {
+	// Flush application log in a format defined by a string. The text format
+	// can support all the format flags specified in the :option:`--log-format`
+	// command line option section.
+	TextFormat string `protobuf:"bytes,2,opt,name=text_format,json=textFormat,proto3,oneof"`
+}
+
+func (*Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat) isBootstrap_ApplicationLogConfig_LogFormat_LogFormat() {
+}
+
+func (*Bootstrap_ApplicationLogConfig_LogFormat_TextFormat) isBootstrap_ApplicationLogConfig_LogFormat_LogFormat() {
+}
+
 type ClusterManager_OutlierDetection struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1633,7 +1919,7 @@ type ClusterManager_OutlierDetection struct {
 func (x *ClusterManager_OutlierDetection) Reset() {
 	*x = ClusterManager_OutlierDetection{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[13]
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1646,7 +1932,7 @@ func (x *ClusterManager_OutlierDetection) String() string {
 func (*ClusterManager_OutlierDetection) ProtoMessage() {}
 
 func (x *ClusterManager_OutlierDetection) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[13]
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1689,7 +1975,7 @@ type Watchdog_WatchdogAction struct {
 func (x *Watchdog_WatchdogAction) Reset() {
 	*x = Watchdog_WatchdogAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[14]
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1702,7 +1988,7 @@ func (x *Watchdog_WatchdogAction) String() string {
 func (*Watchdog_WatchdogAction) ProtoMessage() {}
 
 func (x *Watchdog_WatchdogAction) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[14]
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1758,7 +2044,7 @@ type RuntimeLayer_DiskLayer struct {
 func (x *RuntimeLayer_DiskLayer) Reset() {
 	*x = RuntimeLayer_DiskLayer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[15]
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1771,7 +2057,7 @@ func (x *RuntimeLayer_DiskLayer) String() string {
 func (*RuntimeLayer_DiskLayer) ProtoMessage() {}
 
 func (x *RuntimeLayer_DiskLayer) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[15]
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1818,7 +2104,7 @@ type RuntimeLayer_AdminLayer struct {
 func (x *RuntimeLayer_AdminLayer) Reset() {
 	*x = RuntimeLayer_AdminLayer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16]
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1831,7 +2117,7 @@ func (x *RuntimeLayer_AdminLayer) String() string {
 func (*RuntimeLayer_AdminLayer) ProtoMessage() {}
 
 func (x *RuntimeLayer_AdminLayer) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16]
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1853,7 +2139,7 @@ type RuntimeLayer_RtdsLayer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Resource to subscribe to at ``rtds_config`` for the RTDS layer.
+	// Resource to subscribe to at “rtds_config“ for the RTDS layer.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// RTDS configuration source.
 	RtdsConfig *v3.ConfigSource `protobuf:"bytes,2,opt,name=rtds_config,json=rtdsConfig,proto3" json:"rtds_config,omitempty"`
@@ -1862,7 +2148,7 @@ type RuntimeLayer_RtdsLayer struct {
 func (x *RuntimeLayer_RtdsLayer) Reset() {
 	*x = RuntimeLayer_RtdsLayer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17]
+		mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1875,7 +2161,7 @@ func (x *RuntimeLayer_RtdsLayer) String() string {
 func (*RuntimeLayer_RtdsLayer) ProtoMessage() {}
 
 func (x *RuntimeLayer_RtdsLayer) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17]
+	mi := &file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1968,7 +2254,7 @@ var file_envoy_config_bootstrap_v3_bootstrap_proto_rawDesc = []byte{
 	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69,
 	0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
 	0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xe2, 0x1c, 0x0a, 0x09, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x12,
+	0x6f, 0x22, 0xac, 0x23, 0x0a, 0x09, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x12,
 	0x2e, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
 	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12,
@@ -2003,437 +2289,494 @@ var file_envoy_config_bootstrap_v3_bootstrap_proto_rawDesc = []byte{
 	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x61,
 	0x74, 0x73, 0x53, 0x69, 0x6e, 0x6b, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x73, 0x53, 0x69, 0x6e,
-	0x6b, 0x73, 0x12, 0x47, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e,
-	0x76, 0x33, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b,
-	0x73, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x71, 0x0a, 0x14, 0x73,
-	0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x24, 0xfa, 0x42, 0x0e, 0xaa, 0x01, 0x0b, 0x1a, 0x03, 0x08, 0xac,
-	0x02, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x12, 0x0b, 0x73,
-	0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x12, 0x73, 0x74, 0x61, 0x74,
-	0x73, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x3a,
-	0x0a, 0x14, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x6f, 0x6e,
-	0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42,
-	0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x11, 0x73, 0x74, 0x61, 0x74, 0x73, 0x46, 0x6c,
-	0x75, 0x73, 0x68, 0x4f, 0x6e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x4c, 0x0a, 0x08, 0x77, 0x61,
-	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f,
-	0x67, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x08,
-	0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x12, 0x42, 0x0a, 0x09, 0x77, 0x61, 0x74, 0x63,
-	0x68, 0x64, 0x6f, 0x67, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73,
-	0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67,
-	0x73, 0x52, 0x09, 0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x73, 0x12, 0x45, 0x0a, 0x07,
-	0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x42, 0x0b, 0x18,
-	0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63,
-	0x69, 0x6e, 0x67, 0x12, 0x52, 0x0a, 0x0f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x0e, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
-	0x76, 0x33, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12,
-	0x64, 0x0a, 0x10, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61,
-	0x64, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x42, 0x0e, 0x8a, 0x93, 0xb7, 0x2a, 0x02, 0x08, 0x01, 0x8a, 0x93, 0xb7,
-	0x2a, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f,
-	0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73,
-	0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x69,
-	0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x23, 0x0a,
-	0x0d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x12,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x12, 0x5f, 0x0a, 0x1d, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72,
-	0x69, 0x64, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
-	0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1a, 0x73, 0x74, 0x61, 0x74, 0x73, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x76, 0x65, 0x72, 0x72,
-	0x69, 0x64, 0x65, 0x12, 0x41, 0x0a, 0x17, 0x75, 0x73, 0x65, 0x5f, 0x74, 0x63, 0x70, 0x5f, 0x66,
-	0x6f, 0x72, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x14,
-	0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x13, 0x75, 0x73, 0x65, 0x54, 0x63, 0x70, 0x46, 0x6f, 0x72, 0x44, 0x6e, 0x73, 0x4c,
-	0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x12, 0x6a, 0x0a, 0x15, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65,
-	0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x6e, 0x73,
-	0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x13, 0x64,
-	0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x65, 0x0a, 0x19, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x64, 0x6e, 0x73, 0x5f,
-	0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x16, 0x74, 0x79, 0x70, 0x65, 0x64, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c,
-	0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x14, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54,
-	0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x13, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4b, 0x0a, 0x0d, 0x66, 0x61, 0x74, 0x61,
-	0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62,
-	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x61, 0x74, 0x61,
-	0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x66, 0x61, 0x74, 0x61, 0x6c, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x49, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x12, 0x56, 0x0a, 0x15, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x52, 0x13, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x38, 0x0a, 0x18, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x66, 0x61, 0x63, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61,
-	0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x1e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73,
-	0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x12, 0x54, 0x0a, 0x0e, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x6b, 0x73, 0x12, 0x6c, 0x0a, 0x15, 0x64, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x73,
+	0x74, 0x61, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x27, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x44, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64,
+	0x53, 0x74, 0x61, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x13, 0x64, 0x65, 0x66,
+	0x65, 0x72, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x47, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x76, 0x33,
+	0x2e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x73, 0x74,
+	0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x71, 0x0a, 0x14, 0x73, 0x74, 0x61,
+	0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
+	0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x42, 0x24, 0xfa, 0x42, 0x0e, 0xaa, 0x01, 0x0b, 0x1a, 0x03, 0x08, 0xac, 0x02, 0x32,
+	0x04, 0x10, 0xc0, 0x84, 0x3d, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x12, 0x0b, 0x73, 0x74, 0x61,
+	0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x12, 0x73, 0x74, 0x61, 0x74, 0x73, 0x46,
+	0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x3a, 0x0a, 0x14,
+	0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x6f, 0x6e, 0x5f, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x6a,
+	0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x11, 0x73, 0x74, 0x61, 0x74, 0x73, 0x46, 0x6c, 0x75, 0x73,
+	0x68, 0x4f, 0x6e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x4c, 0x0a, 0x08, 0x77, 0x61, 0x74, 0x63,
+	0x68, 0x64, 0x6f, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
+	0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x42,
+	0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x08, 0x77, 0x61,
+	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x12, 0x42, 0x0a, 0x09, 0x77, 0x61, 0x74, 0x63, 0x68, 0x64,
+	0x6f, 0x67, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x6e, 0x6c, 0x69,
-	0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x33, 0x0a, 0x16, 0x70, 0x65, 0x72, 0x66, 0x5f,
-	0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74,
-	0x68, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x70, 0x65, 0x72, 0x66, 0x54, 0x72, 0x61,
-	0x63, 0x69, 0x6e, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x5c, 0x0a, 0x14,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x65, 0x6e,
-	0x67, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52,
-	0x65, 0x67, 0x65, 0x78, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x12, 0x60, 0x0a, 0x16, 0x78, 0x64,
-	0x73, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x14, 0x78, 0x64, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x67,
-	0x61, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x6b, 0x0a, 0x1c,
-	0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b,
-	0x65, 0x72, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x19,
-	0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x10, 0x6c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x18, 0x25, 0x20,
+	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x73, 0x52,
+	0x09, 0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x73, 0x12, 0x45, 0x0a, 0x07, 0x74, 0x72,
+	0x61, 0x63, 0x69, 0x6e, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x42, 0x0b, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e,
+	0x67, 0x12, 0x52, 0x0a, 0x0f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
+	0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x0e, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x0c,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33,
+	0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x5f, 0x0a,
+	0x10, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x2e,
+	0x76, 0x33, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x42, 0x09, 0x8a, 0x93, 0xb7, 0x2a, 0x04, 0x08, 0x01, 0x10, 0x01, 0x52, 0x0f, 0x6f,
+	0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x36,
+	0x0a, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x5f, 0x0a, 0x1d, 0x73,
+	0x74, 0x61, 0x74, 0x73, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x13, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x1a, 0x73, 0x74, 0x61, 0x74, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x41, 0x0a, 0x17,
+	0x75, 0x73, 0x65, 0x5f, 0x74, 0x63, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x64, 0x6e, 0x73, 0x5f,
+	0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92,
+	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x13, 0x75, 0x73, 0x65, 0x54,
+	0x63, 0x70, 0x46, 0x6f, 0x72, 0x44, 0x6e, 0x73, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x12,
+	0x6a, 0x0a, 0x15, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04,
+	0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x13, 0x64, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c,
+	0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x65, 0x0a, 0x19, 0x74,
+	0x79, 0x70, 0x65, 0x64, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+	0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x16, 0x74, 0x79, 0x70, 0x65,
+	0x64, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x5d, 0x0a, 0x14, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x62, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x4b, 0x0a, 0x0d, 0x66, 0x61, 0x74, 0x61, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x61, 0x74, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x0c, 0x66, 0x61, 0x74, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x49,
+	0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x15, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x13, 0x64, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x12, 0x38, 0x0a, 0x18, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x18, 0x18, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x16, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x1e,
+	0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x19,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33,
+	0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x1c, 0x63, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0e, 0x69, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x20, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x52, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x12, 0x33, 0x0a, 0x16, 0x70, 0x65, 0x72, 0x66, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
+	0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x13, 0x70, 0x65, 0x72, 0x66, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x46, 0x69, 0x6c,
+	0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x5c, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
 	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x0f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
-	0x1a, 0x9a, 0x02, 0x0a, 0x0f, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x52, 0x09, 0x6c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x3c, 0x0a, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x73, 0x12, 0x4b, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
-	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76,
-	0x33, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x07, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
-	0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x53, 0x74,
-	0x61, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x89, 0x03,
-	0x0a, 0x10, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x12, 0x41, 0x0a, 0x0a, 0x6c, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x6c, 0x64, 0x73, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x15, 0x6c, 0x64, 0x73, 0x5f, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x6c, 0x64, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x63, 0x64, 0x73,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x09, 0x63, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x15,
-	0x63, 0x64, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f,
-	0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x63, 0x64, 0x73,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72,
-	0x12, 0x44, 0x0a, 0x0a, 0x61, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x61, 0x64, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x1a, 0x7b, 0x0a, 0x21, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x40, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x42, 0x0d, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73,
-	0x68, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x52, 0x07, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x89, 0x03, 0x0a, 0x05, 0x41, 0x64, 0x6d, 0x69, 0x6e,
-	0x12, 0x43, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33,
-	0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x4c, 0x6f, 0x67, 0x12, 0x33, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
-	0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
-	0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x0d, 0x61, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x72,
-	0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x37, 0x0a,
-	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x07, 0x61,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x49, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x37, 0x0a, 0x18, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x67, 0x6c, 0x6f, 0x62,
-	0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x47, 0x6c, 0x6f, 0x62, 0x61,
-	0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e,
-	0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x64, 0x6d,
-	0x69, 0x6e, 0x22, 0xcb, 0x04, 0x0a, 0x0e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x10, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x67, 0x0a, 0x11, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x64,
-	0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65,
-	0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6f, 0x75, 0x74, 0x6c,
-	0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x52, 0x0a, 0x14,
-	0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x75, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x51, 0x0a, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e,
+	0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x67, 0x65, 0x78, 0x45, 0x6e, 0x67,
+	0x69, 0x6e, 0x65, 0x12, 0x60, 0x0a, 0x16, 0x78, 0x64, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x23, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
+	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x14, 0x78, 0x64, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x6b, 0x0a, 0x1c, 0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x5f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x1a, 0xc9, 0x01, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44,
-	0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x65, 0x76, 0x65, 0x6e,
-	0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x74, 0x68, 0x12, 0x4d,
-	0x0a, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x40, 0x9a,
-	0xc5, 0x88, 0x1e, 0x3b, 0x0a, 0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x4f,
-	0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a,
-	0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x19, 0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x72, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x10, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x6d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
+	0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x6f, 0x0a, 0x16, 0x61, 0x70, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x26, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
+	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
+	0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x89, 0x01, 0x0a, 0x20, 0x67,
+	0x72, 0x70, 0x63, 0x5f, 0x61, 0x73, 0x79, 0x6e, 0x63, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x28, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76,
-	0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
-	0x22, 0xb0, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x73, 0x12, 0x55,
-	0x0a, 0x14, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x77, 0x61,
-	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
+	0x33, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x47, 0x72, 0x70, 0x63,
+	0x41, 0x73, 0x79, 0x6e, 0x63, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x1c, 0x67, 0x72, 0x70, 0x63, 0x41, 0x73,
+	0x79, 0x6e, 0x63, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x9a, 0x02, 0x0a, 0x0f, 0x53, 0x74, 0x61, 0x74, 0x69,
+	0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x09, 0x6c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x52, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x3c, 0x0a, 0x08,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4b, 0x0a, 0x07, 0x73, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
+	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x07,
+	0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f,
+	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74,
+	0x72, 0x61, 0x70, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x1a, 0x89, 0x03, 0x0a, 0x10, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x41, 0x0a, 0x0a, 0x6c, 0x64, 0x73, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x52, 0x09, 0x6c, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x15, 0x6c,
+	0x64, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f, 0x63,
+	0x61, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x6c, 0x64, 0x73, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12,
+	0x41, 0x0a, 0x0a, 0x63, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x63, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x32, 0x0a, 0x15, 0x63, 0x64, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x13, 0x63, 0x64, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x44, 0x0a, 0x0a, 0x61, 0x64, 0x73, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x41, 0x70, 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x52, 0x09, 0x61, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x3b, 0x9a, 0xc5,
+	0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x42,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x1a,
+	0xf9, 0x01, 0x0a, 0x14, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c,
+	0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x62, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f,
-	0x67, 0x52, 0x12, 0x6d, 0x61, 0x69, 0x6e, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x57, 0x61, 0x74,
-	0x63, 0x68, 0x64, 0x6f, 0x67, 0x12, 0x4c, 0x0a, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x5f,
-	0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
-	0x64, 0x6f, 0x67, 0x52, 0x0e, 0x77, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x57, 0x61, 0x74, 0x63, 0x68,
-	0x64, 0x6f, 0x67, 0x22, 0xba, 0x06, 0x0a, 0x08, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67,
-	0x12, 0x4c, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
+	0x61, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f,
+	0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x1a, 0x7d, 0x0a, 0x09,
+	0x4c, 0x6f, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x3a, 0x0a, 0x0b, 0x6a, 0x73, 0x6f,
+	0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x6a, 0x73, 0x6f, 0x6e, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x21, 0x0a, 0x0b, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x74, 0x65,
+	0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x11, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0x5a, 0x0a, 0x13, 0x44,
+	0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x43, 0x0a, 0x1e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x66,
+	0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73,
+	0x74, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x44, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x1a, 0x89, 0x01, 0x0a, 0x1c, 0x47, 0x72, 0x70, 0x63,
+	0x41, 0x73, 0x79, 0x6e, 0x63, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x69, 0x0a, 0x1e, 0x6d, 0x61, 0x78, 0x5f,
+	0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x69, 0x64, 0x6c,
+	0x65, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07,
+	0xaa, 0x01, 0x04, 0x32, 0x02, 0x08, 0x05, 0x52, 0x1a, 0x6d, 0x61, 0x78, 0x43, 0x61, 0x63, 0x68,
+	0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x1a, 0x7b, 0x0a, 0x21, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
+	0x76, 0x32, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x42, 0x0d, 0x0a, 0x0b,
+	0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x4a, 0x04, 0x08, 0x0a, 0x10,
+	0x0b, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x52, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x22, 0x89, 0x03, 0x0a, 0x05, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x43, 0x0a, 0x0a, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x4c, 0x6f, 0x67, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x12,
+	0x33, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x61,
+	0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67,
+	0x50, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f,
+	0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x66,
+	0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x37, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x12, 0x49, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x6f,
+	0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x37, 0x0a, 0x18, 0x69,
+	0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69,
+	0x67, 0x6e, 0x6f, 0x72, 0x65, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
+	0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x94, 0x05, 0x0a,
+	0x0e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12,
+	0x2c, 0x0a, 0x12, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6c, 0x6f, 0x63,
+	0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x67, 0x0a,
+	0x11, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x52, 0x0a, 0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x69, 0x6e, 0x64,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x51, 0x0a, 0x11, 0x6c, 0x6f,
+	0x61, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0f, 0x6c, 0x6f,
+	0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x47, 0x0a,
+	0x20, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64,
+	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x44,
+	0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xc9, 0x01, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x6c, 0x69,
+	0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x65,
+	0x76, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x74,
+	0x68, 0x12, 0x4d, 0x0a, 0x0d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x52, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x3a, 0x40, 0x9a, 0xc5, 0x88, 0x1e, 0x3b, 0x0a, 0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
+	0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x22, 0xb0, 0x01, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67,
+	0x73, 0x12, 0x55, 0x0a, 0x14, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64,
+	0x5f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x64, 0x6f, 0x67, 0x52, 0x12, 0x6d, 0x61, 0x69, 0x6e, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64,
+	0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x12, 0x4c, 0x0a, 0x0f, 0x77, 0x6f, 0x72, 0x6b,
+	0x65, 0x72, 0x5f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
 	0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61,
-	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c,
-	0x0a, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x0b, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x44, 0x0a, 0x10,
-	0x6d, 0x65, 0x67, 0x61, 0x6d, 0x69, 0x73, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0f, 0x6d, 0x65, 0x67, 0x61, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x12, 0x5a, 0x0a, 0x17, 0x6d, 0x61, 0x78, 0x5f, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0xaa, 0x01, 0x02, 0x32, 0x00, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x4b, 0x69, 0x6c, 0x6c, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x11,
-	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x52, 0x0e, 0x77, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x22, 0xba, 0x06, 0x0a, 0x08, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x64, 0x6f, 0x67, 0x12, 0x4c, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33,
+	0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64,
+	0x6f, 0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x3c, 0x0a, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x12, 0x47, 0x0a, 0x13, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c,
-	0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x12, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-	0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x1a, 0x85, 0x02,
-	0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x42, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x60, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e,
-	0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f,
-	0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0x0a, 0x0d, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64,
-	0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f,
-	0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4b, 0x49, 0x4c, 0x4c, 0x10, 0x01, 0x12, 0x0d,
-	0x0a, 0x09, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x4b, 0x49, 0x4c, 0x4c, 0x10, 0x02, 0x12, 0x0c, 0x0a,
-	0x08, 0x4d, 0x45, 0x47, 0x41, 0x4d, 0x49, 0x53, 0x53, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x4d,
-	0x49, 0x53, 0x53, 0x10, 0x04, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73,
-	0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67,
-	0x22, 0x51, 0x0a, 0x0b, 0x46, 0x61, 0x74, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x42, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x22, 0xdc, 0x01, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12,
-	0x21, 0x0a, 0x0c, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x6f,
-	0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x33, 0x0a, 0x15, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69,
-	0x64, 0x65, 0x5f, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x53,
-	0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x2b, 0x0a, 0x04, 0x62,
-	0x61, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6f, 0x6e, 0x52, 0x0b, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
+	0x44, 0x0a, 0x10, 0x6d, 0x65, 0x67, 0x61, 0x6d, 0x69, 0x73, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x6d, 0x65, 0x67, 0x61, 0x6d, 0x69, 0x73, 0x73, 0x54, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x12, 0x5a, 0x0a, 0x17, 0x6d, 0x61, 0x78, 0x5f, 0x6b, 0x69, 0x6c, 0x6c, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42,
+	0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x32, 0x00, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x4b, 0x69,
+	0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x12,
+	0x46, 0x0a, 0x11, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c, 0x6c,
+	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x47, 0x0a, 0x13, 0x6d, 0x75, 0x6c, 0x74, 0x69,
+	0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x12, 0x6d, 0x75,
+	0x6c, 0x74, 0x69, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64,
+	0x1a, 0x85, 0x02, 0x0a, 0x0e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
+	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x60, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
+	0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x64, 0x6f, 0x67, 0x2e, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x64, 0x6f, 0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x64, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0x0a, 0x0d, 0x57, 0x61, 0x74,
+	0x63, 0x68, 0x64, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4b, 0x49, 0x4c, 0x4c, 0x10,
+	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x4b, 0x49, 0x4c, 0x4c, 0x10, 0x02,
+	0x12, 0x0c, 0x0a, 0x08, 0x4d, 0x45, 0x47, 0x41, 0x4d, 0x49, 0x53, 0x53, 0x10, 0x03, 0x12, 0x08,
+	0x0a, 0x04, 0x4d, 0x49, 0x53, 0x53, 0x10, 0x04, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a,
+	0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x64, 0x6f, 0x67, 0x22, 0x51, 0x0a, 0x0b, 0x46, 0x61, 0x74, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xdc, 0x01, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x72, 0x6f,
+	0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e,
+	0x6b, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x75, 0x62,
+	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x33, 0x0a, 0x15, 0x6f, 0x76, 0x65,
+	0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
+	0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69,
+	0x64, 0x65, 0x53, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x2b,
+	0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53,
+	0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88,
+	0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xdb, 0x06, 0x0a, 0x0c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
-	0x63, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a,
-	0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x22, 0xdb, 0x06, 0x0a, 0x0c, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61,
-	0x79, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x3c, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x48,
-	0x00, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x52,
-	0x0a, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x52,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x6b,
-	0x4c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x64, 0x69, 0x73, 0x6b, 0x4c, 0x61, 0x79,
-	0x65, 0x72, 0x12, 0x55, 0x0a, 0x0b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72,
-	0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x0a, 0x72, 0x74, 0x64,
-	0x73, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x52, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72,
-	0x48, 0x00, 0x52, 0x09, 0x72, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x1a, 0xc1, 0x01,
-	0x0a, 0x09, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x73,
-	0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x22,
-	0x0a, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x79, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x14, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a,
-	0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x61, 0x79, 0x65,
-	0x72, 0x1a, 0x46, 0x0a, 0x0a, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x3a,
-	0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x63, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x61, 0x79, 0x65,
+	0x72, 0x12, 0x52, 0x0a, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76,
-	0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x41,
-	0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x1a, 0x9d, 0x01, 0x0a, 0x09, 0x52, 0x74,
-	0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x43, 0x0a, 0x0b, 0x72,
-	0x74, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x52, 0x0a, 0x72, 0x74, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
-	0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e,
-	0x52, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28,
-	0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62,
-	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x16, 0x0a, 0x0f, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x22, 0x82, 0x01, 0x0a, 0x0e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x52, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x06, 0x6c, 0x61,
-	0x79, 0x65, 0x72, 0x73, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76,
+	0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44,
+	0x69, 0x73, 0x6b, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x64, 0x69, 0x73, 0x6b,
+	0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x0b, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x52, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xb1, 0x02, 0x0a, 0x12, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-	0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x12,
-	0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10,
-	0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x10, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x76, 0x0a, 0x12, 0x69, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76,
-	0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x10, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70,
-	0x65, 0x22, 0x66, 0x0a, 0x10, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54,
-	0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x52, 0x45, 0x51,
-	0x55, 0x45, 0x53, 0x54, 0x5f, 0x54, 0x52, 0x41, 0x49, 0x4c, 0x45, 0x52, 0x10, 0x01, 0x12, 0x13,
-	0x0a, 0x0f, 0x52, 0x45, 0x53, 0x50, 0x4f, 0x4e, 0x53, 0x45, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45,
-	0x52, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x45, 0x53, 0x50, 0x4f, 0x4e, 0x53, 0x45, 0x5f,
-	0x54, 0x52, 0x41, 0x49, 0x4c, 0x45, 0x52, 0x10, 0x03, 0x42, 0x91, 0x01, 0x0a, 0x27, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61,
+	0x79, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x00,
+	0x52, 0x0a, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x0a,
+	0x72, 0x74, 0x64, 0x73, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x52, 0x74, 0x64, 0x73, 0x4c, 0x61,
+	0x79, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x72, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72,
+	0x1a, 0xc1, 0x01, 0x0a, 0x09, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21,
+	0x0a, 0x0c, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x79, 0x6d, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x6f, 0x6f,
+	0x74, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x37, 0x9a, 0xc5, 0x88,
+	0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x4c,
+	0x61, 0x79, 0x65, 0x72, 0x1a, 0x46, 0x0a, 0x0a, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79,
+	0x65, 0x72, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65,
+	0x72, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x1a, 0x9d, 0x01, 0x0a,
+	0x09, 0x52, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x43,
+	0x0a, 0x0b, 0x72, 0x74, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0a, 0x72, 0x74, 0x64, 0x73, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79,
+	0x65, 0x72, 0x2e, 0x52, 0x74, 0x64, 0x73, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x3a, 0x2d, 0x9a, 0xc5,
+	0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x52,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x16, 0x0a, 0x0f, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03,
+	0xf8, 0x42, 0x01, 0x22, 0x82, 0x01, 0x0a, 0x0e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65, 0x64, 0x52,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e,
+	0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52,
+	0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f,
+	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x65,
+	0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xb1, 0x02, 0x0a, 0x12, 0x43, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12,
+	0x3b, 0x0a, 0x12, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a,
+	0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x10, 0x69, 0x6e, 0x6c, 0x69,
+	0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x76, 0x0a, 0x12,
+	0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x49, 0x6e, 0x6c, 0x69, 0x6e,
+	0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x10, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x54, 0x79, 0x70, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x51, 0x55,
+	0x45, 0x53, 0x54, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f,
+	0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x54, 0x52, 0x41, 0x49, 0x4c, 0x45, 0x52, 0x10,
+	0x01, 0x12, 0x13, 0x0a, 0x0f, 0x52, 0x45, 0x53, 0x50, 0x4f, 0x4e, 0x53, 0x45, 0x5f, 0x48, 0x45,
+	0x41, 0x44, 0x45, 0x52, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x45, 0x53, 0x50, 0x4f, 0x4e,
+	0x53, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x49, 0x4c, 0x45, 0x52, 0x10, 0x03, 0x42, 0x91, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2e, 0x76, 0x33,
+	0x42, 0x0e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x2f, 0x76, 0x33, 0x3b, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x76, 0x33,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2449,117 +2792,127 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP() []byte {
 }
 
 var file_envoy_config_bootstrap_v3_bootstrap_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_envoy_config_bootstrap_v3_bootstrap_proto_goTypes = []interface{}{
-	(Watchdog_WatchdogAction_WatchdogEvent)(0), // 0: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.WatchdogEvent
-	(CustomInlineHeader_InlineHeaderType)(0),   // 1: envoy.config.bootstrap.v3.CustomInlineHeader.InlineHeaderType
-	(*Bootstrap)(nil),                          // 2: envoy.config.bootstrap.v3.Bootstrap
-	(*Admin)(nil),                              // 3: envoy.config.bootstrap.v3.Admin
-	(*ClusterManager)(nil),                     // 4: envoy.config.bootstrap.v3.ClusterManager
-	(*Watchdogs)(nil),                          // 5: envoy.config.bootstrap.v3.Watchdogs
-	(*Watchdog)(nil),                           // 6: envoy.config.bootstrap.v3.Watchdog
-	(*FatalAction)(nil),                        // 7: envoy.config.bootstrap.v3.FatalAction
-	(*Runtime)(nil),                            // 8: envoy.config.bootstrap.v3.Runtime
-	(*RuntimeLayer)(nil),                       // 9: envoy.config.bootstrap.v3.RuntimeLayer
-	(*LayeredRuntime)(nil),                     // 10: envoy.config.bootstrap.v3.LayeredRuntime
-	(*CustomInlineHeader)(nil),                 // 11: envoy.config.bootstrap.v3.CustomInlineHeader
-	(*Bootstrap_StaticResources)(nil),          // 12: envoy.config.bootstrap.v3.Bootstrap.StaticResources
-	(*Bootstrap_DynamicResources)(nil),         // 13: envoy.config.bootstrap.v3.Bootstrap.DynamicResources
-	nil,                                        // 14: envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry
-	(*ClusterManager_OutlierDetection)(nil),    // 15: envoy.config.bootstrap.v3.ClusterManager.OutlierDetection
-	(*Watchdog_WatchdogAction)(nil),            // 16: envoy.config.bootstrap.v3.Watchdog.WatchdogAction
-	(*RuntimeLayer_DiskLayer)(nil),             // 17: envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer
-	(*RuntimeLayer_AdminLayer)(nil),            // 18: envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer
-	(*RuntimeLayer_RtdsLayer)(nil),             // 19: envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer
-	(*v3.Node)(nil),                            // 20: envoy.config.core.v3.Node
-	(*v3.ApiConfigSource)(nil),                 // 21: envoy.config.core.v3.ApiConfigSource
-	(*v31.StatsSink)(nil),                      // 22: envoy.config.metrics.v3.StatsSink
-	(*v31.StatsConfig)(nil),                    // 23: envoy.config.metrics.v3.StatsConfig
-	(*duration.Duration)(nil),                  // 24: google.protobuf.Duration
-	(*v32.Tracing)(nil),                        // 25: envoy.config.trace.v3.Tracing
-	(*v33.OverloadManager)(nil),                // 26: envoy.config.overload.v3.OverloadManager
-	(*wrappers.UInt64Value)(nil),               // 27: google.protobuf.UInt64Value
-	(*v3.DnsResolutionConfig)(nil),             // 28: envoy.config.core.v3.DnsResolutionConfig
-	(*v3.TypedExtensionConfig)(nil),            // 29: envoy.config.core.v3.TypedExtensionConfig
-	(*v3.ConfigSource)(nil),                    // 30: envoy.config.core.v3.ConfigSource
-	(*v34.AccessLog)(nil),                      // 31: envoy.config.accesslog.v3.AccessLog
-	(*v3.Address)(nil),                         // 32: envoy.config.core.v3.Address
-	(*v3.SocketOption)(nil),                    // 33: envoy.config.core.v3.SocketOption
-	(*v3.BindConfig)(nil),                      // 34: envoy.config.core.v3.BindConfig
-	(*v35.Percent)(nil),                        // 35: envoy.type.v3.Percent
-	(*_struct.Struct)(nil),                     // 36: google.protobuf.Struct
-	(*v36.Listener)(nil),                       // 37: envoy.config.listener.v3.Listener
-	(*v37.Cluster)(nil),                        // 38: envoy.config.cluster.v3.Cluster
-	(*v38.Secret)(nil),                         // 39: envoy.extensions.transport_sockets.tls.v3.Secret
-	(*v3.EventServiceConfig)(nil),              // 40: envoy.config.core.v3.EventServiceConfig
+	(Watchdog_WatchdogAction_WatchdogEvent)(0),     // 0: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.WatchdogEvent
+	(CustomInlineHeader_InlineHeaderType)(0),       // 1: envoy.config.bootstrap.v3.CustomInlineHeader.InlineHeaderType
+	(*Bootstrap)(nil),                              // 2: envoy.config.bootstrap.v3.Bootstrap
+	(*Admin)(nil),                                  // 3: envoy.config.bootstrap.v3.Admin
+	(*ClusterManager)(nil),                         // 4: envoy.config.bootstrap.v3.ClusterManager
+	(*Watchdogs)(nil),                              // 5: envoy.config.bootstrap.v3.Watchdogs
+	(*Watchdog)(nil),                               // 6: envoy.config.bootstrap.v3.Watchdog
+	(*FatalAction)(nil),                            // 7: envoy.config.bootstrap.v3.FatalAction
+	(*Runtime)(nil),                                // 8: envoy.config.bootstrap.v3.Runtime
+	(*RuntimeLayer)(nil),                           // 9: envoy.config.bootstrap.v3.RuntimeLayer
+	(*LayeredRuntime)(nil),                         // 10: envoy.config.bootstrap.v3.LayeredRuntime
+	(*CustomInlineHeader)(nil),                     // 11: envoy.config.bootstrap.v3.CustomInlineHeader
+	(*Bootstrap_StaticResources)(nil),              // 12: envoy.config.bootstrap.v3.Bootstrap.StaticResources
+	(*Bootstrap_DynamicResources)(nil),             // 13: envoy.config.bootstrap.v3.Bootstrap.DynamicResources
+	(*Bootstrap_ApplicationLogConfig)(nil),         // 14: envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig
+	(*Bootstrap_DeferredStatOptions)(nil),          // 15: envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions
+	(*Bootstrap_GrpcAsyncClientManagerConfig)(nil), // 16: envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig
+	nil, // 17: envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry
+	(*Bootstrap_ApplicationLogConfig_LogFormat)(nil), // 18: envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat
+	(*ClusterManager_OutlierDetection)(nil),          // 19: envoy.config.bootstrap.v3.ClusterManager.OutlierDetection
+	(*Watchdog_WatchdogAction)(nil),                  // 20: envoy.config.bootstrap.v3.Watchdog.WatchdogAction
+	(*RuntimeLayer_DiskLayer)(nil),                   // 21: envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer
+	(*RuntimeLayer_AdminLayer)(nil),                  // 22: envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer
+	(*RuntimeLayer_RtdsLayer)(nil),                   // 23: envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer
+	(*v3.Node)(nil),                                  // 24: envoy.config.core.v3.Node
+	(*v3.ApiConfigSource)(nil),                       // 25: envoy.config.core.v3.ApiConfigSource
+	(*v31.StatsSink)(nil),                            // 26: envoy.config.metrics.v3.StatsSink
+	(*v31.StatsConfig)(nil),                          // 27: envoy.config.metrics.v3.StatsConfig
+	(*duration.Duration)(nil),                        // 28: google.protobuf.Duration
+	(*v32.Tracing)(nil),                              // 29: envoy.config.trace.v3.Tracing
+	(*v33.OverloadManager)(nil),                      // 30: envoy.config.overload.v3.OverloadManager
+	(*wrappers.UInt64Value)(nil),                     // 31: google.protobuf.UInt64Value
+	(*v3.DnsResolutionConfig)(nil),                   // 32: envoy.config.core.v3.DnsResolutionConfig
+	(*v3.TypedExtensionConfig)(nil),                  // 33: envoy.config.core.v3.TypedExtensionConfig
+	(*v3.ConfigSource)(nil),                          // 34: envoy.config.core.v3.ConfigSource
+	(*v34.AccessLog)(nil),                            // 35: envoy.config.accesslog.v3.AccessLog
+	(*v3.Address)(nil),                               // 36: envoy.config.core.v3.Address
+	(*v3.SocketOption)(nil),                          // 37: envoy.config.core.v3.SocketOption
+	(*v3.BindConfig)(nil),                            // 38: envoy.config.core.v3.BindConfig
+	(*v35.Percent)(nil),                              // 39: envoy.type.v3.Percent
+	(*_struct.Struct)(nil),                           // 40: google.protobuf.Struct
+	(*v36.Listener)(nil),                             // 41: envoy.config.listener.v3.Listener
+	(*v37.Cluster)(nil),                              // 42: envoy.config.cluster.v3.Cluster
+	(*v38.Secret)(nil),                               // 43: envoy.extensions.transport_sockets.tls.v3.Secret
+	(*v3.EventServiceConfig)(nil),                    // 44: envoy.config.core.v3.EventServiceConfig
 }
 var file_envoy_config_bootstrap_v3_bootstrap_proto_depIdxs = []int32{
-	20, // 0: envoy.config.bootstrap.v3.Bootstrap.node:type_name -> envoy.config.core.v3.Node
+	24, // 0: envoy.config.bootstrap.v3.Bootstrap.node:type_name -> envoy.config.core.v3.Node
 	12, // 1: envoy.config.bootstrap.v3.Bootstrap.static_resources:type_name -> envoy.config.bootstrap.v3.Bootstrap.StaticResources
 	13, // 2: envoy.config.bootstrap.v3.Bootstrap.dynamic_resources:type_name -> envoy.config.bootstrap.v3.Bootstrap.DynamicResources
 	4,  // 3: envoy.config.bootstrap.v3.Bootstrap.cluster_manager:type_name -> envoy.config.bootstrap.v3.ClusterManager
-	21, // 4: envoy.config.bootstrap.v3.Bootstrap.hds_config:type_name -> envoy.config.core.v3.ApiConfigSource
-	22, // 5: envoy.config.bootstrap.v3.Bootstrap.stats_sinks:type_name -> envoy.config.metrics.v3.StatsSink
-	23, // 6: envoy.config.bootstrap.v3.Bootstrap.stats_config:type_name -> envoy.config.metrics.v3.StatsConfig
-	24, // 7: envoy.config.bootstrap.v3.Bootstrap.stats_flush_interval:type_name -> google.protobuf.Duration
-	6,  // 8: envoy.config.bootstrap.v3.Bootstrap.watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
-	5,  // 9: envoy.config.bootstrap.v3.Bootstrap.watchdogs:type_name -> envoy.config.bootstrap.v3.Watchdogs
-	25, // 10: envoy.config.bootstrap.v3.Bootstrap.tracing:type_name -> envoy.config.trace.v3.Tracing
-	10, // 11: envoy.config.bootstrap.v3.Bootstrap.layered_runtime:type_name -> envoy.config.bootstrap.v3.LayeredRuntime
-	3,  // 12: envoy.config.bootstrap.v3.Bootstrap.admin:type_name -> envoy.config.bootstrap.v3.Admin
-	26, // 13: envoy.config.bootstrap.v3.Bootstrap.overload_manager:type_name -> envoy.config.overload.v3.OverloadManager
-	27, // 14: envoy.config.bootstrap.v3.Bootstrap.stats_server_version_override:type_name -> google.protobuf.UInt64Value
-	28, // 15: envoy.config.bootstrap.v3.Bootstrap.dns_resolution_config:type_name -> envoy.config.core.v3.DnsResolutionConfig
-	29, // 16: envoy.config.bootstrap.v3.Bootstrap.typed_dns_resolver_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	29, // 17: envoy.config.bootstrap.v3.Bootstrap.bootstrap_extensions:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	7,  // 18: envoy.config.bootstrap.v3.Bootstrap.fatal_actions:type_name -> envoy.config.bootstrap.v3.FatalAction
-	30, // 19: envoy.config.bootstrap.v3.Bootstrap.config_sources:type_name -> envoy.config.core.v3.ConfigSource
-	30, // 20: envoy.config.bootstrap.v3.Bootstrap.default_config_source:type_name -> envoy.config.core.v3.ConfigSource
-	14, // 21: envoy.config.bootstrap.v3.Bootstrap.certificate_provider_instances:type_name -> envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry
-	11, // 22: envoy.config.bootstrap.v3.Bootstrap.inline_headers:type_name -> envoy.config.bootstrap.v3.CustomInlineHeader
-	29, // 23: envoy.config.bootstrap.v3.Bootstrap.default_regex_engine:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	29, // 24: envoy.config.bootstrap.v3.Bootstrap.xds_delegate_extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	29, // 25: envoy.config.bootstrap.v3.Bootstrap.xds_config_tracker_extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	29, // 26: envoy.config.bootstrap.v3.Bootstrap.listener_manager:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	31, // 27: envoy.config.bootstrap.v3.Admin.access_log:type_name -> envoy.config.accesslog.v3.AccessLog
-	32, // 28: envoy.config.bootstrap.v3.Admin.address:type_name -> envoy.config.core.v3.Address
-	33, // 29: envoy.config.bootstrap.v3.Admin.socket_options:type_name -> envoy.config.core.v3.SocketOption
-	15, // 30: envoy.config.bootstrap.v3.ClusterManager.outlier_detection:type_name -> envoy.config.bootstrap.v3.ClusterManager.OutlierDetection
-	34, // 31: envoy.config.bootstrap.v3.ClusterManager.upstream_bind_config:type_name -> envoy.config.core.v3.BindConfig
-	21, // 32: envoy.config.bootstrap.v3.ClusterManager.load_stats_config:type_name -> envoy.config.core.v3.ApiConfigSource
-	6,  // 33: envoy.config.bootstrap.v3.Watchdogs.main_thread_watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
-	6,  // 34: envoy.config.bootstrap.v3.Watchdogs.worker_watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
-	16, // 35: envoy.config.bootstrap.v3.Watchdog.actions:type_name -> envoy.config.bootstrap.v3.Watchdog.WatchdogAction
-	24, // 36: envoy.config.bootstrap.v3.Watchdog.miss_timeout:type_name -> google.protobuf.Duration
-	24, // 37: envoy.config.bootstrap.v3.Watchdog.megamiss_timeout:type_name -> google.protobuf.Duration
-	24, // 38: envoy.config.bootstrap.v3.Watchdog.kill_timeout:type_name -> google.protobuf.Duration
-	24, // 39: envoy.config.bootstrap.v3.Watchdog.max_kill_timeout_jitter:type_name -> google.protobuf.Duration
-	24, // 40: envoy.config.bootstrap.v3.Watchdog.multikill_timeout:type_name -> google.protobuf.Duration
-	35, // 41: envoy.config.bootstrap.v3.Watchdog.multikill_threshold:type_name -> envoy.type.v3.Percent
-	29, // 42: envoy.config.bootstrap.v3.FatalAction.config:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	36, // 43: envoy.config.bootstrap.v3.Runtime.base:type_name -> google.protobuf.Struct
-	36, // 44: envoy.config.bootstrap.v3.RuntimeLayer.static_layer:type_name -> google.protobuf.Struct
-	17, // 45: envoy.config.bootstrap.v3.RuntimeLayer.disk_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer
-	18, // 46: envoy.config.bootstrap.v3.RuntimeLayer.admin_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer
-	19, // 47: envoy.config.bootstrap.v3.RuntimeLayer.rtds_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer
-	9,  // 48: envoy.config.bootstrap.v3.LayeredRuntime.layers:type_name -> envoy.config.bootstrap.v3.RuntimeLayer
-	1,  // 49: envoy.config.bootstrap.v3.CustomInlineHeader.inline_header_type:type_name -> envoy.config.bootstrap.v3.CustomInlineHeader.InlineHeaderType
-	37, // 50: envoy.config.bootstrap.v3.Bootstrap.StaticResources.listeners:type_name -> envoy.config.listener.v3.Listener
-	38, // 51: envoy.config.bootstrap.v3.Bootstrap.StaticResources.clusters:type_name -> envoy.config.cluster.v3.Cluster
-	39, // 52: envoy.config.bootstrap.v3.Bootstrap.StaticResources.secrets:type_name -> envoy.extensions.transport_sockets.tls.v3.Secret
-	30, // 53: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.lds_config:type_name -> envoy.config.core.v3.ConfigSource
-	30, // 54: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.cds_config:type_name -> envoy.config.core.v3.ConfigSource
-	21, // 55: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.ads_config:type_name -> envoy.config.core.v3.ApiConfigSource
-	29, // 56: envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry.value:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	40, // 57: envoy.config.bootstrap.v3.ClusterManager.OutlierDetection.event_service:type_name -> envoy.config.core.v3.EventServiceConfig
-	29, // 58: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.config:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	0,  // 59: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.event:type_name -> envoy.config.bootstrap.v3.Watchdog.WatchdogAction.WatchdogEvent
-	30, // 60: envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer.rtds_config:type_name -> envoy.config.core.v3.ConfigSource
-	61, // [61:61] is the sub-list for method output_type
-	61, // [61:61] is the sub-list for method input_type
-	61, // [61:61] is the sub-list for extension type_name
-	61, // [61:61] is the sub-list for extension extendee
-	0,  // [0:61] is the sub-list for field type_name
+	25, // 4: envoy.config.bootstrap.v3.Bootstrap.hds_config:type_name -> envoy.config.core.v3.ApiConfigSource
+	26, // 5: envoy.config.bootstrap.v3.Bootstrap.stats_sinks:type_name -> envoy.config.metrics.v3.StatsSink
+	15, // 6: envoy.config.bootstrap.v3.Bootstrap.deferred_stat_options:type_name -> envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions
+	27, // 7: envoy.config.bootstrap.v3.Bootstrap.stats_config:type_name -> envoy.config.metrics.v3.StatsConfig
+	28, // 8: envoy.config.bootstrap.v3.Bootstrap.stats_flush_interval:type_name -> google.protobuf.Duration
+	6,  // 9: envoy.config.bootstrap.v3.Bootstrap.watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
+	5,  // 10: envoy.config.bootstrap.v3.Bootstrap.watchdogs:type_name -> envoy.config.bootstrap.v3.Watchdogs
+	29, // 11: envoy.config.bootstrap.v3.Bootstrap.tracing:type_name -> envoy.config.trace.v3.Tracing
+	10, // 12: envoy.config.bootstrap.v3.Bootstrap.layered_runtime:type_name -> envoy.config.bootstrap.v3.LayeredRuntime
+	3,  // 13: envoy.config.bootstrap.v3.Bootstrap.admin:type_name -> envoy.config.bootstrap.v3.Admin
+	30, // 14: envoy.config.bootstrap.v3.Bootstrap.overload_manager:type_name -> envoy.config.overload.v3.OverloadManager
+	31, // 15: envoy.config.bootstrap.v3.Bootstrap.stats_server_version_override:type_name -> google.protobuf.UInt64Value
+	32, // 16: envoy.config.bootstrap.v3.Bootstrap.dns_resolution_config:type_name -> envoy.config.core.v3.DnsResolutionConfig
+	33, // 17: envoy.config.bootstrap.v3.Bootstrap.typed_dns_resolver_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	33, // 18: envoy.config.bootstrap.v3.Bootstrap.bootstrap_extensions:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	7,  // 19: envoy.config.bootstrap.v3.Bootstrap.fatal_actions:type_name -> envoy.config.bootstrap.v3.FatalAction
+	34, // 20: envoy.config.bootstrap.v3.Bootstrap.config_sources:type_name -> envoy.config.core.v3.ConfigSource
+	34, // 21: envoy.config.bootstrap.v3.Bootstrap.default_config_source:type_name -> envoy.config.core.v3.ConfigSource
+	17, // 22: envoy.config.bootstrap.v3.Bootstrap.certificate_provider_instances:type_name -> envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry
+	11, // 23: envoy.config.bootstrap.v3.Bootstrap.inline_headers:type_name -> envoy.config.bootstrap.v3.CustomInlineHeader
+	33, // 24: envoy.config.bootstrap.v3.Bootstrap.default_regex_engine:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	33, // 25: envoy.config.bootstrap.v3.Bootstrap.xds_delegate_extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	33, // 26: envoy.config.bootstrap.v3.Bootstrap.xds_config_tracker_extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	33, // 27: envoy.config.bootstrap.v3.Bootstrap.listener_manager:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	14, // 28: envoy.config.bootstrap.v3.Bootstrap.application_log_config:type_name -> envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig
+	16, // 29: envoy.config.bootstrap.v3.Bootstrap.grpc_async_client_manager_config:type_name -> envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig
+	35, // 30: envoy.config.bootstrap.v3.Admin.access_log:type_name -> envoy.config.accesslog.v3.AccessLog
+	36, // 31: envoy.config.bootstrap.v3.Admin.address:type_name -> envoy.config.core.v3.Address
+	37, // 32: envoy.config.bootstrap.v3.Admin.socket_options:type_name -> envoy.config.core.v3.SocketOption
+	19, // 33: envoy.config.bootstrap.v3.ClusterManager.outlier_detection:type_name -> envoy.config.bootstrap.v3.ClusterManager.OutlierDetection
+	38, // 34: envoy.config.bootstrap.v3.ClusterManager.upstream_bind_config:type_name -> envoy.config.core.v3.BindConfig
+	25, // 35: envoy.config.bootstrap.v3.ClusterManager.load_stats_config:type_name -> envoy.config.core.v3.ApiConfigSource
+	6,  // 36: envoy.config.bootstrap.v3.Watchdogs.main_thread_watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
+	6,  // 37: envoy.config.bootstrap.v3.Watchdogs.worker_watchdog:type_name -> envoy.config.bootstrap.v3.Watchdog
+	20, // 38: envoy.config.bootstrap.v3.Watchdog.actions:type_name -> envoy.config.bootstrap.v3.Watchdog.WatchdogAction
+	28, // 39: envoy.config.bootstrap.v3.Watchdog.miss_timeout:type_name -> google.protobuf.Duration
+	28, // 40: envoy.config.bootstrap.v3.Watchdog.megamiss_timeout:type_name -> google.protobuf.Duration
+	28, // 41: envoy.config.bootstrap.v3.Watchdog.kill_timeout:type_name -> google.protobuf.Duration
+	28, // 42: envoy.config.bootstrap.v3.Watchdog.max_kill_timeout_jitter:type_name -> google.protobuf.Duration
+	28, // 43: envoy.config.bootstrap.v3.Watchdog.multikill_timeout:type_name -> google.protobuf.Duration
+	39, // 44: envoy.config.bootstrap.v3.Watchdog.multikill_threshold:type_name -> envoy.type.v3.Percent
+	33, // 45: envoy.config.bootstrap.v3.FatalAction.config:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	40, // 46: envoy.config.bootstrap.v3.Runtime.base:type_name -> google.protobuf.Struct
+	40, // 47: envoy.config.bootstrap.v3.RuntimeLayer.static_layer:type_name -> google.protobuf.Struct
+	21, // 48: envoy.config.bootstrap.v3.RuntimeLayer.disk_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer
+	22, // 49: envoy.config.bootstrap.v3.RuntimeLayer.admin_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer
+	23, // 50: envoy.config.bootstrap.v3.RuntimeLayer.rtds_layer:type_name -> envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer
+	9,  // 51: envoy.config.bootstrap.v3.LayeredRuntime.layers:type_name -> envoy.config.bootstrap.v3.RuntimeLayer
+	1,  // 52: envoy.config.bootstrap.v3.CustomInlineHeader.inline_header_type:type_name -> envoy.config.bootstrap.v3.CustomInlineHeader.InlineHeaderType
+	41, // 53: envoy.config.bootstrap.v3.Bootstrap.StaticResources.listeners:type_name -> envoy.config.listener.v3.Listener
+	42, // 54: envoy.config.bootstrap.v3.Bootstrap.StaticResources.clusters:type_name -> envoy.config.cluster.v3.Cluster
+	43, // 55: envoy.config.bootstrap.v3.Bootstrap.StaticResources.secrets:type_name -> envoy.extensions.transport_sockets.tls.v3.Secret
+	34, // 56: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.lds_config:type_name -> envoy.config.core.v3.ConfigSource
+	34, // 57: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.cds_config:type_name -> envoy.config.core.v3.ConfigSource
+	25, // 58: envoy.config.bootstrap.v3.Bootstrap.DynamicResources.ads_config:type_name -> envoy.config.core.v3.ApiConfigSource
+	18, // 59: envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.log_format:type_name -> envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat
+	28, // 60: envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig.max_cached_entry_idle_duration:type_name -> google.protobuf.Duration
+	33, // 61: envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry.value:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	40, // 62: envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat.json_format:type_name -> google.protobuf.Struct
+	44, // 63: envoy.config.bootstrap.v3.ClusterManager.OutlierDetection.event_service:type_name -> envoy.config.core.v3.EventServiceConfig
+	33, // 64: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.config:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	0,  // 65: envoy.config.bootstrap.v3.Watchdog.WatchdogAction.event:type_name -> envoy.config.bootstrap.v3.Watchdog.WatchdogAction.WatchdogEvent
+	34, // 66: envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer.rtds_config:type_name -> envoy.config.core.v3.ConfigSource
+	67, // [67:67] is the sub-list for method output_type
+	67, // [67:67] is the sub-list for method input_type
+	67, // [67:67] is the sub-list for extension type_name
+	67, // [67:67] is the sub-list for extension extendee
+	0,  // [0:67] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_bootstrap_v3_bootstrap_proto_init() }
@@ -2712,8 +3065,20 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 				return nil
 			}
 		}
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Bootstrap_ApplicationLogConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClusterManager_OutlierDetection); i {
+			switch v := v.(*Bootstrap_DeferredStatOptions); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2725,6 +3090,42 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 			}
 		}
 		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Bootstrap_GrpcAsyncClientManagerConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Bootstrap_ApplicationLogConfig_LogFormat); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClusterManager_OutlierDetection); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Watchdog_WatchdogAction); i {
 			case 0:
 				return &v.state
@@ -2736,7 +3137,7 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RuntimeLayer_DiskLayer); i {
 			case 0:
 				return &v.state
@@ -2748,7 +3149,7 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RuntimeLayer_AdminLayer); i {
 			case 0:
 				return &v.state
@@ -2760,7 +3161,7 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RuntimeLayer_RtdsLayer); i {
 			case 0:
 				return &v.state
@@ -2782,13 +3183,17 @@ func file_envoy_config_bootstrap_v3_bootstrap_proto_init() {
 		(*RuntimeLayer_AdminLayer_)(nil),
 		(*RuntimeLayer_RtdsLayer_)(nil),
 	}
+	file_envoy_config_bootstrap_v3_bootstrap_proto_msgTypes[16].OneofWrappers = []interface{}{
+		(*Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat)(nil),
+		(*Bootstrap_ApplicationLogConfig_LogFormat_TextFormat)(nil),
+	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_config_bootstrap_v3_bootstrap_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   18,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.validate.go
index 0537932c0fe..762370613cf 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3/bootstrap.pb.validate.go
@@ -239,6 +239,35 @@ func (m *Bootstrap) validate(all bool) error {
 	}
 
 	if all {
+		switch v := interface{}(m.GetDeferredStatOptions()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "DeferredStatOptions",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "DeferredStatOptions",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetDeferredStatOptions()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return BootstrapValidationError{
+				field:  "DeferredStatOptions",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if all {
 		switch v := interface{}(m.GetStatsConfig()).(type) {
 		case interface{ ValidateAll() error }:
 			if err := v.ValidateAll(); err != nil {
@@ -896,6 +925,64 @@ func (m *Bootstrap) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetApplicationLogConfig()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "ApplicationLogConfig",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "ApplicationLogConfig",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetApplicationLogConfig()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return BootstrapValidationError{
+				field:  "ApplicationLogConfig",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if all {
+		switch v := interface{}(m.GetGrpcAsyncClientManagerConfig()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "GrpcAsyncClientManagerConfig",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, BootstrapValidationError{
+					field:  "GrpcAsyncClientManagerConfig",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetGrpcAsyncClientManagerConfig()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return BootstrapValidationError{
+				field:  "GrpcAsyncClientManagerConfig",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	switch v := m.StatsFlush.(type) {
 	case *Bootstrap_StatsFlushOnAdmin:
 		if v == nil {
@@ -1313,6 +1400,8 @@ func (m *ClusterManager) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for EnableDeferredClusterCreation
+
 	if len(errors) > 0 {
 		return ClusterManagerMultiError(errors)
 	}
@@ -3079,6 +3168,556 @@ var _ interface {
 	ErrorName() string
 } = Bootstrap_DynamicResourcesValidationError{}
 
+// Validate checks the field values on Bootstrap_ApplicationLogConfig with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the first error encountered is returned, or nil if there are no violations.
+func (m *Bootstrap_ApplicationLogConfig) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on Bootstrap_ApplicationLogConfig with
+// the rules defined in the proto definition for this message. If any rules
+// are violated, the result is a list of violation errors wrapped in
+// Bootstrap_ApplicationLogConfigMultiError, or nil if none found.
+func (m *Bootstrap_ApplicationLogConfig) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *Bootstrap_ApplicationLogConfig) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if all {
+		switch v := interface{}(m.GetLogFormat()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, Bootstrap_ApplicationLogConfigValidationError{
+					field:  "LogFormat",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, Bootstrap_ApplicationLogConfigValidationError{
+					field:  "LogFormat",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetLogFormat()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return Bootstrap_ApplicationLogConfigValidationError{
+				field:  "LogFormat",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if len(errors) > 0 {
+		return Bootstrap_ApplicationLogConfigMultiError(errors)
+	}
+
+	return nil
+}
+
+// Bootstrap_ApplicationLogConfigMultiError is an error wrapping multiple
+// validation errors returned by Bootstrap_ApplicationLogConfig.ValidateAll()
+// if the designated constraints aren't met.
+type Bootstrap_ApplicationLogConfigMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m Bootstrap_ApplicationLogConfigMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m Bootstrap_ApplicationLogConfigMultiError) AllErrors() []error { return m }
+
+// Bootstrap_ApplicationLogConfigValidationError is the validation error
+// returned by Bootstrap_ApplicationLogConfig.Validate if the designated
+// constraints aren't met.
+type Bootstrap_ApplicationLogConfigValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e Bootstrap_ApplicationLogConfigValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e Bootstrap_ApplicationLogConfigValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e Bootstrap_ApplicationLogConfigValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e Bootstrap_ApplicationLogConfigValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e Bootstrap_ApplicationLogConfigValidationError) ErrorName() string {
+	return "Bootstrap_ApplicationLogConfigValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e Bootstrap_ApplicationLogConfigValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sBootstrap_ApplicationLogConfig.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = Bootstrap_ApplicationLogConfigValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = Bootstrap_ApplicationLogConfigValidationError{}
+
+// Validate checks the field values on Bootstrap_DeferredStatOptions with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the first error encountered is returned, or nil if there are no violations.
+func (m *Bootstrap_DeferredStatOptions) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on Bootstrap_DeferredStatOptions with
+// the rules defined in the proto definition for this message. If any rules
+// are violated, the result is a list of violation errors wrapped in
+// Bootstrap_DeferredStatOptionsMultiError, or nil if none found.
+func (m *Bootstrap_DeferredStatOptions) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *Bootstrap_DeferredStatOptions) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	// no validation rules for EnableDeferredCreationStats
+
+	if len(errors) > 0 {
+		return Bootstrap_DeferredStatOptionsMultiError(errors)
+	}
+
+	return nil
+}
+
+// Bootstrap_DeferredStatOptionsMultiError is an error wrapping multiple
+// validation errors returned by Bootstrap_DeferredStatOptions.ValidateAll()
+// if the designated constraints aren't met.
+type Bootstrap_DeferredStatOptionsMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m Bootstrap_DeferredStatOptionsMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m Bootstrap_DeferredStatOptionsMultiError) AllErrors() []error { return m }
+
+// Bootstrap_DeferredStatOptionsValidationError is the validation error
+// returned by Bootstrap_DeferredStatOptions.Validate if the designated
+// constraints aren't met.
+type Bootstrap_DeferredStatOptionsValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e Bootstrap_DeferredStatOptionsValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e Bootstrap_DeferredStatOptionsValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e Bootstrap_DeferredStatOptionsValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e Bootstrap_DeferredStatOptionsValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e Bootstrap_DeferredStatOptionsValidationError) ErrorName() string {
+	return "Bootstrap_DeferredStatOptionsValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e Bootstrap_DeferredStatOptionsValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sBootstrap_DeferredStatOptions.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = Bootstrap_DeferredStatOptionsValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = Bootstrap_DeferredStatOptionsValidationError{}
+
+// Validate checks the field values on Bootstrap_GrpcAsyncClientManagerConfig
+// with the rules defined in the proto definition for this message. If any
+// rules are violated, the first error encountered is returned, or nil if
+// there are no violations.
+func (m *Bootstrap_GrpcAsyncClientManagerConfig) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on
+// Bootstrap_GrpcAsyncClientManagerConfig with the rules defined in the proto
+// definition for this message. If any rules are violated, the result is a
+// list of violation errors wrapped in
+// Bootstrap_GrpcAsyncClientManagerConfigMultiError, or nil if none found.
+func (m *Bootstrap_GrpcAsyncClientManagerConfig) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *Bootstrap_GrpcAsyncClientManagerConfig) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if d := m.GetMaxCachedEntryIdleDuration(); d != nil {
+		dur, err := d.AsDuration(), d.CheckValid()
+		if err != nil {
+			err = Bootstrap_GrpcAsyncClientManagerConfigValidationError{
+				field:  "MaxCachedEntryIdleDuration",
+				reason: "value is not a valid duration",
+				cause:  err,
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		} else {
+
+			gte := time.Duration(5*time.Second + 0*time.Nanosecond)
+
+			if dur < gte {
+				err := Bootstrap_GrpcAsyncClientManagerConfigValidationError{
+					field:  "MaxCachedEntryIdleDuration",
+					reason: "value must be greater than or equal to 5s",
+				}
+				if !all {
+					return err
+				}
+				errors = append(errors, err)
+			}
+
+		}
+	}
+
+	if len(errors) > 0 {
+		return Bootstrap_GrpcAsyncClientManagerConfigMultiError(errors)
+	}
+
+	return nil
+}
+
+// Bootstrap_GrpcAsyncClientManagerConfigMultiError is an error wrapping
+// multiple validation errors returned by
+// Bootstrap_GrpcAsyncClientManagerConfig.ValidateAll() if the designated
+// constraints aren't met.
+type Bootstrap_GrpcAsyncClientManagerConfigMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m Bootstrap_GrpcAsyncClientManagerConfigMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m Bootstrap_GrpcAsyncClientManagerConfigMultiError) AllErrors() []error { return m }
+
+// Bootstrap_GrpcAsyncClientManagerConfigValidationError is the validation
+// error returned by Bootstrap_GrpcAsyncClientManagerConfig.Validate if the
+// designated constraints aren't met.
+type Bootstrap_GrpcAsyncClientManagerConfigValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) ErrorName() string {
+	return "Bootstrap_GrpcAsyncClientManagerConfigValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e Bootstrap_GrpcAsyncClientManagerConfigValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sBootstrap_GrpcAsyncClientManagerConfig.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = Bootstrap_GrpcAsyncClientManagerConfigValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = Bootstrap_GrpcAsyncClientManagerConfigValidationError{}
+
+// Validate checks the field values on Bootstrap_ApplicationLogConfig_LogFormat
+// with the rules defined in the proto definition for this message. If any
+// rules are violated, the first error encountered is returned, or nil if
+// there are no violations.
+func (m *Bootstrap_ApplicationLogConfig_LogFormat) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on
+// Bootstrap_ApplicationLogConfig_LogFormat with the rules defined in the
+// proto definition for this message. If any rules are violated, the result is
+// a list of violation errors wrapped in
+// Bootstrap_ApplicationLogConfig_LogFormatMultiError, or nil if none found.
+func (m *Bootstrap_ApplicationLogConfig_LogFormat) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *Bootstrap_ApplicationLogConfig_LogFormat) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	oneofLogFormatPresent := false
+	switch v := m.LogFormat.(type) {
+	case *Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat:
+		if v == nil {
+			err := Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+				field:  "LogFormat",
+				reason: "oneof value cannot be a typed-nil",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+		oneofLogFormatPresent = true
+
+		if all {
+			switch v := interface{}(m.GetJsonFormat()).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+						field:  "JsonFormat",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+						field:  "JsonFormat",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(m.GetJsonFormat()).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+					field:  "JsonFormat",
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	case *Bootstrap_ApplicationLogConfig_LogFormat_TextFormat:
+		if v == nil {
+			err := Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+				field:  "LogFormat",
+				reason: "oneof value cannot be a typed-nil",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+		oneofLogFormatPresent = true
+		// no validation rules for TextFormat
+	default:
+		_ = v // ensures v is used
+	}
+	if !oneofLogFormatPresent {
+		err := Bootstrap_ApplicationLogConfig_LogFormatValidationError{
+			field:  "LogFormat",
+			reason: "value is required",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if len(errors) > 0 {
+		return Bootstrap_ApplicationLogConfig_LogFormatMultiError(errors)
+	}
+
+	return nil
+}
+
+// Bootstrap_ApplicationLogConfig_LogFormatMultiError is an error wrapping
+// multiple validation errors returned by
+// Bootstrap_ApplicationLogConfig_LogFormat.ValidateAll() if the designated
+// constraints aren't met.
+type Bootstrap_ApplicationLogConfig_LogFormatMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m Bootstrap_ApplicationLogConfig_LogFormatMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m Bootstrap_ApplicationLogConfig_LogFormatMultiError) AllErrors() []error { return m }
+
+// Bootstrap_ApplicationLogConfig_LogFormatValidationError is the validation
+// error returned by Bootstrap_ApplicationLogConfig_LogFormat.Validate if the
+// designated constraints aren't met.
+type Bootstrap_ApplicationLogConfig_LogFormatValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) ErrorName() string {
+	return "Bootstrap_ApplicationLogConfig_LogFormatValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e Bootstrap_ApplicationLogConfig_LogFormatValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sBootstrap_ApplicationLogConfig_LogFormat.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = Bootstrap_ApplicationLogConfig_LogFormatValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = Bootstrap_ApplicationLogConfig_LogFormatValidationError{}
+
 // Validate checks the field values on ClusterManager_OutlierDetection with the
 // rules defined in the proto definition for this message. If any rules are
 // violated, the first error encountered is returned, or nil if there are no violations.
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/circuit_breaker.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/circuit_breaker.pb.go
index 264ea82efaa..d3d0c93d44f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/circuit_breaker.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/circuit_breaker.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/cluster/v3/circuit_breaker.proto
 
 package clusterv3
@@ -41,8 +41,9 @@ type CircuitBreakers struct {
 	// Optional per-host limits which apply to each individual host in a cluster.
 	//
 	// .. note::
-	//  currently only the :ref:`max_connections
-	//  <envoy_v3_api_field_config.cluster.v3.CircuitBreakers.Thresholds.max_connections>` field is supported for per-host limits.
+	//
+	//	currently only the :ref:`max_connections
+	//	<envoy_v3_api_field_config.cluster.v3.CircuitBreakers.Thresholds.max_connections>` field is supported for per-host limits.
 	//
 	// If multiple per-host :ref:`Thresholds<envoy_v3_api_msg_config.cluster.v3.CircuitBreakers.Thresholds>`
 	// are defined with the same :ref:`RoutingPriority<envoy_v3_api_enum_config.core.v3.RoutingPriority>`,
@@ -128,8 +129,8 @@ type CircuitBreakers_Thresholds struct {
 	//
 	// .. note::
 	//
-	//    If this field is set, the retry budget will override any configured retry circuit
-	//    breaker.
+	//	If this field is set, the retry budget will override any configured retry circuit
+	//	breaker.
 	RetryBudget *CircuitBreakers_Thresholds_RetryBudget `protobuf:"bytes,8,opt,name=retry_budget,json=retryBudget,proto3" json:"retry_budget,omitempty"`
 	// If track_remaining is true, then stats will be published that expose
 	// the number of resources remaining until the circuit breakers open. If
@@ -137,8 +138,8 @@ type CircuitBreakers_Thresholds struct {
 	//
 	// .. note::
 	//
-	//    If a retry budget is used in lieu of the max_retries circuit breaker,
-	//    the remaining retry resources remaining will not be tracked.
+	//	If a retry budget is used in lieu of the max_retries circuit breaker,
+	//	the remaining retry resources remaining will not be tracked.
 	TrackRemaining bool `protobuf:"varint,6,opt,name=track_remaining,json=trackRemaining,proto3" json:"track_remaining,omitempty"`
 	// The maximum number of connection pools per cluster that Envoy will concurrently support at
 	// once. If not specified, the default is unlimited. Set this for clusters which create a
@@ -389,16 +390,16 @@ var file_envoy_config_cluster_v3_circuit_breaker_proto_rawDesc = []byte{
 	0x73, 0x2e, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x3a, 0x2b, 0x9a, 0xc5,
 	0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
 	0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69,
-	0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x42, 0x90, 0x01, 0x0a, 0x25, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x42, 0x13, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61,
-	0x6b, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x42, 0x90, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x43, 0x69, 0x72,
+	0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f,
+	0x76, 0x33, 0x3b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.go
index 4e68a99cfcf..1356af8e474 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/cluster/v3/cluster.proto
 
 package clusterv3
@@ -12,6 +12,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/annotations"
 	v32 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	v31 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
+	v34 "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3"
 	v33 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	any1 "github.com/golang/protobuf/ptypes/any"
@@ -371,12 +372,12 @@ type Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy int32
 const (
 	// No fallback. Route metadata will be used as-is.
 	Cluster_LbSubsetConfig_METADATA_NO_FALLBACK Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy = 0
-	// A special metadata key ``fallback_list`` will be used to provide variants of metadata to try.
-	// Value of ``fallback_list`` key has to be a list. Every list element has to be a struct - it will
+	// A special metadata key “fallback_list“ will be used to provide variants of metadata to try.
+	// Value of “fallback_list“ key has to be a list. Every list element has to be a struct - it will
 	// be merged with route metadata, overriding keys that appear in both places.
-	// ``fallback_list`` entries will be used in order until a host is found.
+	// “fallback_list“ entries will be used in order until a host is found.
 	//
-	// ``fallback_list`` key itself is removed from metadata before subset load balancing is performed.
+	// “fallback_list“ key itself is removed from metadata before subset load balancing is performed.
 	//
 	// Example:
 	//
@@ -384,30 +385,30 @@ const (
 	//
 	// .. code-block:: yaml
 	//
-	//   version: 1.0
-	//   fallback_list:
-	//     - version: 2.0
-	//       hardware: c64
-	//     - hardware: c32
-	//     - version: 3.0
+	//	version: 1.0
+	//	fallback_list:
+	//	  - version: 2.0
+	//	    hardware: c64
+	//	  - hardware: c32
+	//	  - version: 3.0
 	//
 	// at first, metadata:
 	//
 	// .. code-block:: json
 	//
-	//   {"version": "2.0", "hardware": "c64"}
+	//	{"version": "2.0", "hardware": "c64"}
 	//
 	// will be used for load balancing. If no host is found, metadata:
 	//
 	// .. code-block:: json
 	//
-	//   {"version": "1.0", "hardware": "c32"}
+	//	{"version": "1.0", "hardware": "c32"}
 	//
 	// is next to try. If it still results in no host, finally metadata:
 	//
 	// .. code-block:: json
 	//
-	//   {"version": "3.0"}
+	//	{"version": "3.0"}
 	//
 	// is used.
 	Cluster_LbSubsetConfig_FALLBACK_LIST Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy = 1
@@ -570,7 +571,7 @@ func (Cluster_RingHashLbConfig_HashFunction) EnumDescriptor() ([]byte, []int) {
 	return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 7, 0}
 }
 
-// Cluster list collections. Entries are ``Cluster`` resources or references.
+// Cluster list collections. Entries are “Cluster“ resources or references.
 // [#not-implemented-hide:]
 type ClusterCollection struct {
 	state         protoimpl.MessageState
@@ -627,7 +628,7 @@ type Cluster struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Configuration to use different transport sockets for different endpoints.
-	// The entry of ``envoy.transport_socket_match`` in the
+	// The entry of “envoy.transport_socket_match“ in the
 	// :ref:`LbEndpoint.Metadata <envoy_v3_api_field_config.endpoint.v3.LbEndpoint.metadata>`
 	// is used to match against the transport sockets as they appear in the list. The first
 	// :ref:`match <envoy_v3_api_msg_config.cluster.v3.Cluster.TransportSocketMatch>` is used.
@@ -635,28 +636,28 @@ type Cluster struct {
 	//
 	// .. code-block:: yaml
 	//
-	//  transport_socket_matches:
-	//  - name: "enableMTLS"
-	//    match:
-	//      acceptMTLS: true
-	//    transport_socket:
-	//      name: envoy.transport_sockets.tls
-	//      config: { ... } # tls socket configuration
-	//  - name: "defaultToPlaintext"
-	//    match: {}
-	//    transport_socket:
-	//      name: envoy.transport_sockets.raw_buffer
+	//	transport_socket_matches:
+	//	- name: "enableMTLS"
+	//	  match:
+	//	    acceptMTLS: true
+	//	  transport_socket:
+	//	    name: envoy.transport_sockets.tls
+	//	    config: { ... } # tls socket configuration
+	//	- name: "defaultToPlaintext"
+	//	  match: {}
+	//	  transport_socket:
+	//	    name: envoy.transport_sockets.raw_buffer
 	//
-	// Connections to the endpoints whose metadata value under ``envoy.transport_socket_match``
+	// Connections to the endpoints whose metadata value under “envoy.transport_socket_match“
 	// having "acceptMTLS"/"true" key/value pair use the "enableMTLS" socket configuration.
 	//
 	// If a :ref:`socket match <envoy_v3_api_msg_config.cluster.v3.Cluster.TransportSocketMatch>` with empty match
 	// criteria is provided, that always match any endpoint. For example, the "defaultToPlaintext"
 	// socket match in case above.
 	//
-	// If an endpoint metadata's value under ``envoy.transport_socket_match`` does not match any
-	// ``TransportSocketMatch``, socket configuration fallbacks to use the ``tls_context`` or
-	// ``transport_socket`` specified in this cluster.
+	// If an endpoint metadata's value under “envoy.transport_socket_match“ does not match any
+	// “TransportSocketMatch“, socket configuration fallbacks to use the “tls_context“ or
+	// “transport_socket“ specified in this cluster.
 	//
 	// This field allows gradual and flexible transport socket configuration changes.
 	//
@@ -667,8 +668,8 @@ type Cluster struct {
 	//
 	// Then the xDS server can configure the CDS to a client, Envoy A, to send mutual TLS
 	// traffic for endpoints with "acceptMTLS": "true", by adding a corresponding
-	// ``TransportSocketMatch`` in this field. Other client Envoys receive CDS without
-	// ``transport_socket_match`` set, and still send plain text traffic to the same cluster.
+	// “TransportSocketMatch“ in this field. Other client Envoys receive CDS without
+	// “transport_socket_match“ set, and still send plain text traffic to the same cluster.
 	//
 	// This field can be used to specify custom transport socket configurations for health
 	// checks by adding matching key/value pairs in a health check's
@@ -680,17 +681,18 @@ type Cluster struct {
 	// The cluster name is used when emitting
 	// :ref:`statistics <config_cluster_manager_cluster_stats>` if :ref:`alt_stat_name
 	// <envoy_v3_api_field_config.cluster.v3.Cluster.alt_stat_name>` is not provided.
-	// Any ``:`` in the cluster name will be converted to ``_`` when emitting statistics.
+	// Any “:“ in the cluster name will be converted to “_“ when emitting statistics.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// An optional alternative to the cluster name to be used for observability. This name is used
 	// emitting stats for the cluster and access logging the cluster name. This will appear as
 	// additional information in configuration dumps of a cluster's current status as
 	// :ref:`observability_name <envoy_v3_api_field_admin.v3.ClusterStatus.observability_name>`
-	// and as an additional tag "upstream_cluster.name" while tracing. Note: Any ``:`` in the name
-	// will be converted to ``_`` when emitting statistics. This should not be confused with
+	// and as an additional tag "upstream_cluster.name" while tracing. Note: Any “:“ in the name
+	// will be converted to “_“ when emitting statistics. This should not be confused with
 	// :ref:`Router Filter Header <config_http_filters_router_x-envoy-upstream-alt-stat-name>`.
 	AltStatName string `protobuf:"bytes,28,opt,name=alt_stat_name,json=altStatName,proto3" json:"alt_stat_name,omitempty"`
 	// Types that are assignable to ClusterDiscoveryType:
+	//
 	//	*Cluster_Type
 	//	*Cluster_ClusterType
 	ClusterDiscoveryType isCluster_ClusterDiscoveryType `protobuf_oneof:"cluster_discovery_type"`
@@ -709,13 +711,12 @@ type Cluster struct {
 	// :ref:`STATIC<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STATIC>`,
 	// :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>`
 	// or :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>` clusters.
-	// This field supersedes the ``hosts`` field in the v2 API.
+	// This field supersedes the “hosts“ field in the v2 API.
 	//
 	// .. attention::
 	//
-	//   Setting this allows non-EDS cluster types to contain embedded EDS equivalent
-	//   :ref:`endpoint assignments<envoy_v3_api_msg_config.endpoint.v3.ClusterLoadAssignment>`.
-	//
+	//	Setting this allows non-EDS cluster types to contain embedded EDS equivalent
+	//	:ref:`endpoint assignments<envoy_v3_api_msg_config.endpoint.v3.ClusterLoadAssignment>`.
 	LoadAssignment *v31.ClusterLoadAssignment `protobuf:"bytes,33,opt,name=load_assignment,json=loadAssignment,proto3" json:"load_assignment,omitempty"`
 	// Optional :ref:`active health checking <arch_overview_health_checking>`
 	// configuration for the cluster. If no
@@ -728,9 +729,10 @@ type Cluster struct {
 	// parameter to 1 will effectively disable keep alive.
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of the :ref:`max_requests_per_connection <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_requests_per_connection>` field.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of the :ref:`max_requests_per_connection <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_requests_per_connection>` field.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"`
 	// Optional :ref:`circuit breaking <arch_overview_circuit_break>` for the cluster.
 	CircuitBreakers *CircuitBreakers `protobuf:"bytes,10,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"`
@@ -745,7 +747,7 @@ type Cluster struct {
 	// <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
 	// for example usage.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	UpstreamHttpProtocolOptions *v32.UpstreamHttpProtocolOptions `protobuf:"bytes,46,opt,name=upstream_http_protocol_options,json=upstreamHttpProtocolOptions,proto3" json:"upstream_http_protocol_options,omitempty"`
 	// Additional options when handling HTTP requests upstream. These options will be applicable to
 	// both HTTP1 and HTTP2 requests.
@@ -758,7 +760,7 @@ type Cluster struct {
 	// <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
 	// for example usage.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	CommonHttpProtocolOptions *v32.HttpProtocolOptions `protobuf:"bytes,29,opt,name=common_http_protocol_options,json=commonHttpProtocolOptions,proto3" json:"common_http_protocol_options,omitempty"`
 	// Additional options when handling HTTP1 requests.
 	// This has been deprecated in favor of http_protocol_options fields in the
@@ -769,13 +771,13 @@ type Cluster struct {
 	// <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
 	// for example usage.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	HttpProtocolOptions *v32.Http1ProtocolOptions `protobuf:"bytes,13,opt,name=http_protocol_options,json=httpProtocolOptions,proto3" json:"http_protocol_options,omitempty"`
 	// Even if default HTTP2 protocol options are desired, this field must be
 	// set so that Envoy will assume that the upstream supports HTTP/2 when
 	// making new HTTP connection pool connections. Currently, Envoy only
 	// supports prior knowledge for upstream connections. Even if TLS is used
-	// with ALPN, ``http2_protocol_options`` must be specified. As an aside this allows HTTP/2
+	// with ALPN, “http2_protocol_options“ must be specified. As an aside this allows HTTP/2
 	// connections to happen over plain text.
 	// This has been deprecated in favor of http2_protocol_options fields in the
 	// :ref:`http_protocol_options <envoy_v3_api_msg_extensions.upstreams.http.v3.HttpProtocolOptions>`
@@ -785,7 +787,7 @@ type Cluster struct {
 	// <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
 	// for example usage.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	Http2ProtocolOptions *v32.Http2ProtocolOptions `protobuf:"bytes,14,opt,name=http2_protocol_options,json=http2ProtocolOptions,proto3" json:"http2_protocol_options,omitempty"`
 	// The extension_protocol_options field is used to provide extension-specific protocol options
 	// for upstream connections. The key should match the extension filter name, such as
@@ -830,33 +832,33 @@ type Cluster struct {
 	// :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>`
 	// and :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>`
 	// this setting is ignored.
-	// This field is deprecated in favor of ``dns_resolution_config``
+	// This field is deprecated in favor of “dns_resolution_config“
 	// which aggregates all of the DNS resolver configuration in a single message.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	DnsResolvers []*v32.Address `protobuf:"bytes,18,rep,name=dns_resolvers,json=dnsResolvers,proto3" json:"dns_resolvers,omitempty"`
 	// Always use TCP queries instead of UDP queries for DNS lookups.
-	// This field is deprecated in favor of ``dns_resolution_config``
+	// This field is deprecated in favor of “dns_resolution_config“
 	// which aggregates all of the DNS resolver configuration in a single message.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	UseTcpForDnsLookups bool `protobuf:"varint,45,opt,name=use_tcp_for_dns_lookups,json=useTcpForDnsLookups,proto3" json:"use_tcp_for_dns_lookups,omitempty"`
 	// DNS resolution configuration which includes the underlying dns resolver addresses and options.
 	// This field is deprecated in favor of
 	// :ref:`typed_dns_resolver_config <envoy_v3_api_field_config.cluster.v3.Cluster.typed_dns_resolver_config>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	DnsResolutionConfig *v32.DnsResolutionConfig `protobuf:"bytes,53,opt,name=dns_resolution_config,json=dnsResolutionConfig,proto3" json:"dns_resolution_config,omitempty"`
 	// DNS resolver type configuration extension. This extension can be used to configure c-ares, apple,
 	// or any other DNS resolver types and the related parameters.
 	// For example, an object of
 	// :ref:`CaresDnsResolverConfig <envoy_v3_api_msg_extensions.network.dns_resolver.cares.v3.CaresDnsResolverConfig>`
-	// can be packed into this ``typed_dns_resolver_config``. This configuration replaces the
+	// can be packed into this “typed_dns_resolver_config“. This configuration replaces the
 	// :ref:`dns_resolution_config <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolution_config>`
 	// configuration.
-	// During the transition period when both ``dns_resolution_config`` and ``typed_dns_resolver_config`` exists,
-	// when ``typed_dns_resolver_config`` is in place, Envoy will use it and ignore ``dns_resolution_config``.
-	// When ``typed_dns_resolver_config`` is missing, the default behavior is in place.
+	// During the transition period when both “dns_resolution_config“ and “typed_dns_resolver_config“ exists,
+	// when “typed_dns_resolver_config“ is in place, Envoy will use it and ignore “dns_resolution_config“.
+	// When “typed_dns_resolver_config“ is missing, the default behavior is in place.
 	// [#extension-category: envoy.network.dns_resolver]
 	TypedDnsResolverConfig *v32.TypedExtensionConfig `protobuf:"bytes,55,opt,name=typed_dns_resolver_config,json=typedDnsResolverConfig,proto3" json:"typed_dns_resolver_config,omitempty"`
 	// Optional configuration for having cluster readiness block on warm-up. Currently, only applicable for
@@ -900,6 +902,7 @@ type Cluster struct {
 	// LbPolicy will generate an error at runtime.
 	//
 	// Types that are assignable to LbConfig:
+	//
 	//	*Cluster_RingHashLbConfig_
 	//	*Cluster_MaglevLbConfig_
 	//	*Cluster_OriginalDstLbConfig_
@@ -909,8 +912,8 @@ type Cluster struct {
 	// Common configuration for all load balancer implementations.
 	CommonLbConfig *Cluster_CommonLbConfig `protobuf:"bytes,27,opt,name=common_lb_config,json=commonLbConfig,proto3" json:"common_lb_config,omitempty"`
 	// Optional custom transport socket implementation to use for upstream connections.
-	// To setup TLS, set a transport socket with name ``envoy.transport_sockets.tls`` and
-	// :ref:`UpstreamTlsContexts <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.UpstreamTlsContext>` in the ``typed_config``.
+	// To setup TLS, set a transport socket with name “envoy.transport_sockets.tls“ and
+	// :ref:`UpstreamTlsContexts <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.UpstreamTlsContext>` in the “typed_config“.
 	// If no transport socket configuration is specified, new connections
 	// will be set up with plaintext.
 	TransportSocket *v32.TransportSocket `protobuf:"bytes,24,opt,name=transport_socket,json=transportSocket,proto3" json:"transport_socket,omitempty"`
@@ -918,7 +921,7 @@ type Cluster struct {
 	// cluster. It can be used for stats, logging, and varying filter behavior.
 	// Fields should use reverse DNS notation to denote which entity within Envoy
 	// will need the information. For instance, if the metadata is intended for
-	// the Router filter, the filter name should be specified as ``envoy.filters.http.router``.
+	// the Router filter, the filter name should be specified as “envoy.filters.http.router“.
 	Metadata *v32.Metadata `protobuf:"bytes,25,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// Determines how Envoy selects the protocol used to speak to upstream hosts.
 	// This has been deprecated in favor of setting explicit protocol selection
@@ -927,7 +930,7 @@ type Cluster struct {
 	// http_protocol_options can be set via the cluster's
 	// :ref:`extension_protocol_options<envoy_v3_api_field_config.cluster.v3.Cluster.typed_extension_protocol_options>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	ProtocolSelection Cluster_ClusterProtocolSelection `protobuf:"varint,26,opt,name=protocol_selection,json=protocolSelection,proto3,enum=envoy.config.cluster.v3.Cluster_ClusterProtocolSelection" json:"protocol_selection,omitempty"`
 	// Optional options for upstream connections.
 	UpstreamConnectionOptions *UpstreamConnectionOptions `protobuf:"bytes,30,opt,name=upstream_connection_options,json=upstreamConnectionOptions,proto3" json:"upstream_connection_options,omitempty"`
@@ -936,14 +939,14 @@ type Cluster struct {
 	//
 	// .. note::
 	//
-	//   This is currently only supported for connections created by tcp_proxy.
+	//	This is currently only supported for connections created by tcp_proxy.
 	//
 	// .. note::
 	//
-	//   The current implementation of this feature closes all connections immediately when
-	//   the unhealthy status is detected. If there are a large number of connections open
-	//   to an upstream host that becomes unhealthy, Envoy may spend a substantial amount of
-	//   time exclusively closing these connections, and not processing any other traffic.
+	//	The current implementation of this feature closes all connections immediately when
+	//	the unhealthy status is detected. If there are a large number of connections open
+	//	to an upstream host that becomes unhealthy, Envoy may spend a substantial amount of
+	//	time exclusively closing these connections, and not processing any other traffic.
 	CloseConnectionsOnHostHealthFailure bool `protobuf:"varint,31,opt,name=close_connections_on_host_health_failure,json=closeConnectionsOnHostHealthFailure,proto3" json:"close_connections_on_host_health_failure,omitempty"`
 	// If set to true, Envoy will ignore the health value of a host when processing its removal
 	// from service discovery. This means that if active health checking is used, Envoy will *not*
@@ -979,10 +982,10 @@ type Cluster struct {
 	//
 	// .. attention::
 	//
-	//   This field has been deprecated in favor of ``timeout_budgets``, part of
-	//   :ref:`track_cluster_stats <envoy_v3_api_field_config.cluster.v3.Cluster.track_cluster_stats>`.
+	//	This field has been deprecated in favor of ``timeout_budgets``, part of
+	//	:ref:`track_cluster_stats <envoy_v3_api_field_config.cluster.v3.Cluster.track_cluster_stats>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 	TrackTimeoutBudgets bool `protobuf:"varint,47,opt,name=track_timeout_budgets,json=trackTimeoutBudgets,proto3" json:"track_timeout_budgets,omitempty"`
 	// Optional customization and configuration of upstream connection pool, and upstream type.
 	//
@@ -990,7 +993,7 @@ type Cluster struct {
 	// TCP upstreams.
 	//
 	// For HTTP traffic, Envoy will generally take downstream HTTP and send it upstream as upstream
-	// HTTP, using the http connection pool and the codec from ``http2_protocol_options``
+	// HTTP, using the http connection pool and the codec from “http2_protocol_options“
 	//
 	// For routes where CONNECT termination is configured, Envoy will take downstream CONNECT
 	// requests and forward the CONNECT payload upstream over raw TCP using the tcp connection pool.
@@ -1007,7 +1010,7 @@ type Cluster struct {
 	TrackClusterStats *TrackClusterStats `protobuf:"bytes,49,opt,name=track_cluster_stats,json=trackClusterStats,proto3" json:"track_cluster_stats,omitempty"`
 	// Preconnect configuration for this cluster.
 	PreconnectPolicy *Cluster_PreconnectPolicy `protobuf:"bytes,50,opt,name=preconnect_policy,json=preconnectPolicy,proto3" json:"preconnect_policy,omitempty"`
-	// If ``connection_pool_per_downstream_connection`` is true, the cluster will use a separate
+	// If “connection_pool_per_downstream_connection“ is true, the cluster will use a separate
 	// connection pool for every downstream connection
 	ConnectionPoolPerDownstreamConnection bool `protobuf:"varint,51,opt,name=connection_pool_per_downstream_connection,json=connectionPoolPerDownstreamConnection,proto3" json:"connection_pool_per_downstream_connection,omitempty"`
 }
@@ -1128,7 +1131,7 @@ func (x *Cluster) GetHealthChecks() []*v32.HealthCheck {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetMaxRequestsPerConnection() *wrappers.UInt32Value {
 	if x != nil {
 		return x.MaxRequestsPerConnection
@@ -1143,7 +1146,7 @@ func (x *Cluster) GetCircuitBreakers() *CircuitBreakers {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetUpstreamHttpProtocolOptions() *v32.UpstreamHttpProtocolOptions {
 	if x != nil {
 		return x.UpstreamHttpProtocolOptions
@@ -1151,7 +1154,7 @@ func (x *Cluster) GetUpstreamHttpProtocolOptions() *v32.UpstreamHttpProtocolOpti
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetCommonHttpProtocolOptions() *v32.HttpProtocolOptions {
 	if x != nil {
 		return x.CommonHttpProtocolOptions
@@ -1159,7 +1162,7 @@ func (x *Cluster) GetCommonHttpProtocolOptions() *v32.HttpProtocolOptions {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetHttpProtocolOptions() *v32.Http1ProtocolOptions {
 	if x != nil {
 		return x.HttpProtocolOptions
@@ -1167,7 +1170,7 @@ func (x *Cluster) GetHttpProtocolOptions() *v32.Http1ProtocolOptions {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetHttp2ProtocolOptions() *v32.Http2ProtocolOptions {
 	if x != nil {
 		return x.Http2ProtocolOptions
@@ -1210,7 +1213,7 @@ func (x *Cluster) GetDnsLookupFamily() Cluster_DnsLookupFamily {
 	return Cluster_AUTO
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetDnsResolvers() []*v32.Address {
 	if x != nil {
 		return x.DnsResolvers
@@ -1218,7 +1221,7 @@ func (x *Cluster) GetDnsResolvers() []*v32.Address {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetUseTcpForDnsLookups() bool {
 	if x != nil {
 		return x.UseTcpForDnsLookups
@@ -1226,7 +1229,7 @@ func (x *Cluster) GetUseTcpForDnsLookups() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetDnsResolutionConfig() *v32.DnsResolutionConfig {
 	if x != nil {
 		return x.DnsResolutionConfig
@@ -1339,7 +1342,7 @@ func (x *Cluster) GetMetadata() *v32.Metadata {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetProtocolSelection() Cluster_ClusterProtocolSelection {
 	if x != nil {
 		return x.ProtocolSelection
@@ -1389,7 +1392,7 @@ func (x *Cluster) GetLrsServer() *v32.ConfigSource {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto.
 func (x *Cluster) GetTrackTimeoutBudgets() bool {
 	if x != nil {
 		return x.TrackTimeoutBudgets
@@ -1626,6 +1629,20 @@ type TrackClusterStats struct {
 	// <config_cluster_manager_cluster_stats_request_response_sizes>`  tracking header and body sizes
 	// of requests and responses will be published.
 	RequestResponseSizes bool `protobuf:"varint,2,opt,name=request_response_sizes,json=requestResponseSizes,proto3" json:"request_response_sizes,omitempty"`
+	// If true, some stats will be emitted per-endpoint, similar to the stats in admin “/clusters“
+	// output.
+	//
+	// This does not currently output correct stats during a hot-restart.
+	//
+	// This is not currently implemented by all stat sinks.
+	//
+	// These stats do not honor filtering or tag extraction rules in :ref:`StatsConfig
+	// <envoy_v3_api_msg_config.metrics.v3.StatsConfig>` (but fixed-value tags are supported). Admin
+	// endpoint filtering is supported.
+	//
+	// This may not be used at the same time as
+	// :ref:`load_stats_config <envoy_v3_api_field_config.bootstrap.v3.ClusterManager.load_stats_config>`.
+	PerEndpointStats bool `protobuf:"varint,3,opt,name=per_endpoint_stats,json=perEndpointStats,proto3" json:"per_endpoint_stats,omitempty"`
 }
 
 func (x *TrackClusterStats) Reset() {
@@ -1674,6 +1691,13 @@ func (x *TrackClusterStats) GetRequestResponseSizes() bool {
 	return false
 }
 
+func (x *TrackClusterStats) GetPerEndpointStats() bool {
+	if x != nil {
+		return x.PerEndpointStats
+	}
+	return false
+}
+
 // TransportSocketMatch specifies what transport socket config will be used
 // when the match conditions are satisfied.
 type Cluster_TransportSocketMatch struct {
@@ -1686,7 +1710,7 @@ type Cluster_TransportSocketMatch struct {
 	// Optional endpoint metadata match criteria.
 	// The connection to the endpoint with metadata matching what is set in this field
 	// will use the transport socket configuration specified here.
-	// The endpoint's metadata entry in ``envoy.transport_socket_match`` is used to match
+	// The endpoint's metadata entry in “envoy.transport_socket_match“ is used to match
 	// against the values specified in this field.
 	Match *_struct.Struct `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"`
 	// The configuration of the transport socket.
@@ -1883,21 +1907,21 @@ type Cluster_LbSubsetConfig struct {
 	// fallback_policy is
 	// :ref:`DEFAULT_SUBSET<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetFallbackPolicy.DEFAULT_SUBSET>`.
 	// Each field in default_subset is
-	// compared to the matching LbEndpoint.Metadata under the ``envoy.lb``
+	// compared to the matching LbEndpoint.Metadata under the “envoy.lb“
 	// namespace. It is valid for no hosts to match, in which case the behavior
 	// is the same as a fallback_policy of
 	// :ref:`NO_FALLBACK<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetFallbackPolicy.NO_FALLBACK>`.
 	DefaultSubset *_struct.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"`
 	// For each entry, LbEndpoint.Metadata's
-	// ``envoy.lb`` namespace is traversed and a subset is created for each unique
+	// “envoy.lb“ namespace is traversed and a subset is created for each unique
 	// combination of key and value. For example:
 	//
 	// .. code-block:: json
 	//
-	//   { "subset_selectors": [
-	//       { "keys": [ "version" ] },
-	//       { "keys": [ "stage", "hardware_type" ] }
-	//   ]}
+	//	{ "subset_selectors": [
+	//	    { "keys": [ "version" ] },
+	//	    { "keys": [ "stage", "hardware_type" ] }
+	//	]}
 	//
 	// A subset is matched when the metadata from the selected route and
 	// weighted cluster contains the same keys and values as the subset's
@@ -2045,8 +2069,8 @@ type Cluster_SlowStartConfig struct {
 	// By tuning the parameter, is possible to achieve polynomial or exponential shape of ramp-up curve.
 	//
 	// During slow start window, effective weight of an endpoint would be scaled with time factor and aggression:
-	// ``new_weight = weight * max(min_weight_percent, time_factor ^ (1 / aggression))``,
-	// where ``time_factor=(time_since_start_seconds / slow_start_time_seconds)``.
+	// “new_weight = weight * max(min_weight_percent, time_factor ^ (1 / aggression))“,
+	// where “time_factor=(time_since_start_seconds / slow_start_time_seconds)“.
 	//
 	// As time progresses, more and more traffic would be sent to endpoint, which is in slow start window.
 	// Once host exits slow start, time_factor and aggression no longer affect its weight.
@@ -2172,18 +2196,18 @@ type Cluster_LeastRequestLbConfig struct {
 	// The following formula is used to calculate the dynamic weights when hosts have different load
 	// balancing weights:
 	//
-	// ``weight = load_balancing_weight / (active_requests + 1)^active_request_bias``
+	// “weight = load_balancing_weight / (active_requests + 1)^active_request_bias“
 	//
 	// The larger the active request bias is, the more aggressively active requests will lower the
 	// effective weight when all host weights are not equal.
 	//
-	// ``active_request_bias`` must be greater than or equal to 0.0.
+	// “active_request_bias“ must be greater than or equal to 0.0.
 	//
-	// When ``active_request_bias == 0.0`` the Least Request Load Balancer doesn't consider the number
+	// When “active_request_bias == 0.0“ the Least Request Load Balancer doesn't consider the number
 	// of active requests at the time it picks a host and behaves like the Round Robin Load
 	// Balancer.
 	//
-	// When ``active_request_bias > 0.0`` the Least Request Load Balancer scales the load balancing
+	// When “active_request_bias > 0.0“ the Least Request Load Balancer scales the load balancing
 	// weight by the number of active requests at the time it does a pick.
 	//
 	// The value is cached for performance reasons and refreshed whenever one of the Load Balancer's
@@ -2191,7 +2215,8 @@ type Cluster_LeastRequestLbConfig struct {
 	// weight change.
 	//
 	// .. note::
-	//   This setting only takes effect if all host weights are not equal.
+	//
+	//	This setting only takes effect if all host weights are not equal.
 	ActiveRequestBias *v32.RuntimeDouble `protobuf:"bytes,2,opt,name=active_request_bias,json=activeRequestBias,proto3" json:"active_request_bias,omitempty"`
 	// Configuration for slow start mode.
 	// If this configuration is not set, slow start will not be not enabled.
@@ -2392,13 +2417,13 @@ type Cluster_OriginalDstLbConfig struct {
 	//
 	// .. attention::
 	//
-	//   This header isn't sanitized by default, so enabling this feature allows HTTP clients to
-	//   route traffic to arbitrary hosts and/or ports, which may have serious security
-	//   consequences.
+	//	This header isn't sanitized by default, so enabling this feature allows HTTP clients to
+	//	route traffic to arbitrary hosts and/or ports, which may have serious security
+	//	consequences.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	UseHttpHeader bool `protobuf:"varint,1,opt,name=use_http_header,json=useHttpHeader,proto3" json:"use_http_header,omitempty"`
 	// The http header to override destination address if :ref:`use_http_header <envoy_v3_api_field_config.cluster.v3.Cluster.OriginalDstLbConfig.use_http_header>`.
 	// is set to true. If the value is empty, :ref:`x-envoy-original-dst-host <config_http_conn_man_headers_x-envoy-original-dst-host>` will be used.
@@ -2406,6 +2431,9 @@ type Cluster_OriginalDstLbConfig struct {
 	// The port to override for the original dst address. This port
 	// will take precedence over filter state and header override ports
 	UpstreamPortOverride *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=upstream_port_override,json=upstreamPortOverride,proto3" json:"upstream_port_override,omitempty"`
+	// The dynamic metadata key to override destination address.
+	// First the request metadata is considered, then the connection one.
+	MetadataKey *v34.MetadataKey `protobuf:"bytes,4,opt,name=metadata_key,json=metadataKey,proto3" json:"metadata_key,omitempty"`
 }
 
 func (x *Cluster_OriginalDstLbConfig) Reset() {
@@ -2461,6 +2489,13 @@ func (x *Cluster_OriginalDstLbConfig) GetUpstreamPortOverride() *wrappers.UInt32
 	return nil
 }
 
+func (x *Cluster_OriginalDstLbConfig) GetMetadataKey() *v34.MetadataKey {
+	if x != nil {
+		return x.MetadataKey
+	}
+	return nil
+}
+
 // Common configuration for all load balancer implementations.
 // [#next-free-field: 9]
 type Cluster_CommonLbConfig struct {
@@ -2473,9 +2508,11 @@ type Cluster_CommonLbConfig struct {
 	// To disable panic mode, set to 0%.
 	//
 	// .. note::
-	//   The specified percent will be truncated to the nearest 1%.
+	//
+	//	The specified percent will be truncated to the nearest 1%.
 	HealthyPanicThreshold *v33.Percent `protobuf:"bytes,1,opt,name=healthy_panic_threshold,json=healthyPanicThreshold,proto3" json:"healthy_panic_threshold,omitempty"`
 	// Types that are assignable to LocalityConfigSpecifier:
+	//
 	//	*Cluster_CommonLbConfig_ZoneAwareLbConfig_
 	//	*Cluster_CommonLbConfig_LocalityWeightedLbConfig_
 	LocalityConfigSpecifier isCluster_CommonLbConfig_LocalityConfigSpecifier `protobuf_oneof:"locality_config_specifier"`
@@ -2498,7 +2535,7 @@ type Cluster_CommonLbConfig struct {
 	// when computing load balancing weights until they have been health checked for the first time.
 	// This will have no effect unless active health checking is also configured.
 	IgnoreNewHostsUntilFirstHc bool `protobuf:"varint,5,opt,name=ignore_new_hosts_until_first_hc,json=ignoreNewHostsUntilFirstHc,proto3" json:"ignore_new_hosts_until_first_hc,omitempty"`
-	// If set to ``true``, the cluster manager will drain all existing
+	// If set to “true“, the cluster manager will drain all existing
 	// connections to upstream hosts whenever hosts are added or removed from the cluster.
 	CloseConnectionsOnHostSetChange bool `protobuf:"varint,6,opt,name=close_connections_on_host_set_change,json=closeConnectionsOnHostSetChange,proto3" json:"close_connections_on_host_set_change,omitempty"`
 	// Common Configuration for all consistent hashing load balancers (MaglevLb, RingHashLb, etc.)
@@ -2720,7 +2757,7 @@ type Cluster_PreconnectPolicy struct {
 	// Indicates how many streams (rounded up) can be anticipated across a cluster for each
 	// stream, useful for low QPS services. This is currently supported for a subset of
 	// deterministic non-hash-based load-balancing algorithms (weighted round robin, random).
-	// Unlike ``per_upstream_preconnect_ratio`` this preconnects across the upstream instances in a
+	// Unlike “per_upstream_preconnect_ratio“ this preconnects across the upstream instances in a
 	// cluster, doing best effort predictions of what upstream would be picked next and
 	// pre-establishing a connection.
 	//
@@ -2801,7 +2838,7 @@ type Cluster_LbSubsetConfig_LbSubsetSelector struct {
 	//
 	// If a match is found to a host, that host will be used regardless of priority levels.
 	//
-	// When this mode is enabled, configurations that contain more than one host with the same metadata value for the single key in ``keys``
+	// When this mode is enabled, configurations that contain more than one host with the same metadata value for the single key in “keys“
 	// will use only one of the hosts with the given key; no requests will be routed to the others. The cluster gauge
 	// :ref:`lb_subsets_single_host_per_subset_duplicate<config_cluster_manager_cluster_stats_subset_lb>` indicates how many duplicates are
 	// present in the current configuration.
@@ -2817,7 +2854,7 @@ type Cluster_LbSubsetConfig_LbSubsetSelector struct {
 	// For any other fallback policy the parameter is not used and should not be set.
 	// Only values also present in
 	// :ref:`keys<envoy_v3_api_field_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.keys>` are allowed, but
-	// ``fallback_keys_subset`` cannot be equal to ``keys``.
+	// “fallback_keys_subset“ cannot be equal to “keys“.
 	FallbackKeysSubset []string `protobuf:"bytes,3,rep,name=fallback_keys_subset,json=fallbackKeysSubset,proto3" json:"fallback_keys_subset,omitempty"`
 }
 
@@ -3005,7 +3042,7 @@ type Cluster_CommonLbConfig_ConsistentHashingLbConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// If set to ``true``, the cluster will use hostname instead of the resolved
+	// If set to “true“, the cluster will use hostname instead of the resolved
 	// address as the key to consistently hash to an upstream host. Only valid for StrictDNS clusters with hostnames which resolve to a single IP address.
 	UseHostnameForHashing bool `protobuf:"varint,1,opt,name=use_hostname_for_hashing,json=useHostnameForHashing,proto3" json:"use_hostname_for_hashing,omitempty"`
 	// Configures percentage of average cluster load to bound per upstream host. For example, with a value of 150
@@ -3016,7 +3053,7 @@ type Cluster_CommonLbConfig_ConsistentHashingLbConfig struct {
 	// Applies to both Ring Hash and Maglev load balancers.
 	//
 	// This is implemented based on the method described in the paper https://arxiv.org/abs/1608.01350. For the specified
-	// ``hash_balance_factor``, requests to any upstream host are capped at ``hash_balance_factor/100`` times the average number of requests
+	// “hash_balance_factor“, requests to any upstream host are capped at “hash_balance_factor/100“ times the average number of requests
 	// across the cluster. When a request arrives for an upstream host that is currently serving at its max capacity, linear probing
 	// is used to identify an eligible host. Further, the linear probe is implemented using a random jump in hosts ring/table to identify
 	// the eligible host (this technique is as described in the paper https://arxiv.org/abs/1908.08762 - the random jump avoids the
@@ -3024,7 +3061,7 @@ type Cluster_CommonLbConfig_ConsistentHashingLbConfig struct {
 	//
 	// If weights are specified on the hosts, they are respected.
 	//
-	// This is an O(N) algorithm, unlike other load balancers. Using a lower ``hash_balance_factor`` results in more hosts
+	// This is an O(N) algorithm, unlike other load balancers. Using a lower “hash_balance_factor“ results in more hosts
 	// being probed, so use a higher value if you require better performance.
 	HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"`
 }
@@ -3157,751 +3194,760 @@ var file_envoy_config_cluster_v3_cluster_proto_rawDesc = []byte{
 	0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64,
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
-	0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77,
-	0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x78,
-	0x64, 0x73, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74,
-	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x4b, 0x0a, 0x11, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6c,
-	0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x36, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22,
-	0xcf, 0x52, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6f, 0x0a, 0x18, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x2b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x16, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x0d, 0x61, 0x6c, 0x74,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x1a, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x14, 0x0a, 0x12, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x0b, 0x61, 0x6c,
-	0x74, 0x53, 0x74, 0x61, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76,
-	0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10,
-	0x01, 0x48, 0x00, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x57, 0x0a, 0x0c, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x26, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54,
-	0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x5f, 0x0a, 0x12, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
+	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
+	0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x33, 0x2f,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x65,
+	0x72, 0x63, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x78, 0x64, 0x73, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76,
+	0x33, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72,
+	0x65, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x75,
+	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x75,
+	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d,
+	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75,
+	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4b, 0x0a, 0x11, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x36,
+	0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
+	0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x65,
+	0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0x97, 0x53, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x12, 0x6f, 0x0a, 0x18, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x2b,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
+	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x16, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x3e, 0x0a, 0x0d, 0x61, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1a, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x14, 0x0a,
+	0x12, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x52, 0x0b, 0x61, 0x6c, 0x74, 0x53, 0x74, 0x61, 0x74, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x4e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
 	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x45, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x10, 0x65, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x4c, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a,
-	0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x12, 0x6f, 0x0a, 0x21, 0x70, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x8a, 0x93, 0xb7, 0x2a,
-	0x02, 0x10, 0x01, 0x52, 0x1d, 0x70, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x79, 0x74,
-	0x65, 0x73, 0x12, 0x50, 0x0a, 0x09, 0x6c, 0x62, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08,
+	0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
+	0x12, 0x57, 0x0a, 0x0c, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x26, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5f, 0x0a, 0x12, 0x65, 0x64, 0x73,
+	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x6c, 0x62, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x12, 0x58, 0x0a, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, 0x73, 0x73,
-	0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0e,
-	0x6c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x46,
-	0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18,
-	0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61,
-	0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x68, 0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86,
-	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x53, 0x0a, 0x10, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x5f, 0x62, 0x72, 0x65, 0x61,
-	0x6b, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61,
-	0x6b, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65,
-	0x61, 0x6b, 0x65, 0x72, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x1e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74,
-	0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x1b,
-	0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x77, 0x0a, 0x1c, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x19, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x6b, 0x0a, 0x15, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0d, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42,
-	0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x13, 0x68, 0x74,
-	0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x74, 0x0a, 0x16, 0x68, 0x74, 0x74, 0x70, 0x32, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x12, 0x18,
-	0x01, 0x8a, 0x93, 0xb7, 0x2a, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x14, 0x68, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8c, 0x01, 0x0a, 0x20, 0x74, 0x79, 0x70, 0x65,
-	0x64, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x24, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x43, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x1d, 0x74, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x51, 0x0a, 0x10, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09,
-	0xaa, 0x01, 0x06, 0x2a, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x0e, 0x64, 0x6e, 0x73, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x12, 0x65, 0x0a, 0x18, 0x64, 0x6e, 0x73,
-	0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
-	0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x52, 0x15, 0x64, 0x6e, 0x73, 0x46, 0x61,
-	0x69, 0x6c, 0x75, 0x72, 0x65, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65,
-	0x12, 0x26, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x64, 0x6e, 0x73, 0x5f,
-	0x74, 0x74, 0x6c, 0x18, 0x27, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x65,
-	0x63, 0x74, 0x44, 0x6e, 0x73, 0x54, 0x74, 0x6c, 0x12, 0x66, 0x0a, 0x11, 0x64, 0x6e, 0x73, 0x5f,
-	0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x5f, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x18, 0x11, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x44, 0x6e, 0x73, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x46,
-	0x61, 0x6d, 0x69, 0x6c, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x0f, 0x64, 0x6e, 0x73, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79,
-	0x12, 0x4f, 0x0a, 0x0d, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
-	0x33, 0x2e, 0x30, 0x52, 0x0c, 0x64, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x73, 0x12, 0x41, 0x0a, 0x17, 0x75, 0x73, 0x65, 0x5f, 0x74, 0x63, 0x70, 0x5f, 0x66, 0x6f, 0x72,
-	0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x2d, 0x20, 0x01,
-	0x28, 0x08, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52,
-	0x13, 0x75, 0x73, 0x65, 0x54, 0x63, 0x70, 0x46, 0x6f, 0x72, 0x44, 0x6e, 0x73, 0x4c, 0x6f, 0x6f,
-	0x6b, 0x75, 0x70, 0x73, 0x12, 0x6a, 0x0a, 0x15, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f,
-	0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x35, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x6e, 0x73, 0x52, 0x65,
-	0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b,
-	0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x13, 0x64, 0x6e, 0x73,
-	0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x65, 0x0a, 0x19, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x37, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x16, 0x74, 0x79, 0x70, 0x65, 0x64, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c, 0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f,
-	0x66, 0x6f, 0x72, 0x5f, 0x77, 0x61, 0x72, 0x6d, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x69, 0x74,
-	0x18, 0x36, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x11, 0x77, 0x61, 0x69, 0x74, 0x46, 0x6f, 0x72, 0x57, 0x61, 0x72, 0x6d, 0x4f,
-	0x6e, 0x49, 0x6e, 0x69, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72,
-	0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69,
-	0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6f, 0x75, 0x74,
-	0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4e, 0x0a,
-	0x10, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0f, 0x63, 0x6c,
-	0x65, 0x61, 0x6e, 0x75, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x52, 0x0a,
-	0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x75,
-	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x59, 0x0a, 0x10, 0x6c, 0x62, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62,
-	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x6c, 0x62,
-	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x62, 0x0a, 0x13,
-	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x65, 0x64, 0x73, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c, 0x0a, 0x0f, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08,
+	0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x6f, 0x0a, 0x21, 0x70, 0x65, 0x72, 0x5f,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65,
+	0x72, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x42, 0x07, 0x8a, 0x93, 0xb7, 0x2a, 0x02, 0x10, 0x01, 0x52, 0x1d, 0x70, 0x65, 0x72, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x09, 0x6c, 0x62, 0x5f,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c,
+	0x62, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x08, 0x6c, 0x62, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x58, 0x0a, 0x0f, 0x6c,
+	0x6f, 0x61, 0x64, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x21,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67,
+	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67,
+	0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x46, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52,
+	0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x68, 0x0a,
+	0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x70, 0x65,
+	0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x18, 0x6d,
+	0x61, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x10, 0x63, 0x69, 0x72, 0x63, 0x75,
+	0x69, 0x74, 0x5f, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x72, 0x63,
+	0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x63, 0x69, 0x72,
+	0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x12, 0x83, 0x01, 0x0a,
+	0x1e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+	0x2e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x1b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48,
+	0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x77, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x68, 0x74, 0x74,
+	0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x52, 0x19, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x6b, 0x0a, 0x15, 0x68,
+	0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
+	0x30, 0x18, 0x01, 0x52, 0x13, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x74, 0x0a, 0x16, 0x68, 0x74, 0x74, 0x70,
+	0x32, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x42, 0x12, 0x8a, 0x93, 0xb7, 0x2a, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x68, 0x74, 0x74, 0x70, 0x32, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x8c,
+	0x01, 0x0a, 0x20, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x69, 0x6e, 0x67,
-	0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x10,
-	0x72, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x5b, 0x0a, 0x10, 0x6d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x34, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65,
+	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x1d,
+	0x74, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x51, 0x0a,
+	0x10, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x72, 0x61, 0x74,
+	0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x2a, 0x04, 0x10, 0xc0, 0x84, 0x3d,
+	0x52, 0x0e, 0x64, 0x6e, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65,
+	0x12, 0x65, 0x0a, 0x18, 0x64, 0x6e, 0x73, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f,
+	0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, 0x2c, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65,
+	0x52, 0x15, 0x64, 0x6e, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x52, 0x65, 0x66, 0x72,
+	0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x70, 0x65,
+	0x63, 0x74, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x74, 0x74, 0x6c, 0x18, 0x27, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x44, 0x6e, 0x73, 0x54, 0x74, 0x6c, 0x12,
+	0x66, 0x0a, 0x11, 0x64, 0x6e, 0x73, 0x5f, 0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x5f, 0x66, 0x61,
+	0x6d, 0x69, 0x6c, 0x79, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x67,
-	0x6c, 0x65, 0x76, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x0e, 0x6d,
-	0x61, 0x67, 0x6c, 0x65, 0x76, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6b, 0x0a,
-	0x16, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x73, 0x74, 0x5f, 0x6c, 0x62,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x13, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44,
-	0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x17, 0x6c, 0x65,
-	0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6c, 0x62, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x65,
-	0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x48, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x68, 0x0a, 0x15, 0x72, 0x6f,
-	0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x38, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x6e,
-	0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01,
-	0x52, 0x12, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x6c,
-	0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x50, 0x0a, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x19, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x75, 0x0a,
-	0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x11, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x72, 0x0a, 0x1b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x19, 0x75,
-	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x55, 0x0a, 0x28, 0x63, 0x6c, 0x6f, 0x73,
-	0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6f, 0x6e,
-	0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x66, 0x61, 0x69,
-	0x6c, 0x75, 0x72, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x23, 0x63, 0x6c, 0x6f, 0x73,
-	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x6e, 0x48, 0x6f,
-	0x73, 0x74, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x12,
-	0x40, 0x0a, 0x1d, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x5f, 0x6f, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c,
-	0x18, 0x20, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x4f, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x61,
-	0x6c, 0x12, 0x39, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x28, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x60, 0x0a, 0x15,
-	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x41,
-	0x0a, 0x0a, 0x6c, 0x72, 0x73, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x2a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x6c, 0x72, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x12, 0x3f, 0x0a, 0x15, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x5f, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x73, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x08,
-	0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x13, 0x74,
-	0x72, 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x42, 0x75, 0x64, 0x67, 0x65,
-	0x74, 0x73, 0x12, 0x53, 0x0a, 0x0f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x30, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5a, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x63, 0x6b,
-	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x31,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x54,
-	0x72, 0x61, 0x63, 0x6b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73,
-	0x52, 0x11, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x12, 0x5e, 0x0a, 0x11, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x52, 0x10, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x12, 0x58, 0x0a, 0x29, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x33, 0x20, 0x01, 0x28, 0x08, 0x52, 0x25, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x50, 0x65, 0x72, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xe6, 0x01,
-	0x0a, 0x14, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x05, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x50, 0x0a, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
-	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f,
-	0x63, 0x6b, 0x65, 0x74, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x98, 0x01, 0x0a, 0x11, 0x43, 0x75, 0x73, 0x74, 0x6f,
-	0x6d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79, 0x70,
-	0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70,
-	0x65, 0x1a, 0xa6, 0x01, 0x0a, 0x10, 0x45, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a, 0x0a, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76,
+	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x44, 0x6e, 0x73,
+	0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x6e, 0x73, 0x4c, 0x6f, 0x6f, 0x6b, 0x75,
+	0x70, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x12, 0x4f, 0x0a, 0x0d, 0x64, 0x6e, 0x73, 0x5f, 0x72,
+	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x0b, 0x92,
+	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0c, 0x64, 0x6e, 0x73, 0x52,
+	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x17, 0x75, 0x73, 0x65, 0x5f,
+	0x74, 0x63, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x6c, 0x6f, 0x6f, 0x6b,
+	0x75, 0x70, 0x73, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04,
+	0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x13, 0x75, 0x73, 0x65, 0x54, 0x63, 0x70, 0x46, 0x6f,
+	0x72, 0x44, 0x6e, 0x73, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x73, 0x12, 0x6a, 0x0a, 0x15, 0x64,
+	0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x35, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09,
-	0x65, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x3a, 0x2c, 0x9a, 0xc5,
-	0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x64, 0x73, 0x43, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xa4, 0x0a, 0x0a, 0x0e, 0x4c,
-	0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x79, 0x0a,
-	0x0f, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74,
-	0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08,
-	0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61,
-	0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3e, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x6b, 0x0a, 0x10, 0x73, 0x75, 0x62, 0x73,
-	0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x33, 0x2e, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
+	0x18, 0x01, 0x52, 0x13, 0x64, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x65, 0x0a, 0x19, 0x74, 0x79, 0x70, 0x65, 0x64,
+	0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x37, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x16, 0x74, 0x79, 0x70, 0x65, 0x64, 0x44, 0x6e, 0x73,
+	0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c,
+	0x0a, 0x15, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x77, 0x61, 0x72, 0x6d, 0x5f,
+	0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x69, 0x74, 0x18, 0x36, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x11, 0x77, 0x61, 0x69, 0x74, 0x46,
+	0x6f, 0x72, 0x57, 0x61, 0x72, 0x6d, 0x4f, 0x6e, 0x49, 0x6e, 0x69, 0x74, 0x12, 0x56, 0x0a, 0x11,
+	0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x10, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4e, 0x0a, 0x10, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x5f,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01,
+	0x02, 0x2a, 0x00, 0x52, 0x0f, 0x63, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x76, 0x61, 0x6c, 0x12, 0x52, 0x0a, 0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x15, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x69,
+	0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x10, 0x6c, 0x62, 0x5f, 0x73,
+	0x75, 0x62, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x16, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75,
 	0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x52, 0x0f, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
-	0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x77, 0x61, 0x72, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x41, 0x77, 0x61, 0x72, 0x65, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x63, 0x61,
-	0x6c, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x77, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x24, 0x0a,
-	0x0e, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x5f, 0x61, 0x6e, 0x79, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x4d, 0x6f, 0x64, 0x65,
-	0x41, 0x6e, 0x79, 0x12, 0x1e, 0x0a, 0x0b, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x61, 0x73, 0x5f, 0x61,
-	0x6e, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x41, 0x73,
-	0x41, 0x6e, 0x79, 0x12, 0x92, 0x01, 0x0a, 0x18, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x5f, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01,
-	0x52, 0x16, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61,
-	0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a, 0xda, 0x03, 0x0a, 0x10, 0x4c, 0x62, 0x53,
-	0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a,
-	0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79,
-	0x73, 0x12, 0x33, 0x0a, 0x16, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74,
-	0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x13, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x65, 0x72,
-	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x92, 0x01, 0x0a, 0x0f, 0x66, 0x61, 0x6c, 0x6c, 0x62,
-	0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x5f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x66, 0x69, 0x67, 0x52, 0x0e, 0x6c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x12, 0x62, 0x0a, 0x13, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68,
+	0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
 	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x6c,
-	0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x66,
-	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x75, 0x62,
-	0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x12, 0x66, 0x61, 0x6c, 0x6c, 0x62,
-	0x61, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x73, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x22, 0x79, 0x0a,
-	0x1e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x5f, 0x46, 0x41, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10,
-	0x01, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x4e, 0x59, 0x5f, 0x45, 0x4e, 0x44, 0x50, 0x4f, 0x49, 0x4e,
-	0x54, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x53,
-	0x55, 0x42, 0x53, 0x45, 0x54, 0x10, 0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x4b, 0x45, 0x59, 0x53, 0x5f,
-	0x53, 0x55, 0x42, 0x53, 0x45, 0x54, 0x10, 0x04, 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a,
-	0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x22, 0x4f, 0x0a, 0x16, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65,
-	0x74, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x5f, 0x46, 0x41, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x00,
-	0x12, 0x10, 0x0a, 0x0c, 0x41, 0x4e, 0x59, 0x5f, 0x45, 0x4e, 0x44, 0x50, 0x4f, 0x49, 0x4e, 0x54,
-	0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x55,
-	0x42, 0x53, 0x45, 0x54, 0x10, 0x02, 0x22, 0x4d, 0x0a, 0x1e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73,
-	0x65, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61,
-	0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x45, 0x54, 0x41,
-	0x44, 0x41, 0x54, 0x41, 0x5f, 0x4e, 0x4f, 0x5f, 0x46, 0x41, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b,
-	0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x41, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x5f, 0x4c,
-	0x49, 0x53, 0x54, 0x10, 0x01, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x1a, 0xe3, 0x01, 0x0a, 0x0f, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x73, 0x6c, 0x6f,
-	0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x0a,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x12, 0x44, 0x0a, 0x12, 0x6d, 0x69, 0x6e, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f,
-	0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65,
-	0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x69, 0x6e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x1a, 0x72, 0x0a, 0x12, 0x52, 0x6f, 0x75, 0x6e, 0x64,
-	0x52, 0x6f, 0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a,
-	0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x6c, 0x6f, 0x77, 0x53,
-	0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xc5, 0x02, 0x0a, 0x14,
-	0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x48, 0x0a, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28,
-	0x02, 0x52, 0x0b, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x53,
-	0x0a, 0x13, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x5f, 0x62, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65,
-	0x52, 0x11, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42,
-	0x69, 0x61, 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x72,
-	0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c,
-	0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x1a, 0x91, 0x03, 0x0a, 0x10, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68,
-	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x54, 0x0a, 0x11, 0x6d, 0x69, 0x6e, 0x69,
-	0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x32, 0x05, 0x18, 0x80, 0x80, 0x80, 0x04, 0x52, 0x0f, 0x6d,
-	0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x6d,
-	0x0a, 0x0d, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x65, 0x72, 0x2e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x10, 0x72, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c,
+	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5b, 0x0a, 0x10, 0x6d, 0x61, 0x67, 0x6c, 0x65,
+	0x76, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x34, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x48, 0x01, 0x52, 0x0e, 0x6d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x6b, 0x0a, 0x16, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c,
+	0x5f, 0x64, 0x73, 0x74, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x22,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44,
+	0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x13, 0x6f, 0x72,
+	0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x6e, 0x0a, 0x17, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x25, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x61,
+	0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x68, 0x0a, 0x15, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e,
+	0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x38, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x12, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f,
+	0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x10, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68,
-	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x54, 0x0a,
-	0x11, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69,
-	0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36,
-	0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x32, 0x05, 0x18, 0x80, 0x80,
-	0x80, 0x04, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53,
-	0x69, 0x7a, 0x65, 0x22, 0x2e, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x58, 0x58, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x00,
-	0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x55, 0x52, 0x4d, 0x55, 0x52, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x5f,
-	0x32, 0x10, 0x01, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x50, 0x0a, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
+	0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x75, 0x0a, 0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
+	0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x11, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x72, 0x0a, 0x1b, 0x75,
+	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x19, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x55, 0x0a, 0x28, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6f, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x23, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x4f, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x46,
+	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x12, 0x40, 0x0a, 0x1d, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65,
+	0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x6f, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f,
+	0x72, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c, 0x18, 0x20, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x69,
+	0x67, 0x6e, 0x6f, 0x72, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x4f, 0x6e, 0x48, 0x6f, 0x73,
+	0x74, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c, 0x12, 0x39, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x18, 0x28, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x12, 0x60, 0x0a, 0x15, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x61,
+	0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x41, 0x0a, 0x0a, 0x6c, 0x72, 0x73, 0x5f, 0x73, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x6c,
+	0x72, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x15, 0x74, 0x72, 0x61, 0x63,
+	0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74,
+	0x73, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
+	0x2e, 0x30, 0x18, 0x01, 0x52, 0x13, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x6f,
+	0x75, 0x74, 0x42, 0x75, 0x64, 0x67, 0x65, 0x74, 0x73, 0x12, 0x53, 0x0a, 0x0f, 0x75, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x30, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e,
+	0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5a,
+	0x0a, 0x13, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x31, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x11, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x5e, 0x0a, 0x11, 0x70, 0x72,
+	0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
+	0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x10, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x58, 0x0a, 0x29, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x70, 0x65,
+	0x72, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x33, 0x20, 0x01, 0x28, 0x08, 0x52, 0x25, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x50, 0x65, 0x72,
+	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xe6, 0x01, 0x0a, 0x14, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1b, 0x0a,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x50, 0x0a, 0x10, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73,
+	0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x3a, 0x30, 0x9a, 0xc5, 0x88,
+	0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x98, 0x01,
+	0x0a, 0x11, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79,
+	0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28,
+	0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x1a, 0xa6, 0x01, 0x0a, 0x10, 0x45, 0x64, 0x73,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a,
+	0x0a, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x65, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e,
+	0x61, 0x6d, 0x65, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0x59, 0x0a, 0x0e, 0x4d, 0x61, 0x67, 0x6c, 0x65,
-	0x76, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x47, 0x0a, 0x0a, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07,
-	0x32, 0x05, 0x18, 0xcb, 0x96, 0xb1, 0x02, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69,
-	0x7a, 0x65, 0x1a, 0xf7, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44,
-	0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x26, 0x0a, 0x0f, 0x75, 0x73,
-	0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0d, 0x75, 0x73, 0x65, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x12, 0x28, 0x0a, 0x10, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x68, 0x74,
-	0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x5d, 0x0a, 0x16,
-	0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x76,
-	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x2a,
-	0x04, 0x18, 0xff, 0xff, 0x03, 0x52, 0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50,
-	0x6f, 0x72, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x3a, 0x2f, 0x9a, 0xc5, 0x88,
-	0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
-	0x6c, 0x44, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xd5, 0x0b, 0x0a,
-	0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x4e, 0x0a, 0x17, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63,
-	0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x15, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x79, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12,
-	0x74, 0x0a, 0x14, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x61, 0x77, 0x61, 0x72, 0x65, 0x5f, 0x6c, 0x62,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e,
+	0x2e, 0x45, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x1a, 0xa4, 0x0a, 0x0a, 0x0e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x79, 0x0a, 0x0f, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
+	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75,
 	0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x5a,
-	0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x48, 0x00, 0x52, 0x11, 0x7a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x89, 0x01, 0x0a, 0x1b, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x62, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x18, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
-	0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x49, 0x0a, 0x13, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x72, 0x67,
-	0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x75, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x1f,
-	0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73,
-	0x5f, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x68, 0x63, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x77,
-	0x48, 0x6f, 0x73, 0x74, 0x73, 0x55, 0x6e, 0x74, 0x69, 0x6c, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48,
-	0x63, 0x12, 0x4d, 0x0a, 0x24, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6f, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73,
-	0x65, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x1f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x4f, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x12, 0x8a, 0x01, 0x0a, 0x1c, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x5f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c,
+	0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x0e, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
+	0x3e, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x65,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
+	0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12,
+	0x6b, 0x0a, 0x10, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75,
+	0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62,
+	0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0f, 0x73, 0x75, 0x62,
+	0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x32, 0x0a, 0x15,
+	0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f,
+	0x61, 0x77, 0x61, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x6c, 0x6f, 0x63,
+	0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x41, 0x77, 0x61, 0x72, 0x65,
+	0x12, 0x32, 0x0a, 0x15, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
+	0x74, 0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x13, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x5f, 0x6d, 0x6f,
+	0x64, 0x65, 0x5f, 0x61, 0x6e, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x70, 0x61,
+	0x6e, 0x69, 0x63, 0x4d, 0x6f, 0x64, 0x65, 0x41, 0x6e, 0x79, 0x12, 0x1e, 0x0a, 0x0b, 0x6c, 0x69,
+	0x73, 0x74, 0x5f, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x09, 0x6c, 0x69, 0x73, 0x74, 0x41, 0x73, 0x41, 0x6e, 0x79, 0x12, 0x92, 0x01, 0x0a, 0x18, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
+	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4e, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
+	0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c,
+	0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x46,
+	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x16, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a,
+	0xda, 0x03, 0x0a, 0x10, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x33, 0x0a, 0x16, 0x73, 0x69, 0x6e, 0x67,
+	0x6c, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x75, 0x62, 0x73,
+	0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+	0x48, 0x6f, 0x73, 0x74, 0x50, 0x65, 0x72, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x92, 0x01,
+	0x0a, 0x0f, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76,
-	0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x19, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x57, 0x0a,
-	0x14, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x53,
-	0x65, 0x74, 0x52, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x8d, 0x02, 0x0a, 0x11, 0x5a, 0x6f, 0x6e, 0x65, 0x41,
-	0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3f, 0x0a, 0x0f,
-	0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
-	0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72,
-	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a,
-	0x10, 0x6d, 0x69, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6d, 0x69, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x66, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x66, 0x61, 0x69, 0x6c, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69,
-	0x63, 0x4f, 0x6e, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x3a, 0x3c, 0x9a, 0xc5, 0x88, 0x1e, 0x37, 0x0a,
-	0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x5f, 0x0a, 0x18, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x3a, 0x43, 0x9a, 0xc5, 0x88, 0x1e, 0x3e, 0x0a, 0x3c, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c,
-	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xf1, 0x01, 0x0a, 0x19, 0x43, 0x6f, 0x6e, 0x73,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x37, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73,
-	0x74, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74,
-	0x6e, 0x61, 0x6d, 0x65, 0x46, 0x6f, 0x72, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x55,
-	0x0a, 0x13, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66,
-	0x61, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02,
-	0x28, 0x64, 0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x46,
-	0x61, 0x63, 0x74, 0x6f, 0x72, 0x3a, 0x44, 0x9a, 0xc5, 0x88, 0x1e, 0x3f, 0x0a, 0x3d, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2a, 0x9a, 0xc5, 0x88,
-	0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73,
+	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65,
+	0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73,
+	0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61,
+	0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x12, 0x30, 0x0a, 0x14, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6b,
+	0x65, 0x79, 0x73, 0x5f, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x12, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x73, 0x53, 0x75,
+	0x62, 0x73, 0x65, 0x74, 0x22, 0x79, 0x0a, 0x1e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74,
+	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x54, 0x5f, 0x44, 0x45,
+	0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x5f, 0x46, 0x41,
+	0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x4e, 0x59, 0x5f,
+	0x45, 0x4e, 0x44, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x45,
+	0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x45, 0x54, 0x10, 0x03, 0x12, 0x0f,
+	0x0a, 0x0b, 0x4b, 0x45, 0x59, 0x53, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x45, 0x54, 0x10, 0x04, 0x3a,
+	0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53,
+	0x75, 0x62, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x62, 0x53, 0x75,
+	0x62, 0x73, 0x65, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x22, 0x4f, 0x0a, 0x16,
+	0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x5f, 0x46, 0x41, 0x4c,
+	0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x4e, 0x59, 0x5f, 0x45,
+	0x4e, 0x44, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x45, 0x46,
+	0x41, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x45, 0x54, 0x10, 0x02, 0x22, 0x4d, 0x0a,
+	0x1e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x46, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
+	0x18, 0x0a, 0x14, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4e, 0x4f, 0x5f, 0x46,
+	0x41, 0x4c, 0x4c, 0x42, 0x41, 0x43, 0x4b, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x46, 0x41, 0x4c,
+	0x4c, 0x42, 0x41, 0x43, 0x4b, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x10, 0x01, 0x3a, 0x2a, 0x9a, 0xc5,
+	0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x62, 0x53, 0x75, 0x62, 0x73,
+	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xe3, 0x01, 0x0a, 0x0f, 0x53, 0x6c, 0x6f,
+	0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x11,
+	0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f,
+	0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x57, 0x69, 0x6e,
+	0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x0a, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x12, 0x6d, 0x69, 0x6e, 0x5f,
+	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x69,
+	0x6e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x1a, 0x72,
+	0x0a, 0x12, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x5c, 0x0a, 0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61,
+	0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x1a, 0xc5, 0x02, 0x0a, 0x14, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x48, 0x0a, 0x0c, 0x63,
+	0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42,
+	0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x02, 0x52, 0x0b, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x53, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x11, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x69, 0x61, 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x73, 0x6c,
+	0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72,
+	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61,
+	0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a,
+	0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x91, 0x03, 0x0a, 0x10, 0x52,
+	0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x54, 0x0a, 0x11, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
+	0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x32, 0x05, 0x18,
+	0x80, 0x80, 0x80, 0x04, 0x52, 0x0f, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e,
+	0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x6d, 0x0a, 0x0d, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x66, 0x75,
+	0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52,
+	0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x48, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x54, 0x0a, 0x11, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f,
+	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0a, 0xfa,
+	0x42, 0x07, 0x32, 0x05, 0x18, 0x80, 0x80, 0x80, 0x04, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d,
+	0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x2e, 0x0a, 0x0c, 0x48, 0x61,
+	0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x58, 0x58,
+	0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x55, 0x52, 0x4d, 0x55,
+	0x52, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x32, 0x10, 0x01, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e,
+	0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68,
+	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0x59,
+	0x0a, 0x0e, 0x4d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x47, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x32, 0x05, 0x18, 0xcb, 0x96, 0xb1, 0x02, 0x52, 0x09,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x1a, 0xbf, 0x02, 0x0a, 0x13, 0x4f, 0x72,
+	0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x26, 0x0a, 0x0f, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x75, 0x73, 0x65, 0x48,
+	0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x10, 0x68, 0x74, 0x74,
+	0x70, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0e, 0x68, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x5d, 0x0a, 0x16, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
+	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x2a, 0x04, 0x18, 0xff, 0xff, 0x03, 0x52, 0x14, 0x75, 0x70,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x6f, 0x72, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69,
+	0x64, 0x65, 0x12, 0x46, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b,
+	0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76,
+	0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e,
+	0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c,
+	0x44, 0x73, 0x74, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xd5, 0x0b, 0x0a, 0x0e,
+	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4e,
+	0x0a, 0x17, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x5f,
+	0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x15, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79,
+	0x50, 0x61, 0x6e, 0x69, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x74,
+	0x0a, 0x14, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x61, 0x77, 0x61, 0x72, 0x65, 0x5f, 0x6c, 0x62, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x5a, 0x6f,
+	0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48,
+	0x00, 0x52, 0x11, 0x7a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x89, 0x01, 0x0a, 0x1b, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x63, 0x61,
+	0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x18, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
+	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x49, 0x0a, 0x13, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x72, 0x67, 0x65,
+	0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x4d, 0x65, 0x72, 0x67, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x1f, 0x69,
+	0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x5f,
+	0x75, 0x6e, 0x74, 0x69, 0x6c, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x68, 0x63, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x77, 0x48,
+	0x6f, 0x73, 0x74, 0x73, 0x55, 0x6e, 0x74, 0x69, 0x6c, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x63,
+	0x12, 0x4d, 0x0a, 0x24, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6f, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x65,
+	0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1f,
+	0x63, 0x6c, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x4f, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12,
+	0x8a, 0x01, 0x0a, 0x1c, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33,
 	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c,
-	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x1b, 0x0a, 0x19, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
-	0x69, 0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x1a, 0xd2, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
-	0x52, 0x61, 0x74, 0x65, 0x12, 0x4e, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0xaa, 0x01, 0x08, 0x08, 0x01,
-	0x2a, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x12, 0x4a, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x52, 0x19, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73,
+	0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x57, 0x0a, 0x14,
+	0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x53, 0x65,
+	0x74, 0x52, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x8d, 0x02, 0x0a, 0x11, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77,
+	0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3f, 0x0a, 0x0f, 0x72,
+	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10,
+	0x6d, 0x69, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6d, 0x69, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x53, 0x69, 0x7a, 0x65, 0x12, 0x31, 0x0a, 0x15, 0x66, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x72, 0x61,
+	0x66, 0x66, 0x69, 0x63, 0x5f, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x12, 0x66, 0x61, 0x69, 0x6c, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63,
+	0x4f, 0x6e, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x3a, 0x3c, 0x9a, 0xc5, 0x88, 0x1e, 0x37, 0x0a, 0x35,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x5f, 0x0a, 0x18, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x3a, 0x43, 0x9a, 0xc5, 0x88, 0x1e, 0x3e, 0x0a, 0x3c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f,
+	0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xf1, 0x01, 0x0a, 0x19, 0x43, 0x6f, 0x6e, 0x73, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x37, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74,
+	0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x6e,
+	0x61, 0x6d, 0x65, 0x46, 0x6f, 0x72, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x55, 0x0a,
+	0x13, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66, 0x61,
+	0x63, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
+	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28,
+	0x64, 0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x46, 0x61,
+	0x63, 0x74, 0x6f, 0x72, 0x3a, 0x44, 0x9a, 0xc5, 0x88, 0x1e, 0x3f, 0x0a, 0x3d, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e,
+	0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4c, 0x62,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x1b, 0x0a, 0x19, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
+	0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x1a, 0xd2, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52,
+	0x61, 0x74, 0x65, 0x12, 0x4e, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x2a, 0x04, 0x10,
-	0xc0, 0x84, 0x3d, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
-	0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x1a, 0x83, 0x02, 0x0a, 0x10, 0x50, 0x72,
-	0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x78,
-	0x0a, 0x1d, 0x70, 0x65, 0x72, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x70,
-	0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x08, 0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x52, 0x1a, 0x70, 0x65,
-	0x72, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x12, 0x75, 0x0a, 0x1b, 0x70, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x5f, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x17, 0xfa, 0x42, 0x14,
-	0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x29, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0xf0, 0x3f, 0x52, 0x19, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x74, 0x69, 0x76, 0x65,
-	0x50, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x1a,
-	0x66, 0x0a, 0x22, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x57, 0x0a, 0x0d, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x41, 0x54,
-	0x49, 0x43, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x5f, 0x44,
-	0x4e, 0x53, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x41, 0x4c, 0x5f,
-	0x44, 0x4e, 0x53, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x45, 0x44, 0x53, 0x10, 0x03, 0x12, 0x10,
-	0x0a, 0x0c, 0x4f, 0x52, 0x49, 0x47, 0x49, 0x4e, 0x41, 0x4c, 0x5f, 0x44, 0x53, 0x54, 0x10, 0x04,
-	0x22, 0xa4, 0x01, 0x0a, 0x08, 0x4c, 0x62, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x0f, 0x0a,
-	0x0b, 0x52, 0x4f, 0x55, 0x4e, 0x44, 0x5f, 0x52, 0x4f, 0x42, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x11,
-	0x0a, 0x0d, 0x4c, 0x45, 0x41, 0x53, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10,
-	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x02,
-	0x12, 0x0a, 0x0a, 0x06, 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06,
-	0x4d, 0x41, 0x47, 0x4c, 0x45, 0x56, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4c, 0x55, 0x53,
-	0x54, 0x45, 0x52, 0x5f, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x44, 0x45, 0x44, 0x10, 0x06, 0x12, 0x20,
-	0x0a, 0x1c, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x49, 0x4e, 0x47,
-	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x10, 0x07,
-	0x22, 0x04, 0x08, 0x04, 0x10, 0x04, 0x2a, 0x0f, 0x4f, 0x52, 0x49, 0x47, 0x49, 0x4e, 0x41, 0x4c,
-	0x5f, 0x44, 0x53, 0x54, 0x5f, 0x4c, 0x42, 0x22, 0x50, 0x0a, 0x0f, 0x44, 0x6e, 0x73, 0x4c, 0x6f,
-	0x6f, 0x6b, 0x75, 0x70, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x55,
-	0x54, 0x4f, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x34, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10,
-	0x01, 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x36, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x10,
-	0x0a, 0x0c, 0x56, 0x34, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x45, 0x52, 0x52, 0x45, 0x44, 0x10, 0x03,
-	0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x04, 0x22, 0x54, 0x0a, 0x18, 0x43, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x53, 0x45, 0x5f, 0x43, 0x4f, 0x4e,
-	0x46, 0x49, 0x47, 0x55, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c,
-	0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x53, 0x45, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x53, 0x54,
-	0x52, 0x45, 0x41, 0x4d, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x10, 0x01, 0x3a,
-	0x1b, 0x9a, 0xc5, 0x88, 0x1e, 0x16, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x18, 0x0a, 0x16,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x0f, 0x10, 0x10, 0x4a,
-	0x04, 0x08, 0x07, 0x10, 0x08, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x4a, 0x04, 0x08, 0x23, 0x10,
-	0x24, 0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x52, 0x0b, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x1a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x22, 0xda, 0x02, 0x0a, 0x13, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x08, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x52, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x1a, 0xc8, 0x01, 0x0a, 0x06, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x60, 0x0a, 0x16, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x14, 0x74, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2e, 0x9a, 0xc5, 0x88, 0x1e, 0x29, 0x0a, 0x27,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x6f, 0x61,
-	0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08,
-	0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xf9,
-	0x01, 0x0a, 0x19, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x47, 0x0a, 0x0d,
-	0x74, 0x63, 0x70, 0x5f, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x63, 0x70, 0x4b, 0x65,
-	0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x52, 0x0c, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70,
-	0x61, 0x6c, 0x69, 0x76, 0x65, 0x12, 0x64, 0x0a, 0x30, 0x73, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x63,
-	0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x5f, 0x6f, 0x6e, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x2a, 0x73, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61,
-	0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x4f, 0x6e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x2d, 0x9a, 0xc5, 0x88,
-	0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x72, 0x0a, 0x11, 0x54, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0xaa, 0x01, 0x08, 0x08, 0x01, 0x2a,
+	0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x76, 0x61, 0x6c, 0x12, 0x4a, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x2a, 0x04, 0x10, 0xc0,
+	0x84, 0x3d, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a,
+	0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x1a, 0x83, 0x02, 0x0a, 0x10, 0x50, 0x72, 0x65,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x78, 0x0a,
+	0x1d, 0x70, 0x65, 0x72, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x70, 0x72,
+	0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x52, 0x1a, 0x70, 0x65, 0x72,
+	0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x12, 0x75, 0x0a, 0x1b, 0x70, 0x72, 0x65, 0x64, 0x69,
+	0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x5f, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
+	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12,
+	0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xf0, 0x3f, 0x52, 0x19, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x74, 0x69, 0x76, 0x65, 0x50,
+	0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x1a, 0x66,
+	0x0a, 0x22, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x57, 0x0a, 0x0d, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
+	0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x41, 0x54, 0x49,
+	0x43, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x5f, 0x44, 0x4e,
+	0x53, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x41, 0x4c, 0x5f, 0x44,
+	0x4e, 0x53, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x45, 0x44, 0x53, 0x10, 0x03, 0x12, 0x10, 0x0a,
+	0x0c, 0x4f, 0x52, 0x49, 0x47, 0x49, 0x4e, 0x41, 0x4c, 0x5f, 0x44, 0x53, 0x54, 0x10, 0x04, 0x22,
+	0xa4, 0x01, 0x0a, 0x08, 0x4c, 0x62, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x0f, 0x0a, 0x0b,
+	0x52, 0x4f, 0x55, 0x4e, 0x44, 0x5f, 0x52, 0x4f, 0x42, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x11, 0x0a,
+	0x0d, 0x4c, 0x45, 0x41, 0x53, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01,
+	0x12, 0x0d, 0x0a, 0x09, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x02, 0x12,
+	0x0a, 0x0a, 0x06, 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x4d,
+	0x41, 0x47, 0x4c, 0x45, 0x56, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4c, 0x55, 0x53, 0x54,
+	0x45, 0x52, 0x5f, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x44, 0x45, 0x44, 0x10, 0x06, 0x12, 0x20, 0x0a,
+	0x1c, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x49, 0x4e, 0x47, 0x5f,
+	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x10, 0x07, 0x22,
+	0x04, 0x08, 0x04, 0x10, 0x04, 0x2a, 0x0f, 0x4f, 0x52, 0x49, 0x47, 0x49, 0x4e, 0x41, 0x4c, 0x5f,
+	0x44, 0x53, 0x54, 0x5f, 0x4c, 0x42, 0x22, 0x50, 0x0a, 0x0f, 0x44, 0x6e, 0x73, 0x4c, 0x6f, 0x6f,
+	0x6b, 0x75, 0x70, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x55, 0x54,
+	0x4f, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x56, 0x34, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01,
+	0x12, 0x0b, 0x0a, 0x07, 0x56, 0x36, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x10, 0x0a,
+	0x0c, 0x56, 0x34, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x45, 0x52, 0x52, 0x45, 0x44, 0x10, 0x03, 0x12,
+	0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x04, 0x22, 0x54, 0x0a, 0x18, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x53, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x53, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x46,
+	0x49, 0x47, 0x55, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x10,
+	0x00, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x53, 0x45, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x53, 0x54, 0x52,
+	0x45, 0x41, 0x4d, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x10, 0x01, 0x3a, 0x1b,
+	0x9a, 0xc5, 0x88, 0x1e, 0x16, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x18, 0x0a, 0x16, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x0f, 0x10, 0x10, 0x4a, 0x04,
+	0x08, 0x07, 0x10, 0x08, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x4a, 0x04, 0x08, 0x23, 0x10, 0x24,
+	0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x52, 0x0b, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x78, 0x74, 0x52, 0x1a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x22, 0xda, 0x02, 0x0a, 0x13, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
+	0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69,
+	0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
+	0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52,
+	0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x1a, 0xc8, 0x01, 0x0a, 0x06, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x12, 0x60, 0x0a, 0x16, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
+	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x14, 0x74, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2e, 0x9a, 0xc5, 0x88, 0x1e, 0x29, 0x0a, 0x27, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64,
+	0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x01,
+	0x10, 0x02, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xf9, 0x01,
+	0x0a, 0x19, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x47, 0x0a, 0x0d, 0x74,
+	0x63, 0x70, 0x5f, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65,
+	0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x52, 0x0c, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61,
+	0x6c, 0x69, 0x76, 0x65, 0x12, 0x64, 0x0a, 0x30, 0x73, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x63, 0x61,
+	0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x5f, 0x6f, 0x6e, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x2a,
+	0x73, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x4f, 0x6e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e,
+	0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa0, 0x01, 0x0a, 0x11, 0x54, 0x72,
 	0x61, 0x63, 0x6b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12,
 	0x27, 0x0a, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x62, 0x75, 0x64, 0x67, 0x65,
 	0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
 	0x74, 0x42, 0x75, 0x64, 0x67, 0x65, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x73, 0x69, 0x7a,
 	0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x42, 0x89,
-	0x01, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x12, 0x2c,
+	0x0a, 0x12, 0x70, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73,
+	0x74, 0x61, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x70, 0x65, 0x72, 0x45,
+	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x42, 0x89, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3977,8 +4023,9 @@ var file_envoy_config_cluster_v3_cluster_proto_goTypes = []interface{}{
 	(*v32.RuntimeDouble)(nil),                                                   // 55: envoy.config.core.v3.RuntimeDouble
 	(*v33.Percent)(nil),                                                         // 56: envoy.type.v3.Percent
 	(*wrappers.UInt64Value)(nil),                                                // 57: google.protobuf.UInt64Value
-	(*v32.HealthStatusSet)(nil),                                                 // 58: envoy.config.core.v3.HealthStatusSet
-	(*wrappers.DoubleValue)(nil),                                                // 59: google.protobuf.DoubleValue
+	(*v34.MetadataKey)(nil),                                                     // 58: envoy.type.metadata.v3.MetadataKey
+	(*v32.HealthStatusSet)(nil),                                                 // 59: envoy.config.core.v3.HealthStatusSet
+	(*wrappers.DoubleValue)(nil),                                                // 60: google.protobuf.DoubleValue
 }
 var file_envoy_config_cluster_v3_cluster_proto_depIdxs = []int32{
 	32, // 0: envoy.config.cluster.v3.ClusterCollection.entries:type_name -> xds.core.v3.CollectionEntry
@@ -4047,27 +4094,28 @@ var file_envoy_config_cluster_v3_cluster_proto_depIdxs = []int32{
 	57, // 63: envoy.config.cluster.v3.Cluster.RingHashLbConfig.maximum_ring_size:type_name -> google.protobuf.UInt64Value
 	57, // 64: envoy.config.cluster.v3.Cluster.MaglevLbConfig.table_size:type_name -> google.protobuf.UInt64Value
 	34, // 65: envoy.config.cluster.v3.Cluster.OriginalDstLbConfig.upstream_port_override:type_name -> google.protobuf.UInt32Value
-	56, // 66: envoy.config.cluster.v3.Cluster.CommonLbConfig.healthy_panic_threshold:type_name -> envoy.type.v3.Percent
-	28, // 67: envoy.config.cluster.v3.Cluster.CommonLbConfig.zone_aware_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig
-	29, // 68: envoy.config.cluster.v3.Cluster.CommonLbConfig.locality_weighted_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig
-	33, // 69: envoy.config.cluster.v3.Cluster.CommonLbConfig.update_merge_window:type_name -> google.protobuf.Duration
-	30, // 70: envoy.config.cluster.v3.Cluster.CommonLbConfig.consistent_hashing_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig
-	58, // 71: envoy.config.cluster.v3.Cluster.CommonLbConfig.override_host_status:type_name -> envoy.config.core.v3.HealthStatusSet
-	33, // 72: envoy.config.cluster.v3.Cluster.RefreshRate.base_interval:type_name -> google.protobuf.Duration
-	33, // 73: envoy.config.cluster.v3.Cluster.RefreshRate.max_interval:type_name -> google.protobuf.Duration
-	59, // 74: envoy.config.cluster.v3.Cluster.PreconnectPolicy.per_upstream_preconnect_ratio:type_name -> google.protobuf.DoubleValue
-	59, // 75: envoy.config.cluster.v3.Cluster.PreconnectPolicy.predictive_preconnect_ratio:type_name -> google.protobuf.DoubleValue
-	54, // 76: envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry.value:type_name -> google.protobuf.Any
-	6,  // 77: envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.fallback_policy:type_name -> envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.LbSubsetSelectorFallbackPolicy
-	56, // 78: envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig.routing_enabled:type_name -> envoy.type.v3.Percent
-	57, // 79: envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig.min_cluster_size:type_name -> google.protobuf.UInt64Value
-	34, // 80: envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig.hash_balance_factor:type_name -> google.protobuf.UInt32Value
-	44, // 81: envoy.config.cluster.v3.LoadBalancingPolicy.Policy.typed_extension_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	82, // [82:82] is the sub-list for method output_type
-	82, // [82:82] is the sub-list for method input_type
-	82, // [82:82] is the sub-list for extension type_name
-	82, // [82:82] is the sub-list for extension extendee
-	0,  // [0:82] is the sub-list for field type_name
+	58, // 66: envoy.config.cluster.v3.Cluster.OriginalDstLbConfig.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
+	56, // 67: envoy.config.cluster.v3.Cluster.CommonLbConfig.healthy_panic_threshold:type_name -> envoy.type.v3.Percent
+	28, // 68: envoy.config.cluster.v3.Cluster.CommonLbConfig.zone_aware_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig
+	29, // 69: envoy.config.cluster.v3.Cluster.CommonLbConfig.locality_weighted_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig
+	33, // 70: envoy.config.cluster.v3.Cluster.CommonLbConfig.update_merge_window:type_name -> google.protobuf.Duration
+	30, // 71: envoy.config.cluster.v3.Cluster.CommonLbConfig.consistent_hashing_lb_config:type_name -> envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig
+	59, // 72: envoy.config.cluster.v3.Cluster.CommonLbConfig.override_host_status:type_name -> envoy.config.core.v3.HealthStatusSet
+	33, // 73: envoy.config.cluster.v3.Cluster.RefreshRate.base_interval:type_name -> google.protobuf.Duration
+	33, // 74: envoy.config.cluster.v3.Cluster.RefreshRate.max_interval:type_name -> google.protobuf.Duration
+	60, // 75: envoy.config.cluster.v3.Cluster.PreconnectPolicy.per_upstream_preconnect_ratio:type_name -> google.protobuf.DoubleValue
+	60, // 76: envoy.config.cluster.v3.Cluster.PreconnectPolicy.predictive_preconnect_ratio:type_name -> google.protobuf.DoubleValue
+	54, // 77: envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry.value:type_name -> google.protobuf.Any
+	6,  // 78: envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.fallback_policy:type_name -> envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.LbSubsetSelectorFallbackPolicy
+	56, // 79: envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig.routing_enabled:type_name -> envoy.type.v3.Percent
+	57, // 80: envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig.min_cluster_size:type_name -> google.protobuf.UInt64Value
+	34, // 81: envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig.hash_balance_factor:type_name -> google.protobuf.UInt32Value
+	44, // 82: envoy.config.cluster.v3.LoadBalancingPolicy.Policy.typed_extension_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	83, // [83:83] is the sub-list for method output_type
+	83, // [83:83] is the sub-list for method input_type
+	83, // [83:83] is the sub-list for extension type_name
+	83, // [83:83] is the sub-list for extension extendee
+	0,  // [0:83] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_cluster_v3_cluster_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.validate.go
index 85d03677213..e2c95efa0e1 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/cluster.pb.validate.go
@@ -1883,6 +1883,8 @@ func (m *TrackClusterStats) validate(all bool) error {
 
 	// no validation rules for RequestResponseSizes
 
+	// no validation rules for PerEndpointStats
+
 	if len(errors) > 0 {
 		return TrackClusterStatsMultiError(errors)
 	}
@@ -3402,6 +3404,35 @@ func (m *Cluster_OriginalDstLbConfig) validate(all bool) error {
 
 	}
 
+	if all {
+		switch v := interface{}(m.GetMetadataKey()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, Cluster_OriginalDstLbConfigValidationError{
+					field:  "MetadataKey",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, Cluster_OriginalDstLbConfigValidationError{
+					field:  "MetadataKey",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetMetadataKey()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return Cluster_OriginalDstLbConfigValidationError{
+				field:  "MetadataKey",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return Cluster_OriginalDstLbConfigMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.go
index 04718a11707..52a15c0413d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.go
@@ -1,13 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/cluster/v3/filter.proto
 
 package clusterv3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
+	v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	any1 "github.com/golang/protobuf/ptypes/any"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -33,8 +34,14 @@ type Filter struct {
 	// Filter specific configuration which depends on the filter being
 	// instantiated. See the supported filters for further documentation.
 	// Note that Envoy's :ref:`downstream network
-	// filters <config_network_filters>` are not valid upstream filters.
+	// filters <config_network_filters>` are not valid upstream network filters.
+	// Only one of typed_config or config_discovery can be used.
 	TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"`
+	// Configuration source specifier for an extension configuration discovery
+	// service. In case of a failure and without the default configuration, the
+	// listener closes the connections.
+	// Only one of typed_config or config_discovery can be used.
+	ConfigDiscovery *v3.ExtensionConfigSource `protobuf:"bytes,3,opt,name=config_discovery,json=configDiscovery,proto3" json:"config_discovery,omitempty"`
 }
 
 func (x *Filter) Reset() {
@@ -83,6 +90,13 @@ func (x *Filter) GetTypedConfig() *any1.Any {
 	return nil
 }
 
+func (x *Filter) GetConfigDiscovery() *v3.ExtensionConfigSource {
+	if x != nil {
+		return x.ConfigDiscovery
+	}
+	return nil
+}
+
 var File_envoy_config_cluster_v3_filter_proto protoreflect.FileDescriptor
 
 var file_envoy_config_cluster_v3_filter_proto_rawDesc = []byte{
@@ -90,31 +104,39 @@ var file_envoy_config_cluster_v3_filter_proto_rawDesc = []byte{
 	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x17, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x1a,
-	0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61,
-	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f,
-	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x82, 0x01, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
-	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a,
-	0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x88, 0x01, 0x0a, 0x25, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
+	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
+	0xda, 0x01, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
+	0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x56, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44,
+	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a,
+	0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x88, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -131,16 +153,18 @@ func file_envoy_config_cluster_v3_filter_proto_rawDescGZIP() []byte {
 
 var file_envoy_config_cluster_v3_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_envoy_config_cluster_v3_filter_proto_goTypes = []interface{}{
-	(*Filter)(nil),   // 0: envoy.config.cluster.v3.Filter
-	(*any1.Any)(nil), // 1: google.protobuf.Any
+	(*Filter)(nil),                   // 0: envoy.config.cluster.v3.Filter
+	(*any1.Any)(nil),                 // 1: google.protobuf.Any
+	(*v3.ExtensionConfigSource)(nil), // 2: envoy.config.core.v3.ExtensionConfigSource
 }
 var file_envoy_config_cluster_v3_filter_proto_depIdxs = []int32{
 	1, // 0: envoy.config.cluster.v3.Filter.typed_config:type_name -> google.protobuf.Any
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	2, // 1: envoy.config.cluster.v3.Filter.config_discovery:type_name -> envoy.config.core.v3.ExtensionConfigSource
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_cluster_v3_filter_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.validate.go
index 515a2e69644..a9bb71921ce 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/filter.pb.validate.go
@@ -96,6 +96,35 @@ func (m *Filter) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetConfigDiscovery()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, FilterValidationError{
+					field:  "ConfigDiscovery",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, FilterValidationError{
+					field:  "ConfigDiscovery",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetConfigDiscovery()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return FilterValidationError{
+				field:  "ConfigDiscovery",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return FilterMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.go
index 32333d3d1a6..291ff788358 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/cluster/v3/outlier_detection.proto
 
 package clusterv3
@@ -26,7 +26,7 @@ const (
 
 // See the :ref:`architecture overview <arch_overview_outlier_detection>` for
 // more information on outlier detection.
-// [#next-free-field: 23]
+// [#next-free-field: 24]
 type OutlierDetection struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -142,6 +142,11 @@ type OutlierDetection struct {
 	// See :ref:`max_ejection_time_jitter<envoy_v3_api_field_config.cluster.v3.OutlierDetection.base_ejection_time>`
 	// Defaults to 0s.
 	MaxEjectionTimeJitter *duration.Duration `protobuf:"bytes,22,opt,name=max_ejection_time_jitter,json=maxEjectionTimeJitter,proto3" json:"max_ejection_time_jitter,omitempty"`
+	// If active health checking is enabled and a host is ejected by outlier detection, a successful active health check
+	// unejects the host by default and considers it as healthy. Unejection also clears all the outlier detection counters.
+	// To change this default behavior set this config to “false“ where active health checking will not uneject the host.
+	// Defaults to true.
+	SuccessfulActiveHealthCheckUnejectHost *wrappers.BoolValue `protobuf:"bytes,23,opt,name=successful_active_health_check_uneject_host,json=successfulActiveHealthCheckUnejectHost,proto3" json:"successful_active_health_check_uneject_host,omitempty"`
 }
 
 func (x *OutlierDetection) Reset() {
@@ -330,6 +335,13 @@ func (x *OutlierDetection) GetMaxEjectionTimeJitter() *duration.Duration {
 	return nil
 }
 
+func (x *OutlierDetection) GetSuccessfulActiveHealthCheckUnejectHost() *wrappers.BoolValue {
+	if x != nil {
+		return x.SuccessfulActiveHealthCheckUnejectHost
+	}
+	return nil
+}
+
 var File_envoy_config_cluster_v3_outlier_detection_proto protoreflect.FileDescriptor
 
 var file_envoy_config_cluster_v3_outlier_detection_proto_rawDesc = []byte{
@@ -347,7 +359,7 @@ var file_envoy_config_cluster_v3_outlier_detection_proto_rawDesc = []byte{
 	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73,
 	0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61,
 	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x11, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x12, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65,
 	0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x45, 0x0a, 0x0f, 0x63, 0x6f,
 	0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x35, 0x78, 0x78, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
@@ -481,20 +493,27 @@ var file_envoy_config_cluster_v3_outlier_detection_proto_rawDesc = []byte{
 	0x74, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x3a, 0x2c, 0x9a, 0xc5, 0x88,
-	0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72,
-	0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x92, 0x01, 0x0a, 0x25, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x42, 0x15, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x12, 0x77, 0x0a, 0x2b, 0x73,
+	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
+	0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x75, 0x6e,
+	0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x26, 0x73, 0x75,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x6e, 0x65, 0x6a, 0x65, 0x63, 0x74,
+	0x48, 0x6f, 0x73, 0x74, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x42, 0x92, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0x42, 0x15, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -514,6 +533,7 @@ var file_envoy_config_cluster_v3_outlier_detection_proto_goTypes = []interface{}
 	(*OutlierDetection)(nil),     // 0: envoy.config.cluster.v3.OutlierDetection
 	(*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value
 	(*duration.Duration)(nil),    // 2: google.protobuf.Duration
+	(*wrappers.BoolValue)(nil),   // 3: google.protobuf.BoolValue
 }
 var file_envoy_config_cluster_v3_outlier_detection_proto_depIdxs = []int32{
 	1,  // 0: envoy.config.cluster.v3.OutlierDetection.consecutive_5xx:type_name -> google.protobuf.UInt32Value
@@ -537,11 +557,12 @@ var file_envoy_config_cluster_v3_outlier_detection_proto_depIdxs = []int32{
 	1,  // 18: envoy.config.cluster.v3.OutlierDetection.failure_percentage_request_volume:type_name -> google.protobuf.UInt32Value
 	2,  // 19: envoy.config.cluster.v3.OutlierDetection.max_ejection_time:type_name -> google.protobuf.Duration
 	2,  // 20: envoy.config.cluster.v3.OutlierDetection.max_ejection_time_jitter:type_name -> google.protobuf.Duration
-	21, // [21:21] is the sub-list for method output_type
-	21, // [21:21] is the sub-list for method input_type
-	21, // [21:21] is the sub-list for extension type_name
-	21, // [21:21] is the sub-list for extension extendee
-	0,  // [0:21] is the sub-list for field type_name
+	3,  // 21: envoy.config.cluster.v3.OutlierDetection.successful_active_health_check_uneject_host:type_name -> google.protobuf.BoolValue
+	22, // [22:22] is the sub-list for method output_type
+	22, // [22:22] is the sub-list for method input_type
+	22, // [22:22] is the sub-list for extension type_name
+	22, // [22:22] is the sub-list for extension extendee
+	0,  // [0:22] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_cluster_v3_outlier_detection_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.validate.go
index 9302650d406..44f24b5511a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3/outlier_detection.pb.validate.go
@@ -545,6 +545,35 @@ func (m *OutlierDetection) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetSuccessfulActiveHealthCheckUnejectHost()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, OutlierDetectionValidationError{
+					field:  "SuccessfulActiveHealthCheckUnejectHost",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, OutlierDetectionValidationError{
+					field:  "SuccessfulActiveHealthCheckUnejectHost",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetSuccessfulActiveHealthCheckUnejectHost()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return OutlierDetectionValidationError{
+				field:  "SuccessfulActiveHealthCheckUnejectHost",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return OutlierDetectionMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3/matcher.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3/matcher.pb.go
index 2e656bb70bc..75db459f860 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3/matcher.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3/matcher.pb.go
@@ -1,14 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/common/matcher/v3/matcher.proto
 
 package matcherv3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
-	_ "github.com/cncf/xds/go/xds/annotations/v3"
 	v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	v32 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
@@ -31,12 +30,17 @@ const (
 // is found the action specified by the most specific on_no_match will be evaluated.
 // As an on_no_match might result in another matching tree being evaluated, this process
 // might repeat several times until the final OnMatch (or no match) is decided.
+//
+// .. note::
+//
+//	Please use the syntactically equivalent :ref:`matching API <envoy_v3_api_msg_.xds.type.matcher.v3.Matcher>`
 type Matcher struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatcherType:
+	//
 	//	*Matcher_MatcherList_
 	//	*Matcher_MatcherTree_
 	MatcherType isMatcher_MatcherType `protobuf_oneof:"matcher_type"`
@@ -134,6 +138,7 @@ type MatchPredicate struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*MatchPredicate_OrMatch
 	//	*MatchPredicate_AndMatch
 	//	*MatchPredicate_NotMatch
@@ -388,9 +393,9 @@ func (x *HttpHeadersMatch) GetHeaders() []*v3.HeaderMatcher {
 //
 // .. attention::
 //
-//   Searching for patterns in HTTP body is potentially cpu intensive. For each specified pattern, http body is scanned byte by byte to find a match.
-//   If multiple patterns are specified, the process is repeated for each pattern. If location of a pattern is known, ``bytes_limit`` should be specified
-//   to scan only part of the http body.
+//	Searching for patterns in HTTP body is potentially cpu intensive. For each specified pattern, http body is scanned byte by byte to find a match.
+//	If multiple patterns are specified, the process is repeated for each pattern. If location of a pattern is known, ``bytes_limit`` should be specified
+//	to scan only part of the http body.
 type HttpGenericBodyMatch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -455,6 +460,7 @@ type Matcher_OnMatch struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to OnMatch:
+	//
 	//	*Matcher_OnMatch_Matcher
 	//	*Matcher_OnMatch_Action
 	OnMatch isMatcher_OnMatch_OnMatch `protobuf_oneof:"on_match"`
@@ -598,6 +604,7 @@ type Matcher_MatcherTree struct {
 	// the corresponding OnMatch is used.
 	//
 	// Types that are assignable to TreeType:
+	//
 	//	*Matcher_MatcherTree_ExactMatchMap
 	//	*Matcher_MatcherTree_PrefixMatchMap
 	//	*Matcher_MatcherTree_CustomMatch
@@ -702,6 +709,7 @@ type Matcher_MatcherList_Predicate struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchType:
+	//
 	//	*Matcher_MatcherList_Predicate_SinglePredicate_
 	//	*Matcher_MatcherList_Predicate_OrMatcher
 	//	*Matcher_MatcherList_Predicate_AndMatcher
@@ -876,6 +884,7 @@ type Matcher_MatcherList_Predicate_SinglePredicate struct {
 	// [#extension-category: envoy.matching.common_inputs]
 	Input *v31.TypedExtensionConfig `protobuf:"bytes,1,opt,name=input,proto3" json:"input,omitempty"`
 	// Types that are assignable to Matcher:
+	//
 	//	*Matcher_MatcherList_Predicate_SinglePredicate_ValueMatch
 	//	*Matcher_MatcherList_Predicate_SinglePredicate_CustomMatch
 	Matcher isMatcher_MatcherList_Predicate_SinglePredicate_Matcher `protobuf_oneof:"matcher"`
@@ -1113,6 +1122,7 @@ type HttpGenericBodyMatch_GenericTextMatch struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*HttpGenericBodyMatch_GenericTextMatch_StringMatch
 	//	*HttpGenericBodyMatch_GenericTextMatch_BinaryMatch
 	Rule isHttpGenericBodyMatch_GenericTextMatch_Rule `protobuf_oneof:"rule"`
@@ -1206,259 +1216,256 @@ var file_envoy_config_common_matcher_v3_matcher_proto_rawDesc = []byte{
 	0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x1a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
 	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xe4, 0x11, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x58, 0x0a, 0x0c, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x58, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x5f, 0x74, 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65,
-	0x48, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x12,
-	0x4f, 0x0a, 0x0b, 0x6f, 0x6e, 0x5f, 0x6e, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x09, 0x6f, 0x6e, 0x4e, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x1a, 0xa5, 0x01, 0x0a, 0x07, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x43, 0x0a, 0x07,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x12, 0x44, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52,
-	0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa2, 0x09, 0x0a, 0x0b, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x66, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e,
+	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xda,
+	0x11, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x58, 0x0a, 0x0c, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x58, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f,
+	0x74, 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
 	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e,
-	0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73,
-	0x1a, 0xdc, 0x06, 0x0a, 0x09, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x7a,
-	0x0a, 0x10, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x6c,
-	0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x6c, 0x0a, 0x0a, 0x6f, 0x72,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c,
-	0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6f,
-	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b, 0x61, 0x6e, 0x64, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e,
+	0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x48,
+	0x00, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x12, 0x4f,
+	0x0a, 0x0b, 0x6f, 0x6e, 0x5f, 0x6e, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x52, 0x09, 0x6f, 0x6e, 0x4e, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a,
+	0xa5, 0x01, 0x0a, 0x07, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x43, 0x0a, 0x07, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x12, 0x44, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x06,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa2, 0x09, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x66, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x1a,
+	0xdc, 0x06, 0x0a, 0x09, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x7a, 0x0a,
+	0x10, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+	0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x6c, 0x0a, 0x0a, 0x6f, 0x72, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
 	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
 	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69,
 	0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x6e,
-	0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0b, 0x6e, 0x6f, 0x74, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69,
-	0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0a,
-	0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x1a, 0x87, 0x02, 0x0a, 0x0f, 0x53,
-	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x4a,
-	0x0a, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x47, 0x0a, 0x0b, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12,
-	0x03, 0xf8, 0x42, 0x01, 0x1a, 0x76, 0x0a, 0x0d, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08,
-	0x02, 0x52, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x11, 0x0a, 0x0a,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a,
-	0xcb, 0x01, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x70, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x6f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xe7, 0x04,
-	0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x12, 0x4a, 0x0a,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6f, 0x72,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b, 0x61, 0x6e, 0x64, 0x5f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73,
+	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x65, 0x64,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x6e, 0x64,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0b, 0x6e, 0x6f, 0x74, 0x5f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73,
+	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x6e,
+	0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x1a, 0x87, 0x02, 0x0a, 0x0f, 0x53, 0x69,
+	0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x4a, 0x0a,
 	0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
 	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
 	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x66, 0x0a, 0x0f, 0x65, 0x78, 0x61,
-	0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x47, 0x0a, 0x0b, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x03,
+	0xf8, 0x42, 0x01, 0x1a, 0x76, 0x0a, 0x0d, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02,
+	0x52, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x11, 0x0a, 0x0a, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xcb,
+	0x01, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12,
+	0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
 	0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70,
-	0x48, 0x00, 0x52, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61,
-	0x70, 0x12, 0x68, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x70, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x4f, 0x0a, 0x0c, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52,
-	0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xd6, 0x01, 0x0a,
-	0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x61, 0x0a, 0x03, 0x6d, 0x61, 0x70,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x4d, 0x61, 0x70, 0x2e, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x9a, 0x01, 0x02, 0x08, 0x01, 0x52, 0x03, 0x6d, 0x61, 0x70, 0x1a, 0x67, 0x0a, 0x08,
-	0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08,
-	0x01, 0x42, 0x13, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xe8, 0x08, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f, 0x72, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x56, 0x0a, 0x09, 0x61, 0x6e, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x08, 0x61,
-	0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4d, 0x0a, 0x09, 0x6e, 0x6f, 0x74, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76,
+	0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x70, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
+	0x02, 0x10, 0x01, 0x52, 0x07, 0x6f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xe7, 0x04, 0x0a,
+	0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x12, 0x4a, 0x0a, 0x05,
+	0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x66, 0x0a, 0x0f, 0x65, 0x78, 0x61, 0x63,
+	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48,
+	0x00, 0x52, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70,
+	0x12, 0x68, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
 	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x6e, 0x6f,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x26, 0x0a, 0x09, 0x61, 0x6e, 0x79, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x6a, 0x02,
-	0x08, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x6f,
-	0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x17, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
-	0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x70, 0x72, 0x65, 0x66,
+	0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xd6, 0x01, 0x0a, 0x08,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x61, 0x0a, 0x03, 0x6d, 0x61, 0x70, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x4d, 0x61, 0x70, 0x2e, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x9a, 0x01, 0x02, 0x08, 0x01, 0x52, 0x03, 0x6d, 0x61, 0x70, 0x1a, 0x67, 0x0a, 0x08, 0x4d,
+	0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x13, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xe8, 0x08, 0x0a, 0x0e,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54,
+	0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x72, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x56, 0x0a, 0x09, 0x61, 0x6e, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72,
+	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74,
+	0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4d, 0x0a, 0x09,
+	0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48,
+	0x00, 0x52, 0x08, 0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x26, 0x0a, 0x09, 0x61,
+	0x6e, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x79, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x6f, 0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74,
-	0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x73, 0x0a, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74,
-	0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52,
-	0x19, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x72, 0x61,
-	0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x7c, 0x0a, 0x1f, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72,
-	0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
-	0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1b, 0x68, 0x74, 0x74,
-	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42,
-	0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x7e, 0x0a, 0x20, 0x68, 0x74, 0x74, 0x70,
-	0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
-	0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42,
-	0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1c, 0x68, 0x74, 0x74, 0x70,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42,
-	0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x5a, 0x0a, 0x08, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x53, 0x65, 0x74, 0x12, 0x4e, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02, 0x52, 0x05, 0x72,
-	0x75, 0x6c, 0x65, 0x73, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42,
-	0x01, 0x22, 0x52, 0x0a, 0x10, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x22, 0xa1, 0x02, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65,
-	0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1f,
-	0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
-	0x6b, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f,
-	0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54,
-	0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
-	0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x1a, 0x7b, 0x0a, 0x10,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x2c, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48,
-	0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c,
-	0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52,
-	0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x0b, 0x0a, 0x04,
-	0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x97, 0x01, 0x0a, 0x2c, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x17, 0x68, 0x74, 0x74,
+	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76,
-	0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68,
+	0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f,
+	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
+	0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
+	0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x73, 0x0a, 0x1c, 0x68, 0x74,
+	0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69,
+	0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x48, 0x00, 0x52, 0x19, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x7c, 0x0a, 0x1f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65,
+	0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
+	0x52, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x7e, 0x0a,
+	0x20, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x67,
+	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52,
+	0x1c, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x5a, 0x0a,
+	0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x12, 0x4e, 0x0a, 0x05, 0x72, 0x75, 0x6c,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50,
+	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
+	0x08, 0x02, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c,
+	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x52, 0x0a, 0x10, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x22, 0xa1, 0x02, 0x0a, 0x14, 0x48,
+	0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x12, 0x6b, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e,
+	0x73, 0x1a, 0x7b, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02,
+	0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x97,
+	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x2c, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.go
index 7f61c14b8a2..6ad40af6423 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/address.proto
 
 package corev3
@@ -138,6 +138,7 @@ type EnvoyInternalAddress struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to AddressNameSpecifier:
+	//
 	//	*EnvoyInternalAddress_ServerListenerName
 	AddressNameSpecifier isEnvoyInternalAddress_AddressNameSpecifier `protobuf_oneof:"address_name_specifier"`
 	// Specifies an endpoint identifier to distinguish between multiple endpoints for the same internal listener in a
@@ -219,18 +220,19 @@ type SocketAddress struct {
 
 	Protocol SocketAddress_Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=envoy.config.core.v3.SocketAddress_Protocol" json:"protocol,omitempty"`
 	// The address for this socket. :ref:`Listeners <config_listeners>` will bind
-	// to the address. An empty address is not allowed. Specify ``0.0.0.0`` or ``::``
+	// to the address. An empty address is not allowed. Specify “0.0.0.0“ or “::“
 	// to bind to any address. [#comment:TODO(zuercher) reinstate when implemented:
 	// It is possible to distinguish a Listener address via the prefix/suffix matching
 	// in :ref:`FilterChainMatch <envoy_v3_api_msg_config.listener.v3.FilterChainMatch>`.] When used
 	// within an upstream :ref:`BindConfig <envoy_v3_api_msg_config.core.v3.BindConfig>`, the address
 	// controls the source address of outbound connections. For :ref:`clusters
 	// <envoy_v3_api_msg_config.cluster.v3.Cluster>`, the cluster type determines whether the
-	// address must be an IP (``STATIC`` or ``EDS`` clusters) or a hostname resolved by DNS
-	// (``STRICT_DNS`` or ``LOGICAL_DNS`` clusters). Address resolution can be customized
+	// address must be an IP (“STATIC“ or “EDS“ clusters) or a hostname resolved by DNS
+	// (“STRICT_DNS“ or “LOGICAL_DNS“ clusters). Address resolution can be customized
 	// via :ref:`resolver_name <envoy_v3_api_field_config.core.v3.SocketAddress.resolver_name>`.
 	Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	// Types that are assignable to PortSpecifier:
+	//
 	//	*SocketAddress_PortValue
 	//	*SocketAddress_NamedPort
 	PortSpecifier isSocketAddress_PortSpecifier `protobuf_oneof:"port_specifier"`
@@ -238,12 +240,12 @@ type SocketAddress struct {
 	// this is empty, a context dependent default applies. If the address is a concrete
 	// IP address, no resolution will occur. If address is a hostname this
 	// should be set for resolution other than DNS. Specifying a custom resolver with
-	// ``STRICT_DNS`` or ``LOGICAL_DNS`` will generate an error at runtime.
+	// “STRICT_DNS“ or “LOGICAL_DNS“ will generate an error at runtime.
 	ResolverName string `protobuf:"bytes,5,opt,name=resolver_name,json=resolverName,proto3" json:"resolver_name,omitempty"`
 	// When binding to an IPv6 address above, this enables `IPv4 compatibility
-	// <https://tools.ietf.org/html/rfc3493#page-11>`_. Binding to ``::`` will
+	// <https://tools.ietf.org/html/rfc3493#page-11>`_. Binding to “::“ will
 	// allow both IPv4 and IPv6 connections, with peer IPv4 addresses mapped into
-	// IPv6 space as ``::FFFF:<IPv4-address>``.
+	// IPv6 space as “::FFFF:<IPv4-address>“.
 	Ipv4Compat bool `protobuf:"varint,6,opt,name=ipv4_compat,json=ipv4Compat,proto3" json:"ipv4_compat,omitempty"`
 }
 
@@ -481,7 +483,7 @@ func (x *ExtraSourceAddress) GetSocketOptions() *SocketOptionsOverride {
 	return nil
 }
 
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 type BindConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -489,31 +491,32 @@ type BindConfig struct {
 
 	// The address to bind to when creating a socket.
 	SourceAddress *SocketAddress `protobuf:"bytes,1,opt,name=source_address,json=sourceAddress,proto3" json:"source_address,omitempty"`
-	// Whether to set the ``IP_FREEBIND`` option when creating the socket. When this
+	// Whether to set the “IP_FREEBIND“ option when creating the socket. When this
 	// flag is set to true, allows the :ref:`source_address
 	// <envoy_v3_api_field_config.core.v3.BindConfig.source_address>` to be an IP address
 	// that is not configured on the system running Envoy. When this flag is set
-	// to false, the option ``IP_FREEBIND`` is disabled on the socket. When this
+	// to false, the option “IP_FREEBIND“ is disabled on the socket. When this
 	// flag is not set (default), the socket is not modified, i.e. the option is
 	// neither enabled nor disabled.
 	Freebind *wrappers.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"`
 	// Additional socket options that may not be present in Envoy source code or
 	// precompiled binaries.
 	SocketOptions []*SocketOption `protobuf:"bytes,3,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"`
-	// Extra source addresses appended to the address specified in the `source_address`
-	// field. This enables to specify multiple source addresses. Currently, only one extra
-	// address can be supported, and the extra address should have a different IP version
-	// with the address in the `source_address` field. The address which has the same IP
-	// version with the target host's address IP version will be used as bind address. If more
-	// than one extra address specified, only the first address matched IP version will be
-	// returned. If there is no same IP version address found, the address in the `source_address`
-	// will be returned.
+	// Extra source addresses appended to the address specified in the “source_address“
+	// field. This enables to specify multiple source addresses.
+	// The source address selection is determined by :ref:`local_address_selector
+	// <envoy_v3_api_field_config.core.v3.BindConfig.local_address_selector>`.
 	ExtraSourceAddresses []*ExtraSourceAddress `protobuf:"bytes,5,rep,name=extra_source_addresses,json=extraSourceAddresses,proto3" json:"extra_source_addresses,omitempty"`
 	// Deprecated by
 	// :ref:`extra_source_addresses <envoy_v3_api_field_config.core.v3.BindConfig.extra_source_addresses>`
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/address.proto.
 	AdditionalSourceAddresses []*SocketAddress `protobuf:"bytes,4,rep,name=additional_source_addresses,json=additionalSourceAddresses,proto3" json:"additional_source_addresses,omitempty"`
+	// Custom local address selector to override the default (i.e.
+	// :ref:`DefaultLocalAddressSelector
+	// <envoy_v3_api_msg_config.upstream.local_address_selector.v3.DefaultLocalAddressSelector>`).
+	// [#extension-category: envoy.upstream.local_address_selector]
+	LocalAddressSelector *TypedExtensionConfig `protobuf:"bytes,6,opt,name=local_address_selector,json=localAddressSelector,proto3" json:"local_address_selector,omitempty"`
 }
 
 func (x *BindConfig) Reset() {
@@ -576,7 +579,7 @@ func (x *BindConfig) GetExtraSourceAddresses() []*ExtraSourceAddress {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/address.proto.
 func (x *BindConfig) GetAdditionalSourceAddresses() []*SocketAddress {
 	if x != nil {
 		return x.AdditionalSourceAddresses
@@ -584,6 +587,13 @@ func (x *BindConfig) GetAdditionalSourceAddresses() []*SocketAddress {
 	return nil
 }
 
+func (x *BindConfig) GetLocalAddressSelector() *TypedExtensionConfig {
+	if x != nil {
+		return x.LocalAddressSelector
+	}
+	return nil
+}
+
 // Addresses specify either a logical or physical address and port, which are
 // used to tell Envoy where to bind/listen, connect to upstream and find
 // management servers.
@@ -593,6 +603,7 @@ type Address struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Address:
+	//
 	//	*Address_SocketAddress
 	//	*Address_Pipe
 	//	*Address_EnvoyInternalAddress
@@ -690,7 +701,7 @@ type CidrRange struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// IPv4 or IPv6 address, e.g. ``192.0.0.0`` or ``2001:db8::``.
+	// IPv4 or IPv6 address, e.g. “192.0.0.0“ or “2001:db8::“.
 	AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"`
 	// Length of prefix, e.g. 0, 32. Defaults to 0 when unset.
 	PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"`
@@ -748,153 +759,162 @@ var file_envoy_config_core_v3_address_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
 	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x1a, 0x28, 0x65, 0x6e, 0x76, 0x6f,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x1a, 0x24, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x2f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f,
-	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x60, 0x0a, 0x04, 0x50, 0x69, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x04,
-	0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x04, 0x6d, 0x6f, 0x64,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0xff,
-	0x03, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x3a, 0x1d, 0x9a, 0xc5, 0x88, 0x1e, 0x18, 0x0a, 0x16,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x50, 0x69, 0x70, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x14, 0x45, 0x6e, 0x76, 0x6f, 0x79,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
-	0x32, 0x0a, 0x14, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x12, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x49, 0x64, 0x42, 0x1d, 0x0a, 0x16, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03,
-	0xf8, 0x42, 0x01, 0x22, 0xf6, 0x02, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x52, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x21, 0x0a, 0x07, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x10, 0x01, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x0a,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d,
-	0x42, 0x09, 0xfa, 0x42, 0x06, 0x2a, 0x04, 0x18, 0xff, 0xff, 0x03, 0x48, 0x00, 0x52, 0x09, 0x70,
-	0x6f, 0x72, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x6e, 0x61, 0x6d, 0x65,
-	0x64, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09,
-	0x6e, 0x61, 0x6d, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f,
-	0x0a, 0x0b, 0x69, 0x70, 0x76, 0x34, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x70, 0x76, 0x34, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x22,
-	0x1c, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x07, 0x0a, 0x03, 0x54,
-	0x43, 0x50, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x55, 0x44, 0x50, 0x10, 0x01, 0x3a, 0x26, 0x9a,
-	0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x15, 0x0a, 0x0e, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x70,
-	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x90, 0x02, 0x0a,
-	0x0c, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x12, 0x47, 0x0a,
-	0x10, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x62, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65,
-	0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x12, 0x43, 0x0a, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c,
-	0x69, 0x76, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0d, 0x6b, 0x65,
-	0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x4b, 0x0a, 0x12, 0x6b,
-	0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x11, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a,
-	0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22,
-	0xb1, 0x01, 0x0a, 0x12, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x47, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
-	0x52, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x76, 0x65, 0x72,
-	0x72, 0x69, 0x64, 0x65, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x22, 0xd2, 0x03, 0x0a, 0x0a, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x4a, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52,
-	0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x36,
-	0x0a, 0x08, 0x66, 0x72, 0x65, 0x65, 0x62, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x66, 0x72,
-	0x65, 0x65, 0x62, 0x69, 0x6e, 0x64, 0x12, 0x49, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x5e, 0x0a, 0x16, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x14, 0x65, 0x78, 0x74,
-	0x72, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
-	0x73, 0x12, 0x70, 0x0a, 0x1b, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f,
-	0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x0b, 0x18, 0x01, 0x92,
-	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x19, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x65, 0x73, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x42, 0x69,
-	0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x9f, 0x02, 0x0a, 0x07, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x12, 0x4c, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x61,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
+	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
+	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70,
+	0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65,
+	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21,
+	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x60, 0x0a, 0x04, 0x50, 0x69,
+	0x70, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12,
+	0x1c, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x2a, 0x03, 0x18, 0xff, 0x03, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x3a, 0x1d, 0x9a,
+	0xc5, 0x88, 0x1e, 0x18, 0x0a, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x69, 0x70, 0x65, 0x22, 0x8a, 0x01, 0x0a,
+	0x14, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
+	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x12, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x64, 0x42, 0x1d, 0x0a, 0x16, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xf6, 0x02, 0x0a, 0x0d, 0x53, 0x6f,
+	0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x52, 0x0a, 0x08, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12,
+	0x21, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x12, 0x2a, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x2a, 0x04, 0x18, 0xff, 0xff,
+	0x03, 0x48, 0x00, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f,
+	0x0a, 0x0a, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12,
+	0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x70, 0x76, 0x34, 0x5f, 0x63, 0x6f, 0x6d,
+	0x70, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x70, 0x76, 0x34, 0x43,
+	0x6f, 0x6d, 0x70, 0x61, 0x74, 0x22, 0x1c, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x55, 0x44,
+	0x50, 0x10, 0x01, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x6f,
+	0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x15, 0x0a, 0x0e, 0x70,
+	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8,
+	0x42, 0x01, 0x22, 0x90, 0x02, 0x0a, 0x0c, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c,
+	0x69, 0x76, 0x65, 0x12, 0x47, 0x0a, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65,
+	0x5f, 0x70, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x6b, 0x65, 0x65,
+	0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x12, 0x43, 0x0a, 0x0e,
+	0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x52, 0x0d, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d,
+	0x65, 0x12, 0x4b, 0x0a, 0x12, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x11, 0x6b, 0x65, 0x65,
+	0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x25,
+	0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70,
+	0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x47, 0x0a, 0x07,
+	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x52, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f,
+	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xb4, 0x04, 0x0a, 0x0a, 0x42, 0x69,
+	0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4a, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x66, 0x72, 0x65, 0x65, 0x62, 0x69, 0x6e, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x52, 0x08, 0x66, 0x72, 0x65, 0x65, 0x62, 0x69, 0x6e, 0x64, 0x12, 0x49, 0x0a, 0x0e,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x65, 0x78, 0x74, 0x72, 0x61,
+	0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45,
+	0x78, 0x74, 0x72, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x52, 0x14, 0x65, 0x78, 0x74, 0x72, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x70, 0x0a, 0x1b, 0x61, 0x64, 0x64, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
 	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x30, 0x0a, 0x04, 0x70, 0x69, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x69, 0x70, 0x65, 0x48, 0x00, 0x52, 0x04,
-	0x70, 0x69, 0x70, 0x65, 0x12, 0x62, 0x0a, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x76, 0x6f,
+	0x73, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x19,
+	0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x16, 0x6c, 0x6f, 0x63,
+	0x61, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x14, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x3a, 0x23, 0x9a, 0xc5, 0x88,
+	0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x22, 0x9f, 0x02, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x4c, 0x0a, 0x0e,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x30, 0x0a, 0x04, 0x70, 0x69,
+	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x50, 0x69, 0x70, 0x65, 0x48, 0x00, 0x52, 0x04, 0x70, 0x69, 0x70, 0x65, 0x12, 0x62, 0x0a, 0x16,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x14, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x48, 0x00, 0x52, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x20, 0x9a, 0xc5, 0x88, 0x1e, 0x1b, 0x0a,
-	0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0x0e, 0x0a, 0x07, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x09, 0x43,
-	0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x0e, 0x61, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x61, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x45, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a,
-	0x03, 0x18, 0x80, 0x01, 0x52, 0x09, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4c, 0x65, 0x6e, 0x3a,
-	0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61,
-	0x6e, 0x67, 0x65, 0x42, 0x80, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x3a, 0x20, 0x9a, 0xc5, 0x88, 0x1e, 0x1b, 0x0a, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x42, 0x0e, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x03, 0xf8,
+	0x42, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x09, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x12, 0x2e, 0x0a, 0x0e, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66,
+	0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
+	0x01, 0x52, 0x0d, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78,
+	0x12, 0x45, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x09, 0x70, 0x72,
+	0x65, 0x66, 0x69, 0x78, 0x4c, 0x65, 0x6e, 0x3a, 0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x80, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x41, 0x64, 0x64, 0x72,
 	0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68,
 	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
 	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
-	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -925,6 +945,7 @@ var file_envoy_config_core_v3_address_proto_goTypes = []interface{}{
 	(*SocketOptionsOverride)(nil), // 10: envoy.config.core.v3.SocketOptionsOverride
 	(*wrappers.BoolValue)(nil),    // 11: google.protobuf.BoolValue
 	(*SocketOption)(nil),          // 12: envoy.config.core.v3.SocketOption
+	(*TypedExtensionConfig)(nil),  // 13: envoy.config.core.v3.TypedExtensionConfig
 }
 var file_envoy_config_core_v3_address_proto_depIdxs = []int32{
 	0,  // 0: envoy.config.core.v3.SocketAddress.protocol:type_name -> envoy.config.core.v3.SocketAddress.Protocol
@@ -938,15 +959,16 @@ var file_envoy_config_core_v3_address_proto_depIdxs = []int32{
 	12, // 8: envoy.config.core.v3.BindConfig.socket_options:type_name -> envoy.config.core.v3.SocketOption
 	5,  // 9: envoy.config.core.v3.BindConfig.extra_source_addresses:type_name -> envoy.config.core.v3.ExtraSourceAddress
 	3,  // 10: envoy.config.core.v3.BindConfig.additional_source_addresses:type_name -> envoy.config.core.v3.SocketAddress
-	3,  // 11: envoy.config.core.v3.Address.socket_address:type_name -> envoy.config.core.v3.SocketAddress
-	1,  // 12: envoy.config.core.v3.Address.pipe:type_name -> envoy.config.core.v3.Pipe
-	2,  // 13: envoy.config.core.v3.Address.envoy_internal_address:type_name -> envoy.config.core.v3.EnvoyInternalAddress
-	9,  // 14: envoy.config.core.v3.CidrRange.prefix_len:type_name -> google.protobuf.UInt32Value
-	15, // [15:15] is the sub-list for method output_type
-	15, // [15:15] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
+	13, // 11: envoy.config.core.v3.BindConfig.local_address_selector:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	3,  // 12: envoy.config.core.v3.Address.socket_address:type_name -> envoy.config.core.v3.SocketAddress
+	1,  // 13: envoy.config.core.v3.Address.pipe:type_name -> envoy.config.core.v3.Pipe
+	2,  // 14: envoy.config.core.v3.Address.envoy_internal_address:type_name -> envoy.config.core.v3.EnvoyInternalAddress
+	9,  // 15: envoy.config.core.v3.CidrRange.prefix_len:type_name -> google.protobuf.UInt32Value
+	16, // [16:16] is the sub-list for method output_type
+	16, // [16:16] is the sub-list for method input_type
+	16, // [16:16] is the sub-list for extension type_name
+	16, // [16:16] is the sub-list for extension extendee
+	0,  // [0:16] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_core_v3_address_proto_init() }
@@ -954,6 +976,7 @@ func file_envoy_config_core_v3_address_proto_init() {
 	if File_envoy_config_core_v3_address_proto != nil {
 		return
 	}
+	file_envoy_config_core_v3_extension_proto_init()
 	file_envoy_config_core_v3_socket_option_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_envoy_config_core_v3_address_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.validate.go
index 25610ab041a..1bf3f99586b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/address.pb.validate.go
@@ -1006,6 +1006,35 @@ func (m *BindConfig) validate(all bool) error {
 
 	}
 
+	if all {
+		switch v := interface{}(m.GetLocalAddressSelector()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, BindConfigValidationError{
+					field:  "LocalAddressSelector",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, BindConfigValidationError{
+					field:  "LocalAddressSelector",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetLocalAddressSelector()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return BindConfigValidationError{
+				field:  "LocalAddressSelector",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return BindConfigMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/backoff.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/backoff.pb.go
index 63066573a3c..06b61820c44 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/backoff.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/backoff.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/backoff.proto
 
 package corev3
@@ -114,15 +114,15 @@ var file_envoy_config_core_v3_backoff_proto_rawDesc = []byte{
 	0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
 	0x6c, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x42, 0x61, 0x63, 0x6b,
-	0x6f, 0x66, 0x66, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x42, 0x80, 0x01, 0x0a, 0x22,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x42, 0x0c, 0x42, 0x61, 0x63, 0x6b, 0x6f, 0x66, 0x66, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b,
-	0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
+	0x6f, 0x66, 0x66, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x42, 0x80, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x42, 0x61, 0x63, 0x6b,
+	0x6f, 0x66, 0x66, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
+	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.go
index d9ec4f4f84a..8935f058a45 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/base.proto
 
 package corev3
@@ -220,6 +220,9 @@ const (
 	// the header already exists. If the header doesn't exist then this will add the header
 	// with specified key and value.
 	HeaderValueOption_OVERWRITE_IF_EXISTS_OR_ADD HeaderValueOption_HeaderAppendAction = 2
+	// This action will overwrite the specified value by discarding any existing values if
+	// the header already exists. If the header doesn't exist then this will be no-op.
+	HeaderValueOption_OVERWRITE_IF_EXISTS HeaderValueOption_HeaderAppendAction = 3
 )
 
 // Enum value maps for HeaderValueOption_HeaderAppendAction.
@@ -228,11 +231,13 @@ var (
 		0: "APPEND_IF_EXISTS_OR_ADD",
 		1: "ADD_IF_ABSENT",
 		2: "OVERWRITE_IF_EXISTS_OR_ADD",
+		3: "OVERWRITE_IF_EXISTS",
 	}
 	HeaderValueOption_HeaderAppendAction_value = map[string]int32{
 		"APPEND_IF_EXISTS_OR_ADD":    0,
 		"ADD_IF_ABSENT":              1,
 		"OVERWRITE_IF_EXISTS_OR_ADD": 2,
+		"OVERWRITE_IF_EXISTS":        3,
 	}
 )
 
@@ -419,7 +424,7 @@ type Extension struct {
 	// [#comment:TODO(yanavlasov): Link to the doc with existing configuration protos.]
 	// [#comment:TODO(yanavlasov): Add tests when PR #9391 lands.]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 	TypeDescriptor string `protobuf:"bytes,3,opt,name=type_descriptor,json=typeDescriptor,proto3" json:"type_descriptor,omitempty"`
 	// The version is a property of the extension and maintained independently
 	// of other extensions and the Envoy API.
@@ -477,7 +482,7 @@ func (x *Extension) GetCategory() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 func (x *Extension) GetTypeDescriptor() string {
 	if x != nil {
 		return x.TypeDescriptor
@@ -550,6 +555,7 @@ type Node struct {
 	// E.g. "envoy" or "grpc"
 	UserAgentName string `protobuf:"bytes,6,opt,name=user_agent_name,json=userAgentName,proto3" json:"user_agent_name,omitempty"`
 	// Types that are assignable to UserAgentVersionType:
+	//
 	//	*Node_UserAgentVersion
 	//	*Node_UserAgentBuildVersion
 	UserAgentVersionType isNode_UserAgentVersionType `protobuf_oneof:"user_agent_version_type"`
@@ -557,16 +563,16 @@ type Node struct {
 	Extensions []*Extension `protobuf:"bytes,9,rep,name=extensions,proto3" json:"extensions,omitempty"`
 	// Client feature support list. These are well known features described
 	// in the Envoy API repository for a given major version of an API. Client features
-	// use reverse DNS naming scheme, for example ``com.acme.feature``.
+	// use reverse DNS naming scheme, for example “com.acme.feature“.
 	// See :ref:`the list of features <client_features>` that xDS client may
 	// support.
 	ClientFeatures []string `protobuf:"bytes,10,rep,name=client_features,json=clientFeatures,proto3" json:"client_features,omitempty"`
 	// Known listening ports on the node as a generic hint to the management server
 	// for filtering :ref:`listeners <config_listeners>` to be returned. For example,
 	// if there is a listener bound to port 80, the list can optionally contain the
-	// SocketAddress ``(0.0.0.0,80)``. The field is optional and just a hint.
+	// SocketAddress “(0.0.0.0,80)“. The field is optional and just a hint.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 	ListeningAddresses []*Address `protobuf:"bytes,11,rep,name=listening_addresses,json=listeningAddresses,proto3" json:"listening_addresses,omitempty"`
 }
 
@@ -679,7 +685,7 @@ func (x *Node) GetClientFeatures() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 func (x *Node) GetListeningAddresses() []*Address {
 	if x != nil {
 		return x.ListeningAddresses
@@ -724,28 +730,29 @@ func (*Node_UserAgentBuildVersion) isNode_UserAgentVersionType() {}
 // object to match against. There are some well defined metadata used today for
 // this purpose:
 //
-// * ``{"envoy.lb": {"canary": <bool> }}`` This indicates the canary status of an
-//   endpoint and is also used during header processing
-//   (x-envoy-upstream-canary) and for stats purposes.
+//   - “{"envoy.lb": {"canary": <bool> }}“ This indicates the canary status of an
+//     endpoint and is also used during header processing
+//     (x-envoy-upstream-canary) and for stats purposes.
+//
 // [#next-major-version: move to type/metadata/v2]
 type Metadata struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Key is the reverse DNS filter name, e.g. com.acme.widget. The ``envoy.*``
+	// Key is the reverse DNS filter name, e.g. com.acme.widget. The “envoy.*“
 	// namespace is reserved for Envoy's built-in filters.
-	// If both ``filter_metadata`` and
+	// If both “filter_metadata“ and
 	// :ref:`typed_filter_metadata <envoy_v3_api_field_config.core.v3.Metadata.typed_filter_metadata>`
 	// fields are present in the metadata with same keys,
-	// only ``typed_filter_metadata`` field will be parsed.
+	// only “typed_filter_metadata“ field will be parsed.
 	FilterMetadata map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Key is the reverse DNS filter name, e.g. com.acme.widget. The ``envoy.*``
+	// Key is the reverse DNS filter name, e.g. com.acme.widget. The “envoy.*“
 	// namespace is reserved for Envoy's built-in filters.
 	// The value is encoded as google.protobuf.Any.
 	// If both :ref:`filter_metadata <envoy_v3_api_field_config.core.v3.Metadata.filter_metadata>`
-	// and ``typed_filter_metadata`` fields are present in the metadata with same keys,
-	// only ``typed_filter_metadata`` field will be parsed.
+	// and “typed_filter_metadata“ fields are present in the metadata with same keys,
+	// only “typed_filter_metadata“ field will be parsed.
 	TypedFilterMetadata map[string]*any1.Any `protobuf:"bytes,2,rep,name=typed_filter_metadata,json=typedFilterMetadata,proto3" json:"typed_filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -1099,8 +1106,13 @@ type HeaderValue struct {
 	//
 	// The same :ref:`format specifier <config_access_log_format>` as used for
 	// :ref:`HTTP access logging <config_access_log>` applies here, however
-	// unknown header values are replaced with the empty string instead of ``-``.
+	// unknown header values are replaced with the empty string instead of “-“.
+	// Header value is encoded as string. This does not work for non-utf8 characters.
+	// Only one of “value“ or “raw_value“ can be set.
 	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	// Header value is encoded as bytes which can support non-utf8 characters.
+	// Only one of “value“ or “raw_value“ can be set.
+	RawValue []byte `protobuf:"bytes,3,opt,name=raw_value,json=rawValue,proto3" json:"raw_value,omitempty"`
 }
 
 func (x *HeaderValue) Reset() {
@@ -1149,6 +1161,13 @@ func (x *HeaderValue) GetValue() string {
 	return ""
 }
 
+func (x *HeaderValue) GetRawValue() []byte {
+	if x != nil {
+		return x.RawValue
+	}
+	return nil
+}
+
 // Header name/value pair plus option to control append behavior.
 type HeaderValueOption struct {
 	state         protoimpl.MessageState
@@ -1163,11 +1182,12 @@ type HeaderValueOption struct {
 	// :ref:`append_action <envoy_v3_api_field_config.core.v3.HeaderValueOption.append_action>` as replacement.
 	//
 	// .. note::
-	//   The :ref:`external authorization service <envoy_v3_api_msg_service.auth.v3.CheckResponse>` and
-	//   :ref:`external processor service <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>` have
-	//   default value (``false``) for this field.
 	//
-	// Deprecated: Do not use.
+	//	The :ref:`external authorization service <envoy_v3_api_msg_service.auth.v3.CheckResponse>` and
+	//	:ref:`external processor service <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>` have
+	//	default value (``false``) for this field.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 	Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"`
 	// Describes the action taken to append/overwrite the given value for an existing header
 	// or to only add this header if it's absent.
@@ -1218,7 +1238,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto.
 func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue {
 	if x != nil {
 		return x.Append
@@ -1345,6 +1365,7 @@ type DataSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Specifier:
+	//
 	//	*DataSource_Filename
 	//	*DataSource_InlineBytes
 	//	*DataSource_InlineString
@@ -1586,6 +1607,7 @@ type AsyncDataSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Specifier:
+	//
 	//	*AsyncDataSource_Local
 	//	*AsyncDataSource_Remote
 	Specifier isAsyncDataSource_Specifier `protobuf_oneof:"specifier"`
@@ -1678,6 +1700,7 @@ type TransportSocket struct {
 	// See the supported transport socket implementations for further documentation.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*TransportSocket_TypedConfig
 	ConfigType isTransportSocket_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -1750,11 +1773,11 @@ func (*TransportSocket_TypedConfig) isTransportSocket_ConfigType() {}
 //
 // .. note::
 //
-//   Parsing of the runtime key's data is implemented such that it may be represented as a
-//   :ref:`FractionalPercent <envoy_v3_api_msg_type.v3.FractionalPercent>` proto represented as JSON/YAML
-//   and may also be represented as an integer with the assumption that the value is an integral
-//   percentage out of 100. For instance, a runtime key lookup returning the value "42" would parse
-//   as a ``FractionalPercent`` whose numerator is 42 and denominator is HUNDRED.
+//	Parsing of the runtime key's data is implemented such that it may be represented as a
+//	:ref:`FractionalPercent <envoy_v3_api_msg_type.v3.FractionalPercent>` proto represented as JSON/YAML
+//	and may also be represented as an integer with the assumption that the value is an integral
+//	percentage out of 100. For instance, a runtime key lookup returning the value "42" would parse
+//	as a ``FractionalPercent`` whose numerator is 42 and denominator is HUNDRED.
 type RuntimeFractionalPercent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1921,8 +1944,8 @@ var file_envoy_config_core_v3_base_proto_rawDesc = []byte{
 	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x34, 0x0a,
 	0x0f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
-	0x33, 0x2e, 0x30, 0x52, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
+	0x30, 0x18, 0x01, 0x52, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
 	0x74, 0x6f, 0x72, 0x12, 0x3c, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x75, 0x69, 0x6c,
@@ -1971,7 +1994,7 @@ var file_envoy_config_core_v3_base_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x12,
+	0x73, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x12,
 	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
 	0x65, 0x73, 0x1a, 0x60, 0x0a, 0x16, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x50, 0x61, 0x72,
 	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
@@ -2051,162 +2074,169 @@ var file_envoy_config_core_v3_base_proto_rawDesc = []byte{
 	0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x19, 0x0a,
 	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
 	0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7f,
-	0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72,
-	0x0c, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc0, 0x01, 0x02, 0xc8,
-	0x01, 0x00, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f,
-	0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22,
-	0xc0, 0x03, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x06, 0x61, 0x70,
-	0x70, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f,
-	0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
-	0x33, 0x2e, 0x30, 0x52, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x69, 0x0a, 0x0d, 0x61,
-	0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08,
-	0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x65,
-	0x6d, 0x70, 0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x22, 0x64, 0x0a, 0x12, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44,
-	0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44,
-	0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x44, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42,
-	0x53, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52,
-	0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52,
-	0x5f, 0x41, 0x44, 0x44, 0x10, 0x02, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x09, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x12,
-	0x3b, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x22, 0x9a, 0xc5,
-	0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70,
-	0x22, 0x2f, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74,
-	0x68, 0x22, 0xf4, 0x01, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x12, 0x25, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x08, 0x66,
-	0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52,
-	0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0d,
-	0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x12, 0x3c, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
-	0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x13, 0x65, 0x6e,
-	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61,
-	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xd4, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x74,
-	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4b, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72,
-	0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x6f, 0x66, 0x66, 0x53,
-	0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61,
-	0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x52, 0x0a, 0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74,
-	0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d,
-	0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e,
-	0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f,
-	0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22,
-	0xe8, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x08, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x72, 0x69,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x07, 0x68, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x12, 0x1f, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x32,
-	0x35, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74,
-	0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x3a,
-	0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65,
-	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xc9, 0x01, 0x0a, 0x0f, 0x41,
-	0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x38,
-	0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48,
-	0x00, 0x52, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x12, 0x40, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f,
-	0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xcd,
+	0x01, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e,
+	0x72, 0x0c, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x21, 0xfa, 0x42, 0x0c, 0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00,
+	0xc0, 0x01, 0x02, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3a, 0x0a, 0x09,
+	0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42,
+	0x1d, 0xfa, 0x42, 0x08, 0x7a, 0x06, 0x10, 0x00, 0x18, 0x80, 0x80, 0x01, 0xf2, 0x98, 0xfe, 0x8f,
+	0x05, 0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x08,
+	0x72, 0x61, 0x77, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a,
+	0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xd9,
+	0x03, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x06, 0x61, 0x70, 0x70,
+	0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
+	0x18, 0x01, 0x52, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x69, 0x0a, 0x0d, 0x61, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x65, 0x6d,
+	0x70, 0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0e, 0x6b, 0x65, 0x65, 0x70, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22,
+	0x7d, 0x0a, 0x12, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f,
+	0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44,
+	0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x44, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53,
+	0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49,
+	0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f,
+	0x41, 0x44, 0x44, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49,
+	0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x03, 0x3a, 0x2a,
+	0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x09, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x12, 0x3b, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x3a, 0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x22, 0x2f, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1b, 0x0a, 0x04,
+	0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
+	0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0xf4, 0x01, 0x0a, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
+	0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x23, 0x0a, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42,
+	0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x73,
+	0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x0a, 0x14, 0x65,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x48, 0x00, 0x52, 0x13, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e,
+	0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10,
+	0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01,
+	0x22, 0xd4, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x12, 0x4b, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f,
+	0x66, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e,
+	0x42, 0x61, 0x63, 0x6b, 0x6f, 0x66, 0x66, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52,
+	0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x52, 0x0a,
+	0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65,
+	0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65,
+	0x73, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72,
+	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xe8, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x6d, 0x6f,
+	0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x08,
+	0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x68, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69,
+	0x12, 0x1f, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35,
+	0x36, 0x12, 0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72,
+	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x22, 0xc9, 0x01, 0x0a, 0x0f, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x38, 0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74,
+	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
+	0x12, 0x40, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61,
+	0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f,
+	0x74, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x73, 0x79,
+	0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09,
+	0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xb0,
+	0x01, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74,
+	0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e,
 	0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xb0, 0x01, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x0d, 0x0a, 0x0b,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10,
-	0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xbf, 0x01, 0x0a, 0x18, 0x52, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50,
-	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x4f, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c, 0x0a,
-	0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0c, 0x43,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x3a, 0x25, 0x9a, 0xc5, 0x88,
-	0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61,
-	0x6e, 0x65, 0x2a, 0x28, 0x0a, 0x0f, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69,
-	0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54,
-	0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x49, 0x47, 0x48, 0x10, 0x01, 0x2a, 0x89, 0x01, 0x0a,
-	0x0d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x16,
-	0x0a, 0x12, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x45, 0x54, 0x10, 0x01, 0x12,
-	0x08, 0x0a, 0x04, 0x48, 0x45, 0x41, 0x44, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4f, 0x53,
-	0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x55, 0x54, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06,
-	0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x4e, 0x4e,
-	0x45, 0x43, 0x54, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x53,
-	0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43, 0x45, 0x10, 0x08, 0x12, 0x09, 0x0a,
-	0x05, 0x50, 0x41, 0x54, 0x43, 0x48, 0x10, 0x09, 0x2a, 0x3e, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x0a, 0x0b,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a,
-	0x07, 0x49, 0x4e, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x55,
-	0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x42, 0x7d, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f,
+	0x63, 0x6b, 0x65, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x22, 0xbf, 0x01, 0x0a, 0x18, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x4f,
+	0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
+	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79,
+	0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c, 0x0a, 0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c,
+	0x61, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61, 0x6e, 0x65, 0x2a, 0x28, 0x0a, 0x0f, 0x52, 0x6f,
+	0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a,
+	0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x49,
+	0x47, 0x48, 0x10, 0x01, 0x2a, 0x89, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x07,
+	0x0a, 0x03, 0x47, 0x45, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x45, 0x41, 0x44, 0x10,
+	0x02, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4f, 0x53, 0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x50,
+	0x55, 0x54, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x05,
+	0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x10, 0x06, 0x12, 0x0b, 0x0a,
+	0x07, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52,
+	0x41, 0x43, 0x45, 0x10, 0x08, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x41, 0x54, 0x43, 0x48, 0x10, 0x09,
+	0x2a, 0x3e, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x42, 0x4f, 0x55, 0x4e, 0x44,
+	0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x55, 0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02,
+	0x42, 0x7d, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09,
 	0x42, 0x61, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74,
 	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
 	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.validate.go
index 696a3946303..7e2dd5390e4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/base.pb.validate.go
@@ -1667,6 +1667,17 @@ func (m *HeaderValue) validate(all bool) error {
 		errors = append(errors, err)
 	}
 
+	if l := len(m.GetRawValue()); l < 0 || l > 16384 {
+		err := HeaderValueValidationError{
+			field:  "RawValue",
+			reason: "value length must be between 0 and 16384 bytes, inclusive",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
 	if len(errors) > 0 {
 		return HeaderValueMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/config_source.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/config_source.pb.go
index f0584ffed2a..32fc76d39ae 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/config_source.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/config_source.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/config_source.proto
 
 package corev3
@@ -36,11 +36,11 @@ const (
 	// versioning. If a client does not support v2 (e.g. due to deprecation), this
 	// is an invalid value.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/config_source.proto.
 	ApiVersion_AUTO ApiVersion = 0
 	// Use xDS v2 API.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/config_source.proto.
 	ApiVersion_V2 ApiVersion = 1
 	// Use xDS v3 API.
 	ApiVersion_V3 ApiVersion = 2
@@ -94,7 +94,7 @@ const (
 	// Ideally this would be 'reserved 0' but one can't reserve the default
 	// value. Instead we throw an exception if this is ever used.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/config_source.proto.
 	ApiConfigSource_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE ApiConfigSource_ApiType = 0
 	// REST-JSON v2 API. The `canonical JSON encoding
 	// <https://developers.google.com/protocol-buffers/docs/proto3#json>`_ for
@@ -182,8 +182,8 @@ type ApiConfigSource struct {
 	//
 	// .. note::
 	//
-	//  The cluster with name ``cluster_name`` must be statically defined and its
-	//  type must not be ``EDS``.
+	//	The cluster with name ``cluster_name`` must be statically defined and its
+	//	type must not be ``EDS``.
 	ClusterNames []string `protobuf:"bytes,2,rep,name=cluster_names,json=clusterNames,proto3" json:"cluster_names,omitempty"`
 	// Multiple gRPC services be provided for GRPC. If > 1 cluster is defined,
 	// services will be cycled through if any kind of failure occurs.
@@ -200,7 +200,7 @@ type ApiConfigSource struct {
 	// A list of config validators that will be executed when a new update is
 	// received from the ApiConfigSource. Note that each validator handles a
 	// specific xDS service type, and only the validators corresponding to the
-	// type url (in ``:ref: DiscoveryResponse`` or ``:ref: DeltaDiscoveryResponse``)
+	// type url (in “:ref: DiscoveryResponse“ or “:ref: DeltaDiscoveryResponse“)
 	// will be invoked.
 	// If the validator returns false or throws an exception, the config will be rejected by
 	// the client, and a NACK will be sent.
@@ -407,7 +407,8 @@ type RateLimitSettings struct {
 	// default value of 100 will be used.
 	MaxTokens *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"`
 	// Rate at which tokens will be filled per second. If not set, a default fill rate of 10 tokens
-	// per second will be used.
+	// per second will be used. The minimal fill rate is once per year. Lower
+	// fill rates will be set to once per year.
 	FillRate *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=fill_rate,json=fillRate,proto3" json:"fill_rate,omitempty"`
 }
 
@@ -469,27 +470,27 @@ type PathConfigSource struct {
 	//
 	// .. note::
 	//
-	//  The path to the source must exist at config load time.
+	//	The path to the source must exist at config load time.
 	//
 	// .. note::
 	//
-	//   If ``watched_directory`` is *not* configured, Envoy will watch the file path for *moves*.
-	//   This is because in general only moves are atomic. The same method of swapping files as is
-	//   demonstrated in the :ref:`runtime documentation <config_runtime_symbolic_link_swap>` can be
-	//   used here also. If ``watched_directory`` is configured, no watch will be placed directly on
-	//   this path. Instead, the configured ``watched_directory`` will be used to trigger reloads of
-	//   this path. This is required in certain deployment scenarios. See below for more information.
+	//	If ``watched_directory`` is *not* configured, Envoy will watch the file path for *moves*.
+	//	This is because in general only moves are atomic. The same method of swapping files as is
+	//	demonstrated in the :ref:`runtime documentation <config_runtime_symbolic_link_swap>` can be
+	//	used here also. If ``watched_directory`` is configured, no watch will be placed directly on
+	//	this path. Instead, the configured ``watched_directory`` will be used to trigger reloads of
+	//	this path. This is required in certain deployment scenarios. See below for more information.
 	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	// If configured, this directory will be watched for *moves*. When an entry in this directory is
-	// moved to, the ``path`` will be reloaded. This is required in certain deployment scenarios.
+	// moved to, the “path“ will be reloaded. This is required in certain deployment scenarios.
 	//
 	// Specifically, if trying to load an xDS resource using a
 	// `Kubernetes ConfigMap <https://kubernetes.io/docs/concepts/configuration/configmap/>`_, the
 	// following configuration might be used:
 	// 1. Store xds.yaml inside a ConfigMap.
-	// 2. Mount the ConfigMap to ``/config_map/xds``
-	// 3. Configure path ``/config_map/xds/xds.yaml``
-	// 4. Configure watched directory ``/config_map/xds``
+	// 2. Mount the ConfigMap to “/config_map/xds“
+	// 3. Configure path “/config_map/xds/xds.yaml“
+	// 4. Configure watched directory “/config_map/xds“
 	//
 	// The above configuration will ensure that Envoy watches the owning directory for moves which is
 	// required due to how Kubernetes manages ConfigMap symbolic links during atomic updates.
@@ -555,11 +556,12 @@ type ConfigSource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Authorities that this config source may be used for. An authority specified in a xdstp:// URL
-	// is resolved to a ``ConfigSource`` prior to configuration fetch. This field provides the
+	// is resolved to a “ConfigSource“ prior to configuration fetch. This field provides the
 	// association between authority name and configuration source.
 	// [#not-implemented-hide:]
 	Authorities []*v3.Authority `protobuf:"bytes,7,rep,name=authorities,proto3" json:"authorities,omitempty"`
 	// Types that are assignable to ConfigSourceSpecifier:
+	//
 	//	*ConfigSource_Path
 	//	*ConfigSource_PathConfigSource
 	//	*ConfigSource_ApiConfigSource
@@ -626,7 +628,7 @@ func (m *ConfigSource) GetConfigSourceSpecifier() isConfigSource_ConfigSourceSpe
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/config_source.proto.
 func (x *ConfigSource) GetPath() string {
 	if x, ok := x.GetConfigSourceSpecifier().(*ConfigSource_Path); ok {
 		return x.Path
@@ -681,9 +683,9 @@ type isConfigSource_ConfigSourceSpecifier interface {
 }
 
 type ConfigSource_Path struct {
-	// Deprecated in favor of ``path_config_source``. Use that field instead.
+	// Deprecated in favor of “path_config_source“. Use that field instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/config_source.proto.
 	Path string `protobuf:"bytes,1,opt,name=path,proto3,oneof"`
 }
 
@@ -747,7 +749,7 @@ type ExtensionConfigSource struct {
 	ConfigSource *ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"`
 	// Optional default configuration to use as the initial configuration if
 	// there is a failure to receive the initial extension configuration or if
-	// ``apply_default_config_without_warming`` flag is set.
+	// “apply_default_config_without_warming“ flag is set.
 	DefaultConfig *any1.Any `protobuf:"bytes,2,opt,name=default_config,json=defaultConfig,proto3" json:"default_config,omitempty"`
 	// Use the default config as the initial configuration without warming and
 	// waiting for the first discovery response. Requires the default configuration
@@ -894,7 +896,7 @@ var file_envoy_config_core_v3_config_source_proto_rawDesc = []byte{
 	0x22, 0x92, 0x01, 0x0a, 0x07, 0x41, 0x70, 0x69, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x25,
 	0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x55,
 	0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x44, 0x4f, 0x5f, 0x4e, 0x4f,
-	0x54, 0x5f, 0x55, 0x53, 0x45, 0x10, 0x00, 0x1a, 0x08, 0x08, 0x01, 0xa8, 0xf7, 0xb4, 0x8b, 0x02,
+	0x54, 0x5f, 0x55, 0x53, 0x45, 0x10, 0x00, 0x1a, 0x08, 0xa8, 0xf7, 0xb4, 0x8b, 0x02, 0x01, 0x08,
 	0x01, 0x12, 0x08, 0x0a, 0x04, 0x52, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x47,
 	0x52, 0x50, 0x43, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x45, 0x4c, 0x54, 0x41, 0x5f, 0x47,
 	0x52, 0x50, 0x43, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x47, 0x47, 0x52, 0x45, 0x47, 0x41,
@@ -944,8 +946,8 @@ var file_envoy_config_core_v3_config_source_proto_rawDesc = []byte{
 	0x0b, 0x32, 0x16, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
 	0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x61, 0x75, 0x74, 0x68, 0x6f,
 	0x72, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x56, 0x0a, 0x12, 0x70, 0x61, 0x74,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x56, 0x0a, 0x12, 0x70, 0x61, 0x74,
 	0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18,
 	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74,
@@ -999,18 +1001,18 @@ var file_envoy_config_core_v3_config_source_proto_rawDesc = []byte{
 	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08,
 	0x01, 0x52, 0x08, 0x74, 0x79, 0x70, 0x65, 0x55, 0x72, 0x6c, 0x73, 0x2a, 0x40, 0x0a, 0x0a, 0x41,
 	0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, 0x04, 0x41, 0x55, 0x54,
-	0x4f, 0x10, 0x00, 0x1a, 0x0b, 0x08, 0x01, 0x8a, 0xf4, 0x9b, 0xb3, 0x05, 0x03, 0x33, 0x2e, 0x30,
-	0x12, 0x13, 0x0a, 0x02, 0x56, 0x32, 0x10, 0x01, 0x1a, 0x0b, 0x08, 0x01, 0x8a, 0xf4, 0x9b, 0xb3,
-	0x05, 0x03, 0x33, 0x2e, 0x30, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x33, 0x10, 0x02, 0x42, 0x85, 0x01,
-	0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4f, 0x10, 0x00, 0x1a, 0x0b, 0x8a, 0xf4, 0x9b, 0xb3, 0x05, 0x03, 0x33, 0x2e, 0x30, 0x08, 0x01,
+	0x12, 0x13, 0x0a, 0x02, 0x56, 0x32, 0x10, 0x01, 0x1a, 0x0b, 0x8a, 0xf4, 0x9b, 0xb3, 0x05, 0x03,
+	0x33, 0x2e, 0x30, 0x08, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x33, 0x10, 0x02, 0x42, 0x85, 0x01,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63,
+	0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/event_service_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/event_service_config.pb.go
index 56dab5b9873..f9deb0c9017 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/event_service_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/event_service_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/event_service_config.proto
 
 package corev3
@@ -30,6 +30,7 @@ type EventServiceConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ConfigSourceSpecifier:
+	//
 	//	*EventServiceConfig_GrpcService
 	ConfigSourceSpecifier isEventServiceConfig_ConfigSourceSpecifier `protobuf_oneof:"config_source_specifier"`
 }
@@ -117,16 +118,16 @@ var file_envoy_config_core_v3_event_service_config_proto_rawDesc = []byte{
 	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x1e, 0x0a, 0x17, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69,
-	0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x8b, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x17,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x8b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63,
+	0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/extension.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/extension.pb.go
index ecf3e6b5cff..3fa0aab8981 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/extension.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/extension.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/extension.proto
 
 package corev3
@@ -34,9 +34,9 @@ type TypedExtensionConfig struct {
 	// it serves the role of an opaque identifier.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The typed config for the extension. The type URL will be used to identify
-	// the extension. In the case that the type URL is ``xds.type.v3.TypedStruct``
-	// (or, for historical reasons, ``udpa.type.v1.TypedStruct``), the inner type
-	// URL of ``TypedStruct`` will be utilized. See the
+	// the extension. In the case that the type URL is “xds.type.v3.TypedStruct“
+	// (or, for historical reasons, “udpa.type.v1.TypedStruct“), the inner type
+	// URL of “TypedStruct“ will be utilized. See the
 	// :ref:`extension configuration overview
 	// <config_overview_extension_configuration>` for further details.
 	TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"`
@@ -107,15 +107,15 @@ var file_envoy_config_core_v3_extension_proto_rawDesc = []byte{
 	0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
 	0x42, 0x08, 0xfa, 0x42, 0x05, 0xa2, 0x01, 0x02, 0x08, 0x01, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65,
-	0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x82, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0e,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f,
-	0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x82, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_method_list.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_method_list.pb.go
index 5e0e91178a6..30dbf0ecb7b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_method_list.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_method_list.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/grpc_method_list.proto
 
 package corev3
@@ -156,16 +156,16 @@ var file_envoy_config_core_v3_grpc_method_list_proto_rawDesc = []byte{
 	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x47, 0x72, 0x70,
-	0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x87, 0x01, 0x0a, 0x22,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x42, 0x13, 0x47, 0x72, 0x70, 0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69,
-	0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x87, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x47, 0x72, 0x70, 0x63,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63,
+	0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_service.pb.go
index 1bab4b9e833..a8b3b061ae9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_service.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/grpc_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/grpc_service.proto
 
 package corev3
@@ -36,6 +36,7 @@ type GrpcService struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to TargetSpecifier:
+	//
 	//	*GrpcService_EnvoyGrpc_
 	//	*GrpcService_GoogleGrpc_
 	TargetSpecifier isGrpcService_TargetSpecifier `protobuf_oneof:"target_specifier"`
@@ -43,7 +44,7 @@ type GrpcService struct {
 	// request.
 	Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Additional metadata to include in streams initiated to the GrpcService. This can be used for
-	// scenarios in which additional ad hoc authorization headers (e.g. ``x-foo-bar: baz-key``) are to
+	// scenarios in which additional ad hoc authorization headers (e.g. “x-foo-bar: baz-key“) are to
 	// be injected. For more information, including details on header value syntax, see the
 	// documentation on :ref:`custom request headers
 	// <config_http_conn_man_headers_custom_request_headers>`.
@@ -148,7 +149,7 @@ type GrpcService_EnvoyGrpc struct {
 	// in the :ref:`Cluster <envoy_v3_api_msg_config.cluster.v3.Cluster>` :ref:`transport_socket
 	// <envoy_v3_api_field_config.cluster.v3.Cluster.transport_socket>`.
 	ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
-	// The ``:authority`` header in the grpc request. If this field is not set, the authority header value will be ``cluster_name``.
+	// The “:authority“ header in the grpc request. If this field is not set, the authority header value will be “cluster_name“.
 	// Note that this authority does not override the SNI. The SNI is provided by the transport socket of the cluster.
 	Authority string `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"`
 	// Indicates the retry policy for re-establishing the gRPC stream
@@ -229,11 +230,12 @@ type GrpcService_GoogleGrpc struct {
 	// service.
 	//
 	// .. csv-table::
-	//    :header: Name, Type, Description
-	//    :widths: 1, 1, 2
 	//
-	//    streams_total, Counter, Total number of streams opened
-	//    streams_closed_<gRPC status code>, Counter, Total streams closed with <gRPC status code>
+	//	:header: Name, Type, Description
+	//	:widths: 1, 1, 2
+	//
+	//	streams_total, Counter, Total number of streams opened
+	//	streams_closed_<gRPC status code>, Counter, Total streams closed with <gRPC status code>
 	StatPrefix string `protobuf:"bytes,4,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 	// The name of the Google gRPC credentials factory to use. This must have been registered with
 	// Envoy. If this is empty, a default credentials factory will be used that sets up channel
@@ -452,6 +454,7 @@ type GrpcService_GoogleGrpc_ChannelCredentials struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to CredentialSpecifier:
+	//
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault
 	//	*GrpcService_GoogleGrpc_ChannelCredentials_LocalCredentials
@@ -551,6 +554,7 @@ type GrpcService_GoogleGrpc_CallCredentials struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to CredentialSpecifier:
+	//
 	//	*GrpcService_GoogleGrpc_CallCredentials_AccessToken
 	//	*GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine
 	//	*GrpcService_GoogleGrpc_CallCredentials_GoogleRefreshToken
@@ -886,6 +890,7 @@ type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin struct
 	// [#extension-category: envoy.grpc_credentials]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig
 	ConfigType isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -1096,6 +1101,7 @@ type GrpcService_GoogleGrpc_ChannelArgs_Value struct {
 	// delivered via the API.
 	//
 	// Types that are assignable to ValueSpecifier:
+	//
 	//	*GrpcService_GoogleGrpc_ChannelArgs_Value_StringValue
 	//	*GrpcService_GoogleGrpc_ChannelArgs_Value_IntValue
 	ValueSpecifier isGrpcService_GoogleGrpc_ChannelArgs_Value_ValueSpecifier `protobuf_oneof:"value_specifier"`
@@ -1222,8 +1228,8 @@ var file_envoy_config_core_v3_grpc_service_proto_rawDesc = []byte{
 	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
 	0x10, 0x01, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12,
 	0x2f, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x00, 0x28, 0x80, 0x80, 0x01, 0xc0,
-	0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79,
+	0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x00, 0x28, 0x80, 0x80, 0x01, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79,
 	0x12, 0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65,
@@ -1467,15 +1473,15 @@ var file_envoy_config_core_v3_grpc_service_proto_rawDesc = []byte{
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x47, 0x72,
 	0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x17, 0x0a, 0x10, 0x74, 0x61, 0x72,
 	0x67, 0x65, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8,
-	0x42, 0x01, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x42, 0x84, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42,
-	0x10, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x42, 0x01, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x42, 0x84, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/health_check.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/health_check.pb.go
index 076038fc0e5..34b68b42ddd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/health_check.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/health_check.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/health_check.proto
 
 package corev3
@@ -33,7 +33,7 @@ const (
 type HealthStatus int32
 
 const (
-	// The health status is not known. This is interpreted by Envoy as ``HEALTHY``.
+	// The health status is not known. This is interpreted by Envoy as “HEALTHY“.
 	HealthStatus_UNKNOWN HealthStatus = 0
 	// Healthy.
 	HealthStatus_HEALTHY HealthStatus = 1
@@ -43,10 +43,10 @@ const (
 	// `<https://aws.amazon.com/blogs/aws/elb-connection-draining-remove-instances-from-service-with-care/>`_
 	// or
 	// `<https://cloud.google.com/compute/docs/load-balancing/enabling-connection-draining>`_.
-	// This is interpreted by Envoy as ``UNHEALTHY``.
+	// This is interpreted by Envoy as “UNHEALTHY“.
 	HealthStatus_DRAINING HealthStatus = 3
 	// Health check timed out. This is part of HDS and is interpreted by Envoy as
-	// ``UNHEALTHY``.
+	// “UNHEALTHY“.
 	HealthStatus_TIMEOUT HealthStatus = 4
 	// Degraded.
 	HealthStatus_DEGRADED HealthStatus = 5
@@ -166,14 +166,14 @@ type HealthCheck struct {
 	// interval Envoy will add interval_jitter to the wait time.
 	IntervalJitter *duration.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"`
 	// An optional jitter amount as a percentage of interval_ms. If specified,
-	// during every interval Envoy will add ``interval_ms`` *
-	// ``interval_jitter_percent`` / 100 to the wait time.
+	// during every interval Envoy will add “interval_ms“ *
+	// “interval_jitter_percent“ / 100 to the wait time.
 	//
 	// If interval_jitter_ms and interval_jitter_percent are both set, both of
 	// them will be used to increase the wait time.
 	IntervalJitterPercent uint32 `protobuf:"varint,18,opt,name=interval_jitter_percent,json=intervalJitterPercent,proto3" json:"interval_jitter_percent,omitempty"`
 	// The number of unhealthy health checks required before a host is marked
-	// unhealthy. Note that for ``http`` health checking if a host responds with a code not in
+	// unhealthy. Note that for “http“ health checking if a host responds with a code not in
 	// :ref:`expected_statuses <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.expected_statuses>`
 	// or :ref:`retriable_statuses <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.retriable_statuses>`,
 	// this threshold is ignored and the host is considered immediately unhealthy.
@@ -187,6 +187,7 @@ type HealthCheck struct {
 	// Reuse health check connection between health checks. Default is true.
 	ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"`
 	// Types that are assignable to HealthChecker:
+	//
 	//	*HealthCheck_HttpHealthCheck_
 	//	*HealthCheck_TcpHealthCheck_
 	//	*HealthCheck_GrpcHealthCheck_
@@ -206,7 +207,7 @@ type HealthCheck struct {
 	// (including new hosts) when the cluster has received no traffic.
 	//
 	// This is useful for when we want to send frequent health checks with
-	// ``no_traffic_interval`` but then revert to lower frequency ``no_traffic_healthy_interval`` once
+	// “no_traffic_interval“ but then revert to lower frequency “no_traffic_healthy_interval“ once
 	// a host in the cluster is marked as healthy.
 	//
 	// Once a cluster has been used for traffic routing, Envoy will shift back to using the
@@ -242,7 +243,7 @@ type HealthCheck struct {
 	//
 	// Specifies the path to the :ref:`health check event log <arch_overview_health_check_logging>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/health_check.proto.
 	EventLogPath string `protobuf:"bytes,17,opt,name=event_log_path,json=eventLogPath,proto3" json:"event_log_path,omitempty"`
 	// A list of event log sinks to process the health check event.
 	// [#extension-category: envoy.health_check.event_sinks]
@@ -263,22 +264,22 @@ type HealthCheck struct {
 	//
 	// .. code-block:: yaml
 	//
-	//  transport_socket_match_criteria:
-	//    useMTLS: true
+	//	transport_socket_match_criteria:
+	//	  useMTLS: true
 	//
 	// Will match the following :ref:`cluster socket match <envoy_v3_api_msg_config.cluster.v3.Cluster.TransportSocketMatch>`
 	//
 	// .. code-block:: yaml
 	//
-	//  transport_socket_matches:
-	//  - name: "useMTLS"
-	//    match:
-	//      useMTLS: true
-	//    transport_socket:
-	//      name: envoy.transport_sockets.tls
-	//      config: { ... } # tls socket configuration
+	//	transport_socket_matches:
+	//	- name: "useMTLS"
+	//	  match:
+	//	    useMTLS: true
+	//	  transport_socket:
+	//	    name: envoy.transport_sockets.tls
+	//	    config: { ... } # tls socket configuration
 	//
-	// If this field is set, then for health checks it will supersede an entry of ``envoy.transport_socket`` in the
+	// If this field is set, then for health checks it will supersede an entry of “envoy.transport_socket“ in the
 	// :ref:`LbEndpoint.Metadata <envoy_v3_api_field_config.endpoint.v3.LbEndpoint.metadata>`.
 	// This allows using different transport socket capabilities for health checking versus proxying to the
 	// endpoint.
@@ -455,7 +456,7 @@ func (x *HealthCheck) GetHealthyEdgeInterval() *duration.Duration {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/health_check.proto.
 func (x *HealthCheck) GetEventLogPath() string {
 	if x != nil {
 		return x.EventLogPath
@@ -537,6 +538,7 @@ type HealthCheck_Payload struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Payload:
+	//
 	//	*HealthCheck_Payload_Text
 	//	*HealthCheck_Payload_Binary
 	Payload isHealthCheck_Payload_Payload `protobuf_oneof:"payload"`
@@ -625,19 +627,19 @@ type HealthCheck_HttpHealthCheck struct {
 	// :ref:`hostname <envoy_v3_api_field_config.endpoint.v3.Endpoint.HealthCheckConfig.hostname>` field.
 	Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
 	// Specifies the HTTP path that will be requested during health checking. For example
-	// ``/healthcheck``.
+	// “/healthcheck“.
 	Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
 	// [#not-implemented-hide:] HTTP specific payload.
 	Send *HealthCheck_Payload `protobuf:"bytes,3,opt,name=send,proto3" json:"send,omitempty"`
-	// Specifies a list of HTTP expected responses to match in the first ``response_buffer_size`` bytes of the response body.
+	// Specifies a list of HTTP expected responses to match in the first “response_buffer_size“ bytes of the response body.
 	// If it is set, both the expected response check and status code determine the health check.
 	// When checking the response, “fuzzy” matching is performed such that each payload block must be found,
 	// and in the order specified, but not necessarily contiguous.
 	//
 	// .. note::
 	//
-	//   It is recommended to set ``response_buffer_size`` based on the total Payload size for efficiency.
-	//   The default buffer size is 1024 bytes when it is not set.
+	//	It is recommended to set ``response_buffer_size`` based on the total Payload size for efficiency.
+	//	The default buffer size is 1024 bytes when it is not set.
 	Receive []*HealthCheck_Payload `protobuf:"bytes,4,rep,name=receive,proto3" json:"receive,omitempty"`
 	// Specifies the size of response buffer in bytes that is used to Payload match.
 	// The default value is 1024. Setting to 0 implies that the Payload will be matched against the entire response.
@@ -860,7 +862,7 @@ type HealthCheck_RedisHealthCheck struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// If set, optionally perform ``EXISTS <key>`` instead of ``PING``. A return value
+	// If set, optionally perform “EXISTS <key>“ instead of “PING“. A return value
 	// from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other
 	// than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance
 	// by setting the specified key to any value and waiting for traffic to drain.
@@ -999,6 +1001,7 @@ type HealthCheck_CustomHealthCheck struct {
 	// [#extension-category: envoy.health_checkers]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*HealthCheck_CustomHealthCheck_TypedConfig
 	ConfigType isHealthCheck_CustomHealthCheck_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -1256,8 +1259,8 @@ var file_envoy_config_core_v3_health_check_proto_rawDesc = []byte{
 	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00,
 	0x52, 0x13, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x45, 0x64, 0x67, 0x65, 0x49, 0x6e, 0x74,
 	0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x31, 0x0a, 0x0e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x6c,
-	0x6f, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18,
-	0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x0c, 0x65, 0x76, 0x65, 0x6e,
+	0x6f, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92,
+	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0c, 0x65, 0x76, 0x65, 0x6e,
 	0x74, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x74, 0x68, 0x12, 0x4d, 0x0a, 0x0c, 0x65, 0x76, 0x65, 0x6e,
 	0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
@@ -1294,10 +1297,10 @@ var file_envoy_config_core_v3_health_check_proto_rawDesc = []byte{
 	0x42, 0x0e, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x03, 0xf8, 0x42, 0x01,
 	0x1a, 0xcc, 0x07, 0x0a, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43,
 	0x68, 0x65, 0x63, 0x6b, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52,
+	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52,
 	0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x02, 0xc8,
-	0x01, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x04, 0x73, 0x65, 0x6e, 0x64,
+	0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0,
+	0x01, 0x02, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x04, 0x73, 0x65, 0x6e, 0x64,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65,
 	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
@@ -1320,8 +1323,8 @@ var file_envoy_config_core_v3_health_check_proto_rawDesc = []byte{
 	0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4b,
 	0x0a, 0x19, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
 	0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28,
-	0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01,
-	0xc8, 0x01, 0x00, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
+	0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00,
+	0xc0, 0x01, 0x01, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
 	0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x46, 0x0a, 0x11, 0x65,
 	0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x65, 0x73,
 	0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
@@ -1376,7 +1379,7 @@ var file_envoy_config_core_v3_health_check_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12,
 	0x29, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52,
+	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52,
 	0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x5d, 0x0a, 0x10, 0x69, 0x6e,
 	0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
@@ -1416,15 +1419,15 @@ var file_envoy_config_core_v3_health_check_proto_rawDesc = []byte{
 	0x48, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x52, 0x41, 0x49, 0x4e, 0x49, 0x4e, 0x47,
 	0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54, 0x10, 0x04, 0x12,
 	0x0c, 0x0a, 0x08, 0x44, 0x45, 0x47, 0x52, 0x41, 0x44, 0x45, 0x44, 0x10, 0x05, 0x42, 0x84, 0x01,
-	0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
-	0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f,
+	0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.go
new file mode 100644
index 00000000000..0ae3e527b00
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.go
@@ -0,0 +1,194 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
+// source: envoy/config/core/v3/http_service.proto
+
+package corev3
+
+import (
+	_ "github.com/cncf/xds/go/udpa/annotations"
+	_ "github.com/envoyproxy/protoc-gen-validate/validate"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// HTTP service configuration.
+type HttpService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The service's HTTP URI. For example:
+	//
+	// .. code-block:: yaml
+	//
+	//	http_uri:
+	//	  uri: https://www.myserviceapi.com/v1/data
+	//	  cluster: www.myserviceapi.com|443
+	HttpUri *HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"`
+	// Specifies a list of HTTP headers that should be added to each request
+	// handled by this virtual host.
+	RequestHeadersToAdd []*HeaderValueOption `protobuf:"bytes,2,rep,name=request_headers_to_add,json=requestHeadersToAdd,proto3" json:"request_headers_to_add,omitempty"`
+}
+
+func (x *HttpService) Reset() {
+	*x = HttpService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_core_v3_http_service_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HttpService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HttpService) ProtoMessage() {}
+
+func (x *HttpService) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_core_v3_http_service_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HttpService.ProtoReflect.Descriptor instead.
+func (*HttpService) Descriptor() ([]byte, []int) {
+	return file_envoy_config_core_v3_http_service_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *HttpService) GetHttpUri() *HttpUri {
+	if x != nil {
+		return x.HttpUri
+	}
+	return nil
+}
+
+func (x *HttpService) GetRequestHeadersToAdd() []*HeaderValueOption {
+	if x != nil {
+		return x.RequestHeadersToAdd
+	}
+	return nil
+}
+
+var File_envoy_config_core_v3_http_service_proto protoreflect.FileDescriptor
+
+var file_envoy_config_core_v3_http_service_proto_rawDesc = []byte{
+	0x0a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
+	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x1a,
+	0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
+	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x72, 0x69, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
+	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb0, 0x01,
+	0x0a, 0x0b, 0x48, 0x74, 0x74, 0x70, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x38, 0x0a,
+	0x08, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x52, 0x07,
+	0x68, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x12, 0x67, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64,
+	0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x13, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64,
+	0x42, 0x84, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42,
+	0x10, 0x48, 0x74, 0x74, 0x70, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
+	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_envoy_config_core_v3_http_service_proto_rawDescOnce sync.Once
+	file_envoy_config_core_v3_http_service_proto_rawDescData = file_envoy_config_core_v3_http_service_proto_rawDesc
+)
+
+func file_envoy_config_core_v3_http_service_proto_rawDescGZIP() []byte {
+	file_envoy_config_core_v3_http_service_proto_rawDescOnce.Do(func() {
+		file_envoy_config_core_v3_http_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_config_core_v3_http_service_proto_rawDescData)
+	})
+	return file_envoy_config_core_v3_http_service_proto_rawDescData
+}
+
+var file_envoy_config_core_v3_http_service_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_envoy_config_core_v3_http_service_proto_goTypes = []interface{}{
+	(*HttpService)(nil),       // 0: envoy.config.core.v3.HttpService
+	(*HttpUri)(nil),           // 1: envoy.config.core.v3.HttpUri
+	(*HeaderValueOption)(nil), // 2: envoy.config.core.v3.HeaderValueOption
+}
+var file_envoy_config_core_v3_http_service_proto_depIdxs = []int32{
+	1, // 0: envoy.config.core.v3.HttpService.http_uri:type_name -> envoy.config.core.v3.HttpUri
+	2, // 1: envoy.config.core.v3.HttpService.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_envoy_config_core_v3_http_service_proto_init() }
+func file_envoy_config_core_v3_http_service_proto_init() {
+	if File_envoy_config_core_v3_http_service_proto != nil {
+		return
+	}
+	file_envoy_config_core_v3_base_proto_init()
+	file_envoy_config_core_v3_http_uri_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_envoy_config_core_v3_http_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HttpService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_envoy_config_core_v3_http_service_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_envoy_config_core_v3_http_service_proto_goTypes,
+		DependencyIndexes: file_envoy_config_core_v3_http_service_proto_depIdxs,
+		MessageInfos:      file_envoy_config_core_v3_http_service_proto_msgTypes,
+	}.Build()
+	File_envoy_config_core_v3_http_service_proto = out.File
+	file_envoy_config_core_v3_http_service_proto_rawDesc = nil
+	file_envoy_config_core_v3_http_service_proto_goTypes = nil
+	file_envoy_config_core_v3_http_service_proto_depIdxs = nil
+}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.validate.go
new file mode 100644
index 00000000000..2d9590507dd
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_service.pb.validate.go
@@ -0,0 +1,209 @@
+// Code generated by protoc-gen-validate. DO NOT EDIT.
+// source: envoy/config/core/v3/http_service.proto
+
+package corev3
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"net"
+	"net/mail"
+	"net/url"
+	"regexp"
+	"sort"
+	"strings"
+	"time"
+	"unicode/utf8"
+
+	"google.golang.org/protobuf/types/known/anypb"
+)
+
+// ensure the imports are used
+var (
+	_ = bytes.MinRead
+	_ = errors.New("")
+	_ = fmt.Print
+	_ = utf8.UTFMax
+	_ = (*regexp.Regexp)(nil)
+	_ = (*strings.Reader)(nil)
+	_ = net.IPv4len
+	_ = time.Duration(0)
+	_ = (*url.URL)(nil)
+	_ = (*mail.Address)(nil)
+	_ = anypb.Any{}
+	_ = sort.Sort
+)
+
+// Validate checks the field values on HttpService with the rules defined in
+// the proto definition for this message. If any rules are violated, the first
+// error encountered is returned, or nil if there are no violations.
+func (m *HttpService) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on HttpService with the rules defined in
+// the proto definition for this message. If any rules are violated, the
+// result is a list of violation errors wrapped in HttpServiceMultiError, or
+// nil if none found.
+func (m *HttpService) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *HttpService) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if all {
+		switch v := interface{}(m.GetHttpUri()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, HttpServiceValidationError{
+					field:  "HttpUri",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, HttpServiceValidationError{
+					field:  "HttpUri",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetHttpUri()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return HttpServiceValidationError{
+				field:  "HttpUri",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if len(m.GetRequestHeadersToAdd()) > 1000 {
+		err := HttpServiceValidationError{
+			field:  "RequestHeadersToAdd",
+			reason: "value must contain no more than 1000 item(s)",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	for idx, item := range m.GetRequestHeadersToAdd() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, HttpServiceValidationError{
+						field:  fmt.Sprintf("RequestHeadersToAdd[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, HttpServiceValidationError{
+						field:  fmt.Sprintf("RequestHeadersToAdd[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return HttpServiceValidationError{
+					field:  fmt.Sprintf("RequestHeadersToAdd[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
+	if len(errors) > 0 {
+		return HttpServiceMultiError(errors)
+	}
+
+	return nil
+}
+
+// HttpServiceMultiError is an error wrapping multiple validation errors
+// returned by HttpService.ValidateAll() if the designated constraints aren't met.
+type HttpServiceMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m HttpServiceMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m HttpServiceMultiError) AllErrors() []error { return m }
+
+// HttpServiceValidationError is the validation error returned by
+// HttpService.Validate if the designated constraints aren't met.
+type HttpServiceValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e HttpServiceValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e HttpServiceValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e HttpServiceValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e HttpServiceValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e HttpServiceValidationError) ErrorName() string { return "HttpServiceValidationError" }
+
+// Error satisfies the builtin error interface
+func (e HttpServiceValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sHttpService.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = HttpServiceValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = HttpServiceValidationError{}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.go
index 47dc67144bc..39bb22f7ebe 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/http_uri.proto
 
 package corev3
@@ -35,15 +35,15 @@ type HttpUri struct {
 	//
 	// .. code-block:: yaml
 	//
-	//    uri: https://www.googleapis.com/oauth2/v1/certs
-	//
+	//	uri: https://www.googleapis.com/oauth2/v1/certs
 	Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"`
-	// Specify how ``uri`` is to be fetched. Today, this requires an explicit
+	// Specify how “uri“ is to be fetched. Today, this requires an explicit
 	// cluster, but in the future we may support dynamic cluster creation or
 	// inline DNS resolution. See `issue
 	// <https://github.com/envoyproxy/envoy/issues/1606>`_.
 	//
 	// Types that are assignable to HttpUpstreamType:
+	//
 	//	*HttpUri_Cluster
 	HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"`
 	// Sets the maximum duration in milliseconds that a response can take to arrive upon request.
@@ -122,8 +122,7 @@ type HttpUri_Cluster struct {
 	//
 	// .. code-block:: yaml
 	//
-	//    cluster: jwks_cluster
-	//
+	//	cluster: jwks_cluster
 	Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3,oneof"`
 }
 
@@ -143,28 +142,29 @@ var file_envoy_config_core_v3_http_uri_proto_rawDesc = []byte{
 	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72,
 	0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76,
 	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc7, 0x01, 0x0a, 0x07, 0x48, 0x74, 0x74, 0x70, 0x55,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x07, 0x48, 0x74, 0x74, 0x70, 0x55,
 	0x72, 0x69, 0x12, 0x19, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
 	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x23, 0x0a,
 	0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
 	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x12, 0x3f, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20,
+	0x65, 0x72, 0x12, 0x47, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a,
-	0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, 0x32, 0x00, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x3a, 0x20, 0x9a, 0xc5, 0x88, 0x1e, 0x1b, 0x0a, 0x19, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x19, 0x0a, 0x12, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x42, 0x80, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x12,
+	0xfa, 0x42, 0x0f, 0xaa, 0x01, 0x0c, 0x08, 0x01, 0x1a, 0x06, 0x08, 0x80, 0x80, 0x80, 0x80, 0x10,
+	0x32, 0x00, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3a, 0x20, 0x9a, 0xc5, 0x88,
+	0x1e, 0x1b, 0x0a, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x19, 0x0a,
+	0x12, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x80, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
 	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
 	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x48, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69,
 	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
 	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
 	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72,
-	0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.validate.go
index 0e3ab815eef..2c0a69c4183 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/http_uri.pb.validate.go
@@ -92,12 +92,13 @@ func (m *HttpUri) validate(all bool) error {
 			errors = append(errors, err)
 		} else {
 
+			lt := time.Duration(4294967296*time.Second + 0*time.Nanosecond)
 			gte := time.Duration(0*time.Second + 0*time.Nanosecond)
 
-			if dur < gte {
+			if dur < gte || dur >= lt {
 				err := HttpUriValidationError{
 					field:  "Timeout",
-					reason: "value must be greater than or equal to 0s",
+					reason: "value must be inside range [0s, 1193046h28m16s)",
 				}
 				if !all {
 					return err
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.go
index 16a1411437c..6ab658340cd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/protocol.proto
 
 package corev3
@@ -197,7 +197,7 @@ func (x *QuicKeepAliveSettings) GetInitialInterval() *duration.Duration {
 }
 
 // QUIC protocol options which apply to both downstream and upstream connections.
-// [#next-free-field: 6]
+// [#next-free-field: 8]
 type QuicProtocolOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -217,21 +217,27 @@ type QuicProtocolOptions struct {
 	// QUIC stream send and receive buffers. Once the buffer reaches this pointer, watermark callbacks will fire to
 	// stop the flow of data to the stream buffers.
 	InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"`
-	// Similar to ``initial_stream_window_size``, but for connection-level
+	// Similar to “initial_stream_window_size“, but for connection-level
 	// flow-control. Valid values rage from 1 to 25165824 (24MB, maximum supported by QUICHE) and defaults to 65536 (2^16).
-	// window. Currently, this has the same minimum/default as ``initial_stream_window_size``.
+	// window. Currently, this has the same minimum/default as “initial_stream_window_size“.
 	//
 	// NOTE: 16384 (2^14) is the minimum window size supported in Google QUIC. We only support increasing the default
 	// window size now, so it's also the minimum.
 	InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"`
 	// The number of timeouts that can occur before port migration is triggered for QUIC clients.
-	// This defaults to 1. If set to 0, port migration will not occur on path degrading.
+	// This defaults to 4. If set to 0, port migration will not occur on path degrading.
 	// Timeout here refers to QUIC internal path degrading timeout mechanism, such as PTO.
 	// This has no effect on server sessions.
 	NumTimeoutsToTriggerPortMigration *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=num_timeouts_to_trigger_port_migration,json=numTimeoutsToTriggerPortMigration,proto3" json:"num_timeouts_to_trigger_port_migration,omitempty"`
 	// Probes the peer at the configured interval to solicit traffic, i.e. ACK or PATH_RESPONSE, from the peer to push back connection idle timeout.
 	// If absent, use the default keepalive behavior of which a client connection sends PINGs every 15s, and a server connection doesn't do anything.
 	ConnectionKeepalive *QuicKeepAliveSettings `protobuf:"bytes,5,opt,name=connection_keepalive,json=connectionKeepalive,proto3" json:"connection_keepalive,omitempty"`
+	// A comma-separated list of strings representing QUIC connection options defined in
+	// `QUICHE <https://github.com/google/quiche/blob/main/quiche/quic/core/crypto/crypto_protocol.h>`_ and to be sent by upstream connections.
+	ConnectionOptions string `protobuf:"bytes,6,opt,name=connection_options,json=connectionOptions,proto3" json:"connection_options,omitempty"`
+	// A comma-separated list of strings representing QUIC client connection options defined in
+	// `QUICHE <https://github.com/google/quiche/blob/main/quiche/quic/core/crypto/crypto_protocol.h>`_ and to be sent by upstream connections.
+	ClientConnectionOptions string `protobuf:"bytes,7,opt,name=client_connection_options,json=clientConnectionOptions,proto3" json:"client_connection_options,omitempty"`
 }
 
 func (x *QuicProtocolOptions) Reset() {
@@ -301,6 +307,20 @@ func (x *QuicProtocolOptions) GetConnectionKeepalive() *QuicKeepAliveSettings {
 	return nil
 }
 
+func (x *QuicProtocolOptions) GetConnectionOptions() string {
+	if x != nil {
+		return x.ConnectionOptions
+	}
+	return ""
+}
+
+func (x *QuicProtocolOptions) GetClientConnectionOptions() string {
+	if x != nil {
+		return x.ClientConnectionOptions
+	}
+	return ""
+}
+
 type UpstreamHttpProtocolOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -315,7 +335,7 @@ type UpstreamHttpProtocolOptions struct {
 	// Automatic validate upstream presented certificate for new upstream connections based on the
 	// downstream HTTP host/authority header or any other arbitrary header when :ref:`override_auto_sni_header <envoy_v3_api_field_config.core.v3.UpstreamHttpProtocolOptions.override_auto_sni_header>`
 	// is set, as seen by the :ref:`router filter <config_http_filters_router>`.
-	// This field is intended to be set with ``auto_sni`` field.
+	// This field is intended to be set with “auto_sni“ field.
 	// Does nothing if a filter before the http router filter sets the corresponding metadata.
 	AutoSanValidation bool `protobuf:"varint,2,opt,name=auto_san_validation,json=autoSanValidation,proto3" json:"auto_san_validation,omitempty"`
 	// An optional alternative to the host/authority header to be used for setting the SNI value.
@@ -323,7 +343,7 @@ type UpstreamHttpProtocolOptions struct {
 	// :ref:`router filter <config_http_filters_router>`.
 	// If unset, host/authority header will be used for populating the SNI. If the specified header
 	// is not found or the value is empty, host/authority header will be used instead.
-	// This field is intended to be set with ``auto_sni`` and/or ``auto_san_validation`` fields.
+	// This field is intended to be set with “auto_sni“ and/or “auto_san_validation“ fields.
 	// If none of these fields are set then setting this would be a no-op.
 	// Does nothing if a filter before the http router filter sets the corresponding metadata.
 	OverrideAutoSniHeader string `protobuf:"bytes,3,opt,name=override_auto_sni_header,json=overrideAutoSniHeader,proto3" json:"override_auto_sni_header,omitempty"`
@@ -402,9 +422,9 @@ type AlternateProtocolsCacheOptions struct {
 	//
 	// .. note:
 	//
-	//   The implementation is approximate and enforced independently on each worker thread, thus
-	//   it is possible for the maximum entries in the cache to go slightly above the configured
-	//   value depending on timing. This is similar to how other circuit breakers work.
+	//	The implementation is approximate and enforced independently on each worker thread, thus
+	//	it is possible for the maximum entries in the cache to go slightly above the configured
+	//	value depending on timing. This is similar to how other circuit breakers work.
 	MaxEntries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"`
 	// Allows configuring a persistent
 	// :ref:`key value store <envoy_v3_api_msg_config.common.key_value.v3.KeyValueStoreConfig>` to flush
@@ -415,10 +435,10 @@ type AlternateProtocolsCacheOptions struct {
 	// Allows pre-populating the cache with entries, as described above.
 	PrepopulatedEntries []*AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry `protobuf:"bytes,4,rep,name=prepopulated_entries,json=prepopulatedEntries,proto3" json:"prepopulated_entries,omitempty"`
 	// Optional list of hostnames suffixes for which Alt-Svc entries can be shared. For example, if
-	// this list contained the value ``.c.example.com``, then an Alt-Svc entry for ``foo.c.example.com``
-	// could be shared with ``bar.c.example.com`` but would not be shared with ``baz.example.com``. On
-	// the other hand, if the list contained the value ``.example.com`` then all three hosts could share
-	// Alt-Svc entries. Each entry must start with ``.``. If a hostname matches multiple suffixes, the
+	// this list contained the value “.c.example.com“, then an Alt-Svc entry for “foo.c.example.com“
+	// could be shared with “bar.c.example.com“ but would not be shared with “baz.example.com“. On
+	// the other hand, if the list contained the value “.example.com“ then all three hosts could share
+	// Alt-Svc entries. Each entry must start with “.“. If a hostname matches multiple suffixes, the
 	// first listed suffix will be used.
 	//
 	// Since lookup in this list is O(n), it is recommended that the number of suffixes be limited.
@@ -509,8 +529,9 @@ type HttpProtocolOptions struct {
 	// If not specified, this defaults to 1 hour. To disable idle timeouts explicitly set this to 0.
 	//
 	// .. warning::
-	//   Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP
-	//   FIN packets, etc.
+	//
+	//	Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP
+	//	FIN packets, etc.
 	//
 	// If the :ref:`overload action <config_overload_manager_overload_actions>` "envoy.overload_actions.reduce_timeouts"
 	// is configured, this timeout is scaled for downstream connections according to the value for
@@ -626,16 +647,16 @@ type Http1ProtocolOptions struct {
 	// Handle HTTP requests with absolute URLs in the requests. These requests
 	// are generally sent by clients to forward/explicit proxies. This allows clients to configure
 	// envoy as their HTTP proxy. In Unix, for example, this is typically done by setting the
-	// ``http_proxy`` environment variable.
+	// “http_proxy“ environment variable.
 	AllowAbsoluteUrl *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_absolute_url,json=allowAbsoluteUrl,proto3" json:"allow_absolute_url,omitempty"`
 	// Handle incoming HTTP/1.0 and HTTP 0.9 requests.
 	// This is off by default, and not fully standards compliant. There is support for pre-HTTP/1.1
 	// style connect logic, dechunking, and handling lack of client host iff
-	// ``default_host_for_http_10`` is configured.
+	// “default_host_for_http_10“ is configured.
 	AcceptHttp_10 bool `protobuf:"varint,2,opt,name=accept_http_10,json=acceptHttp10,proto3" json:"accept_http_10,omitempty"`
-	// A default host for HTTP/1.0 requests. This is highly suggested if ``accept_http_10`` is true as
+	// A default host for HTTP/1.0 requests. This is highly suggested if “accept_http_10“ is true as
 	// Envoy does not otherwise support HTTP/1.0 without a Host header.
-	// This is a no-op if ``accept_http_10`` is not true.
+	// This is a no-op if “accept_http_10“ is not true.
 	DefaultHostForHttp_10 string `protobuf:"bytes,3,opt,name=default_host_for_http_10,json=defaultHostForHttp10,proto3" json:"default_host_for_http_10,omitempty"`
 	// Describes how the keys for response headers should be formatted. By default, all header keys
 	// are lower cased.
@@ -644,20 +665,22 @@ type Http1ProtocolOptions struct {
 	//
 	// .. attention::
 	//
-	//   Note that this only happens when Envoy is chunk encoding which occurs when:
-	//   - The request is HTTP/1.1.
-	//   - Is neither a HEAD only request nor a HTTP Upgrade.
-	//   - Not a response to a HEAD request.
-	//   - The content length header is not present.
+	//	Note that this only happens when Envoy is chunk encoding which occurs when:
+	//	- The request is HTTP/1.1.
+	//	- Is neither a HEAD only request nor a HTTP Upgrade.
+	//	- Not a response to a HEAD request.
+	//	- The content length header is not present.
 	EnableTrailers bool `protobuf:"varint,5,opt,name=enable_trailers,json=enableTrailers,proto3" json:"enable_trailers,omitempty"`
-	// Allows Envoy to process requests/responses with both ``Content-Length`` and ``Transfer-Encoding``
+	// Allows Envoy to process requests/responses with both “Content-Length“ and “Transfer-Encoding“
 	// headers set. By default such messages are rejected, but if option is enabled - Envoy will
 	// remove Content-Length header and process message.
 	// See `RFC7230, sec. 3.3.3 <https://tools.ietf.org/html/rfc7230#section-3.3.3>`_ for details.
 	//
 	// .. attention::
-	//   Enabling this option might lead to request smuggling vulnerability, especially if traffic
-	//   is proxied via multiple layers of proxies.
+	//
+	//	Enabling this option might lead to request smuggling vulnerability, especially if traffic
+	//	is proxied via multiple layers of proxies.
+	//
 	// [#comment:TODO: This field is ignored when the
 	// :ref:`header validation configuration <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.typed_header_validation_config>`
 	// is present.]
@@ -919,8 +942,8 @@ type Http2ProtocolOptions struct {
 	// HTTP/2 codec buffers. Once the buffer reaches this pointer, watermark callbacks will fire to
 	// stop the flow of data to the codec buffers.
 	InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"`
-	// Similar to ``initial_stream_window_size``, but for connection-level flow-control
-	// window. Currently, this has the same minimum/maximum/default as ``initial_stream_window_size``.
+	// Similar to “initial_stream_window_size“, but for connection-level flow-control
+	// window. Currently, this has the same minimum/maximum/default as “initial_stream_window_size“.
 	InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"`
 	// Allows proxying Websocket and other upgrades over H2 connect.
 	AllowConnect bool `protobuf:"varint,5,opt,name=allow_connect,json=allowConnect,proto3" json:"allow_connect,omitempty"`
@@ -933,18 +956,18 @@ type Http2ProtocolOptions struct {
 	AllowMetadata bool `protobuf:"varint,6,opt,name=allow_metadata,json=allowMetadata,proto3" json:"allow_metadata,omitempty"`
 	// Limit the number of pending outbound downstream frames of all types (frames that are waiting to
 	// be written into the socket). Exceeding this limit triggers flood mitigation and connection is
-	// terminated. The ``http2.outbound_flood`` stat tracks the number of terminated connections due
+	// terminated. The “http2.outbound_flood“ stat tracks the number of terminated connections due
 	// to flood mitigation. The default limit is 10000.
 	MaxOutboundFrames *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"`
 	// Limit the number of pending outbound downstream frames of types PING, SETTINGS and RST_STREAM,
 	// preventing high memory utilization when receiving continuous stream of these frames. Exceeding
 	// this limit triggers flood mitigation and connection is terminated. The
-	// ``http2.outbound_control_flood`` stat tracks the number of terminated connections due to flood
+	// “http2.outbound_control_flood“ stat tracks the number of terminated connections due to flood
 	// mitigation. The default limit is 1000.
 	MaxOutboundControlFrames *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"`
 	// Limit the number of consecutive inbound frames of types HEADERS, CONTINUATION and DATA with an
 	// empty payload and no end stream flag. Those frames have no legitimate use and are abusive, but
-	// might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood``
+	// might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood“
 	// stat tracks the number of connections terminated due to flood mitigation.
 	// Setting this to 0 will terminate connection upon receiving first frame with an empty payload
 	// and no end stream flag. The default limit is 1.
@@ -953,25 +976,25 @@ type Http2ProtocolOptions struct {
 	// of PRIORITY frames received over the lifetime of connection exceeds the value calculated
 	// using this formula::
 	//
-	//   ``max_inbound_priority_frames_per_stream`` * (1 + ``opened_streams``)
+	//	``max_inbound_priority_frames_per_stream`` * (1 + ``opened_streams``)
 	//
-	// the connection is terminated. For downstream connections the ``opened_streams`` is incremented when
+	// the connection is terminated. For downstream connections the “opened_streams“ is incremented when
 	// Envoy receives complete response headers from the upstream server. For upstream connection the
-	// ``opened_streams`` is incremented when Envoy send the HEADERS frame for a new stream. The
-	// ``http2.inbound_priority_frames_flood`` stat tracks
+	// “opened_streams“ is incremented when Envoy send the HEADERS frame for a new stream. The
+	// “http2.inbound_priority_frames_flood“ stat tracks
 	// the number of connections terminated due to flood mitigation. The default limit is 100.
 	MaxInboundPriorityFramesPerStream *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"`
 	// Limit the number of inbound WINDOW_UPDATE frames allowed per DATA frame sent. If the number
 	// of WINDOW_UPDATE frames received over the lifetime of connection exceeds the value calculated
 	// using this formula::
 	//
-	//   5 + 2 * (``opened_streams`` +
-	//            ``max_inbound_window_update_frames_per_data_frame_sent`` * ``outbound_data_frames``)
+	//	5 + 2 * (``opened_streams`` +
+	//	         ``max_inbound_window_update_frames_per_data_frame_sent`` * ``outbound_data_frames``)
 	//
-	// the connection is terminated. For downstream connections the ``opened_streams`` is incremented when
+	// the connection is terminated. For downstream connections the “opened_streams“ is incremented when
 	// Envoy receives complete response headers from the upstream server. For upstream connections the
-	// ``opened_streams`` is incremented when Envoy sends the HEADERS frame for a new stream. The
-	// ``http2.inbound_priority_frames_flood`` stat tracks the number of connections terminated due to
+	// “opened_streams“ is incremented when Envoy sends the HEADERS frame for a new stream. The
+	// “http2.inbound_priority_frames_flood“ stat tracks the number of connections terminated due to
 	// flood mitigation. The default max_inbound_window_update_frames_per_data_frame_sent value is 10.
 	// Setting this to 1 should be enough to support HTTP/2 implementations with basic flow control,
 	// but more complex implementations that try to estimate available bandwidth require at least 2.
@@ -989,7 +1012,7 @@ type Http2ProtocolOptions struct {
 	//
 	// See `RFC7540, sec. 8.1 <https://tools.ietf.org/html/rfc7540#section-8.1>`_ for details.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/protocol.proto.
 	StreamErrorOnInvalidHttpMessaging bool `protobuf:"varint,12,opt,name=stream_error_on_invalid_http_messaging,json=streamErrorOnInvalidHttpMessaging,proto3" json:"stream_error_on_invalid_http_messaging,omitempty"`
 	// Allows invalid HTTP messaging and headers. When this option is disabled (default), then
 	// the whole HTTP/2 connection is terminated upon receiving invalid HEADERS frame. However,
@@ -1014,11 +1037,11 @@ type Http2ProtocolOptions struct {
 	//
 	// .. code-block:: text
 	//
-	//   ID    Field Name
-	//   ----------------
-	//   0x1   hpack_table_size
-	//   0x3   max_concurrent_streams
-	//   0x4   initial_stream_window_size
+	//	ID    Field Name
+	//	----------------
+	//	0x1   hpack_table_size
+	//	0x3   max_concurrent_streams
+	//	0x4   initial_stream_window_size
 	//
 	// Collisions will trigger config validation failure on load/update. Likewise, inconsistencies
 	// between custom parameters with the same identifier will trigger a failure.
@@ -1145,7 +1168,7 @@ func (x *Http2ProtocolOptions) GetMaxInboundWindowUpdateFramesPerDataFrameSent()
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/protocol.proto.
 func (x *Http2ProtocolOptions) GetStreamErrorOnInvalidHttpMessaging() bool {
 	if x != nil {
 		return x.StreamErrorOnInvalidHttpMessaging
@@ -1313,6 +1336,7 @@ type SchemeHeaderTransformation struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Transformation:
+	//
 	//	*SchemeHeaderTransformation_SchemeToOverwrite
 	Transformation isSchemeHeaderTransformation_Transformation `protobuf_oneof:"transformation"`
 }
@@ -1447,6 +1471,7 @@ type Http1ProtocolOptions_HeaderKeyFormat struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to HeaderFormat:
+	//
 	//	*Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_
 	//	*Http1ProtocolOptions_HeaderKeyFormat_StatefulFormatter
 	HeaderFormat isHttp1ProtocolOptions_HeaderKeyFormat_HeaderFormat `protobuf_oneof:"header_format"`
@@ -1668,7 +1693,7 @@ var file_envoy_config_core_v3_protocol_proto_rawDesc = []byte{
 	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa,
 	0x42, 0x09, 0xaa, 0x01, 0x06, 0x22, 0x00, 0x32, 0x02, 0x08, 0x01, 0x52, 0x0f, 0x69, 0x6e, 0x69,
-	0x74, 0x69, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0xa8, 0x04, 0x0a,
+	0x74, 0x69, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x93, 0x05, 0x0a,
 	0x13, 0x51, 0x75, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
 	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5b, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x63,
 	0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01,
@@ -1703,345 +1728,352 @@ var file_envoy_config_core_v3_protocol_proto_rawDesc = []byte{
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51, 0x75, 0x69,
 	0x63, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
 	0x67, 0x73, 0x52, 0x13, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65,
-	0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0xe4, 0x01, 0x0a, 0x1b, 0x55, 0x70, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x5f,
-	0x73, 0x6e, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x53,
-	0x6e, 0x69, 0x12, 0x2e, 0x0a, 0x13, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x61, 0x6e, 0x5f, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x11, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x61, 0x6e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x18, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x61,
-	0x75, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x69, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xd0, 0x01,
-	0x01, 0x52, 0x15, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x53,
-	0x6e, 0x69, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x3a, 0x34, 0x9a, 0xc5, 0x88, 0x1e, 0x2f, 0x0a,
-	0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x86,
-	0x04, 0x0a, 0x1e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x46,
-	0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x20, 0x00, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x45,
-	0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x6b, 0x65, 0x79, 0x5f, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79,
-	0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x13, 0x6b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x74, 0x6f, 0x72,
-	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x84, 0x01, 0x0a, 0x14, 0x70, 0x72, 0x65, 0x70,
-	0x6f, 0x70, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x51, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x6c,
+	0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x22, 0xe4, 0x01, 0x0a, 0x1b, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48,
+	0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x69, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x6e, 0x69, 0x12, 0x2e, 0x0a,
+	0x13, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x61, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x61, 0x75, 0x74, 0x6f,
+	0x53, 0x61, 0x6e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a,
+	0x18, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73,
+	0x6e, 0x69, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xd0, 0x01, 0x01, 0xc0, 0x01, 0x01, 0x52, 0x15, 0x6f, 0x76,
+	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x53, 0x6e, 0x69, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x3a, 0x34, 0x9a, 0xc5, 0x88, 0x1e, 0x2f, 0x0a, 0x2d, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x55, 0x70,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x86, 0x04, 0x0a, 0x1e, 0x41, 0x6c,
 	0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73,
-	0x43, 0x61, 0x63, 0x68, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x41, 0x6c, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x43,
-	0x61, 0x63, 0x68, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x70, 0x72, 0x65, 0x70, 0x6f,
-	0x70, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2d,
-	0x0a, 0x12, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x73, 0x75, 0x66, 0x66,
-	0x69, 0x78, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x63, 0x61, 0x6e, 0x6f,
-	0x6e, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x65, 0x73, 0x1a, 0x68, 0x0a,
-	0x1c, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x27, 0x0a,
-	0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xd0, 0x01, 0x01, 0x52, 0x08, 0x68, 0x6f,
-	0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0d, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xff, 0xff, 0x03, 0x20,
-	0x00, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xaf, 0x05, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x3c, 0x0a, 0x0c, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x0b, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x51, 0x0a,
-	0x17, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x43, 0x61, 0x63, 0x68, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1b, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
+	0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x46, 0x0a, 0x0b, 0x6d, 0x61, 0x78,
+	0x5f, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x51, 0x0a, 0x11, 0x6d, 0x61, 0x78, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02,
-	0x28, 0x01, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x2a, 0x02, 0x20, 0x00, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65,
+	0x73, 0x12, 0x5f, 0x0a, 0x16, 0x6b, 0x65, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73,
+	0x74, 0x6f, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x6b,
+	0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x84, 0x01, 0x0a, 0x14, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61,
+	0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x51, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
+	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61, 0x74,
+	0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x61, 0x6e,
+	0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x65, 0x73, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c,
+	0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x65, 0x73, 0x1a, 0x68, 0x0a, 0x1c, 0x41, 0x6c, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x43, 0x61,
+	0x63, 0x68, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x27, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72,
+	0x06, 0xd0, 0x01, 0x01, 0xc0, 0x01, 0x01, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x1f, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42,
+	0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xff, 0xff, 0x03, 0x20, 0x00, 0x52, 0x04, 0x70, 0x6f,
+	0x72, 0x74, 0x22, 0xaf, 0x05, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x0a, 0x0c, 0x69, 0x64,
+	0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x8d,
-	0x01, 0x0a, 0x1f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f,
-	0x75, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x55,
-	0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x1c, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x55, 0x6e, 0x64,
-	0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5b,
-	0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x70,
-	0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4e, 0x0a, 0x1c, 0x48,
+	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64, 0x6c,
+	0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x51, 0x0a, 0x17, 0x6d, 0x61, 0x78, 0x5f,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x11, 0x6d,
+	0x61, 0x78, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x0f, 0x6d,
+	0x61, 0x78, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x49,
+	0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x64, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x8d, 0x01, 0x0a, 0x1f, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72,
+	0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48,
 	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73,
-	0x63, 0x6f, 0x72, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x41,
-	0x4c, 0x4c, 0x4f, 0x57, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54,
-	0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x52,
-	0x4f, 0x50, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x10, 0x02, 0x3a, 0x2c, 0x9a, 0xc5, 0x88,
-	0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x93, 0x09, 0x0a, 0x14, 0x48, 0x74,
-	0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x48, 0x0a, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x61, 0x62, 0x73, 0x6f,
-	0x6c, 0x75, 0x74, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x63, 0x6f, 0x72, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1c, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f,
+	0x72, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5b, 0x0a, 0x1b, 0x6d, 0x61, 0x78,
+	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x10, 0x61, 0x6c, 0x6c, 0x6f,
-	0x77, 0x41, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x24, 0x0a, 0x0e,
-	0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x31, 0x30, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x48, 0x74, 0x74, 0x70,
-	0x31, 0x30, 0x12, 0x36, 0x0a, 0x18, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x6f,
-	0x73, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x31, 0x30, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x48, 0x6f, 0x73,
-	0x74, 0x46, 0x6f, 0x72, 0x48, 0x74, 0x74, 0x70, 0x31, 0x30, 0x12, 0x66, 0x0a, 0x11, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74,
-	0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x52, 0x0f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x72, 0x61,
-	0x69, 0x6c, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x61,
-	0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x6e,
-	0x67, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x43, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x7a, 0x0a,
-	0x2d, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x27, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x45, 0x72, 0x72, 0x6f, 0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74,
-	0x74, 0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x73, 0x65, 0x6e,
-	0x64, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x5f, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x66, 0x69, 0x65,
-	0x64, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x73, 0x65, 0x6e,
-	0x64, 0x46, 0x75, 0x6c, 0x6c, 0x79, 0x51, 0x75, 0x61, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x55,
-	0x72, 0x6c, 0x12, 0x4e, 0x0a, 0x10, 0x75, 0x73, 0x65, 0x5f, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x5f,
-	0x70, 0x61, 0x72, 0x73, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
-	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02,
-	0x08, 0x01, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x42, 0x61, 0x6c, 0x73, 0x61, 0x50, 0x61, 0x72, 0x73,
-	0x65, 0x72, 0x12, 0x3a, 0x0a, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
-	0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f,
-	0x77, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x1a, 0x9f,
-	0x03, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x12, 0x78, 0x0a, 0x11, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x5f, 0x63, 0x61, 0x73,
-	0x65, 0x5f, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x5b, 0x0a, 0x12,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74,
-	0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x18, 0x6d, 0x61,
+	0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4e, 0x0a, 0x1c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x57, 0x69, 0x74, 0x68, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x10,
+	0x00, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55,
+	0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x52, 0x4f, 0x50, 0x5f, 0x48, 0x45,
+	0x41, 0x44, 0x45, 0x52, 0x10, 0x02, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x22, 0x93, 0x09, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x48, 0x0a,
+	0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x5f,
+	0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x10, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x41, 0x62, 0x73, 0x6f,
+	0x6c, 0x75, 0x74, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x24, 0x0a, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70,
+	0x74, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x31, 0x30, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x48, 0x74, 0x74, 0x70, 0x31, 0x30, 0x12, 0x36, 0x0a,
+	0x18, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x66, 0x6f,
+	0x72, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x31, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x14, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x48, 0x6f, 0x73, 0x74, 0x46, 0x6f, 0x72, 0x48,
+	0x74, 0x74, 0x70, 0x31, 0x30, 0x12, 0x66, 0x0a, 0x11, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
+	0x6b, 0x65, 0x79, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x52, 0x0f, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x27, 0x0a,
+	0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x72,
+	0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f,
+	0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x68, 0x75, 0x6e, 0x6b,
+	0x65, 0x64, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x7a, 0x0a, 0x2d, 0x6f, 0x76, 0x65, 0x72,
+	0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x68, 0x74, 0x74,
+	0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x27, 0x6f, 0x76, 0x65,
+	0x72, 0x72, 0x69, 0x64, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72,
+	0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74, 0x74, 0x70, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x73, 0x65, 0x6e, 0x64, 0x5f, 0x66, 0x75, 0x6c,
+	0x6c, 0x79, 0x5f, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x75, 0x72, 0x6c,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x73, 0x65, 0x6e, 0x64, 0x46, 0x75, 0x6c, 0x6c,
+	0x79, 0x51, 0x75, 0x61, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x4e, 0x0a,
+	0x10, 0x75, 0x73, 0x65, 0x5f, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x5f, 0x70, 0x61, 0x72, 0x73, 0x65,
+	0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x52, 0x0e, 0x75,
+	0x73, 0x65, 0x42, 0x61, 0x6c, 0x73, 0x61, 0x50, 0x61, 0x72, 0x73, 0x65, 0x72, 0x12, 0x3a, 0x0a,
+	0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x42, 0x08, 0xd2, 0xc6, 0xa4,
+	0xe1, 0x06, 0x02, 0x08, 0x01, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x75, 0x73, 0x74,
+	0x6f, 0x6d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x1a, 0x9f, 0x03, 0x0a, 0x0f, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x78, 0x0a,
+	0x11, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x5f, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x77, 0x6f, 0x72,
+	0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x11, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x1a, 0x60, 0x0a, 0x0f, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x3a, 0x4d, 0x9a, 0xc5,
-	0x88, 0x1e, 0x48, 0x0a, 0x46, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x3a, 0x3d, 0x9a, 0xc5, 0x88,
-	0x1e, 0x38, 0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x43, 0x61, 0x73, 0x65, 0x57,
+	0x6f, 0x72, 0x64, 0x73, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x43, 0x61,
+	0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x5b, 0x0a, 0x12, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x66, 0x75, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
+	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48,
+	0x00, 0x52, 0x11, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x74, 0x65, 0x72, 0x1a, 0x60, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x43, 0x61,
+	0x73, 0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x3a, 0x4d, 0x9a, 0xc5, 0x88, 0x1e, 0x48, 0x0a, 0x46,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79,
+	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x43, 0x61, 0x73,
+	0x65, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38, 0x0a, 0x36, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x14, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x2d, 0x9a, 0xc5, 0x88,
+	0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
 	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x14, 0x0a, 0x0d, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x31,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22,
-	0xc1, 0x02, 0x0a, 0x11, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x43, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d,
-	0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x43, 0x0a, 0x07, 0x74, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0xaa, 0x01, 0x08, 0x08, 0x01,
-	0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
-	0x3f, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6a, 0x69, 0x74, 0x74,
-	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
-	0x52, 0x0e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72,
-	0x12, 0x61, 0x0a, 0x18, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
-	0x64, 0x6c, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01,
+	0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xc1, 0x02, 0x0a, 0x11, 0x4b,
+	0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73,
+	0x12, 0x43, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa,
-	0x42, 0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x16, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x6c, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x22, 0xd3, 0x0e, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a, 0x10,
-	0x68, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x42, 0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x08, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x43, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0xaa, 0x01, 0x08, 0x08, 0x01, 0x32, 0x04, 0x10, 0xc0, 0x84,
+	0x3d, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3f, 0x0a, 0x0f, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x4a, 0x69, 0x74, 0x74, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x18, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06,
+	0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x16, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x64, 0x6c, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0xd0,
+	0x0e, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a, 0x10, 0x68, 0x70, 0x61, 0x63, 0x6b,
+	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
+	0x0e, 0x68, 0x70, 0x61, 0x63, 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12,
+	0x61, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+	0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0d, 0xfa,
+	0x42, 0x0a, 0x2a, 0x08, 0x18, 0xff, 0xff, 0xff, 0xff, 0x07, 0x28, 0x01, 0x52, 0x14, 0x6d, 0x61,
+	0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x73, 0x12, 0x6a, 0x0a, 0x1a, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x69, 0x7a, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x68, 0x70, 0x61, 0x63, 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x53, 0x69, 0x7a, 0x65, 0x12, 0x61, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x63,
-	0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x2a, 0x08, 0x18, 0xff, 0xff, 0xff, 0xff, 0x07, 0x28,
-	0x01, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x6a, 0x0a, 0x1a, 0x69, 0x6e, 0x69, 0x74, 0x69,
-	0x61, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x2a, 0x0a,
-	0x18, 0xff, 0xff, 0xff, 0xff, 0x07, 0x28, 0xff, 0xff, 0x03, 0x52, 0x17, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x61, 0x6c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
-	0x69, 0x7a, 0x65, 0x12, 0x72, 0x0a, 0x1e, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x2a, 0x0a, 0x18, 0xff, 0xff, 0xff, 0xff,
+	0x07, 0x28, 0xff, 0xff, 0x03, 0x52, 0x17, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x72,
+	0x0a, 0x1e, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x69, 0x7a, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x2a, 0x0a, 0x18, 0xff, 0xff, 0xff, 0xff,
+	0x07, 0x28, 0xff, 0xff, 0x03, 0x52, 0x1b, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x69,
+	0x7a, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
+	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x55,
+	0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x66,
+	0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0f, 0xfa, 0x42, 0x0c, 0x2a, 0x0a,
-	0x18, 0xff, 0xff, 0xff, 0xff, 0x07, 0x28, 0xff, 0xff, 0x03, 0x52, 0x1b, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x25, 0x0a, 0x0e,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x12, 0x55, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07,
-	0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x4f, 0x75, 0x74, 0x62,
-	0x6f, 0x75, 0x6e, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x64, 0x0a, 0x1b, 0x6d, 0x61,
-	0x78, 0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x4f, 0x75, 0x74, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73,
-	0x12, 0x84, 0x01, 0x0a, 0x31, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75,
-	0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x66, 0x72, 0x61,
-	0x6d, 0x65, 0x73, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x70,
-	0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x2b, 0x6d, 0x61, 0x78, 0x43,
-	0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e,
-	0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x6f, 0x0a, 0x26, 0x6d, 0x61, 0x78, 0x5f, 0x69,
-	0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x5f,
-	0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x21, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e,
-	0x64, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50,
-	0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x91, 0x01, 0x0a, 0x34, 0x6d, 0x61, 0x78,
-	0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x70, 0x65,
-	0x72, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6e,
-	0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x2c,
-	0x6d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x44,
-	0x61, 0x74, 0x61, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x12, 0x5e, 0x0a, 0x26,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f,
-	0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x21, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48,
-	0x74, 0x74, 0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x12, 0x7a, 0x0a, 0x2d,
-	0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x0e, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x27, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74, 0x74,
-	0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x7a, 0x0a, 0x1a, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61,
-	0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x52, 0x18, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65,
-	0x74, 0x65, 0x72, 0x73, 0x12, 0x5a, 0x0a, 0x14, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0f, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c,
-	0x69, 0x76, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x13, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65,
-	0x12, 0x50, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x6f, 0x67, 0x68, 0x74, 0x74, 0x70, 0x32, 0x5f,
-	0x63, 0x6f, 0x64, 0x65, 0x63, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
-	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08,
-	0x01, 0x52, 0x0f, 0x75, 0x73, 0x65, 0x4f, 0x67, 0x68, 0x74, 0x74, 0x70, 0x32, 0x43, 0x6f, 0x64,
-	0x65, 0x63, 0x1a, 0xe5, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x51, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xfa, 0x42, 0x08, 0x2a,
-	0x06, 0x18, 0xff, 0xff, 0x03, 0x28, 0x00, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
+	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02,
+	0x28, 0x01, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x46,
+	0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x64, 0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x6f, 0x75, 0x74,
+	0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5f, 0x66, 0x72,
+	0x61, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a,
-	0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e,
-	0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa5, 0x01, 0x0a, 0x13, 0x47, 0x72,
-	0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x60, 0x0a, 0x16, 0x68, 0x74, 0x74, 0x70, 0x32, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x14, 0x68,
+	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28,
+	0x01, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x31,
+	0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x5f,
+	0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x77,
+	0x69, 0x74, 0x68, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61,
+	0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x2b, 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63,
+	0x75, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x46, 0x72, 0x61, 0x6d,
+	0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f,
+	0x61, 0x64, 0x12, 0x6f, 0x0a, 0x26, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e,
+	0x64, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65,
+	0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x21, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x50, 0x72, 0x69, 0x6f,
+	0x72, 0x69, 0x74, 0x79, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x12, 0x91, 0x01, 0x0a, 0x34, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x62, 0x6f,
+	0x75, 0x6e, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x64, 0x61, 0x74,
+	0x61, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x2c, 0x6d, 0x61, 0x78, 0x49, 0x6e,
+	0x62, 0x6f, 0x75, 0x6e, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x46, 0x72,
+	0x61, 0x6d, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x12, 0x5e, 0x0a, 0x26, 0x73, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e,
+	0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
+	0x2e, 0x30, 0x18, 0x01, 0x52, 0x21, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x72, 0x72, 0x6f,
+	0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74, 0x74, 0x70, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x12, 0x7a, 0x0a, 0x2d, 0x6f, 0x76, 0x65, 0x72, 0x72,
+	0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x68, 0x74, 0x74, 0x70,
+	0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x27, 0x6f, 0x76, 0x65, 0x72,
+	0x72, 0x69, 0x64, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4f,
+	0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74, 0x74, 0x70, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x12, 0x7a, 0x0a, 0x1a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65,
+	0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48,
 	0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x47, 0x72,
-	0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x22, 0xb1, 0x02, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x33, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5d, 0x0a, 0x15, 0x71, 0x75,
-	0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61,
+	0x6d, 0x65, 0x74, 0x65, 0x72, 0x52, 0x18, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12,
+	0x5a, 0x0a, 0x14, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65,
+	0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x53, 0x65,
+	0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x13, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x12, 0x50, 0x0a, 0x11, 0x75,
+	0x73, 0x65, 0x5f, 0x6f, 0x67, 0x68, 0x74, 0x74, 0x70, 0x32, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x63,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x52, 0x0f, 0x75, 0x73,
+	0x65, 0x4f, 0x67, 0x68, 0x74, 0x74, 0x70, 0x32, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x1a, 0xe2, 0x01,
+	0x0a, 0x11, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65,
+	0x74, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x2a,
+	0x06, 0x18, 0xff, 0xff, 0x03, 0x28, 0x00, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a, 0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74, 0x70,
+	0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+	0x65, 0x72, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x74, 0x74,
+	0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x22, 0xa5, 0x01, 0x0a, 0x13, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x60, 0x0a, 0x16, 0x68, 0x74, 0x74,
+	0x70, 0x32, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x51, 0x75, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x13, 0x71, 0x75, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x7a, 0x0a, 0x2d, 0x6f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x27, 0x6f, 0x76,
-	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x48, 0x74, 0x74, 0x70, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x3e, 0x0a, 0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x52,
-	0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0x74, 0x0a, 0x1a, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x13, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x74, 0x6f,
-	0x5f, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x12, 0xfa, 0x42, 0x0f, 0x72, 0x0d, 0x52, 0x04, 0x68, 0x74, 0x74, 0x70, 0x52, 0x05, 0x68,
-	0x74, 0x74, 0x70, 0x73, 0x48, 0x00, 0x52, 0x11, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x54, 0x6f,
-	0x4f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x42, 0x10, 0x0a, 0x0e, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x81, 0x01, 0x0a, 0x22,
+	0x2e, 0x48, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x14, 0x68, 0x74, 0x74, 0x70, 0x32, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x2c, 0x9a, 0xc5, 0x88,
+	0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xb1, 0x02, 0x0a, 0x14, 0x48, 0x74,
+	0x74, 0x70, 0x33, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x5d, 0x0a, 0x15, 0x71, 0x75, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51, 0x75, 0x69, 0x63, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x13, 0x71, 0x75,
+	0x69, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x7a, 0x0a, 0x2d, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6f, 0x6e, 0x5f, 0x69, 0x6e,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x27, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x53, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4f, 0x6e, 0x49, 0x6e, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x48, 0x74, 0x74, 0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x3e, 0x0a,
+	0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x08, 0xd2,
+	0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x52, 0x14, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x45, 0x78,
+	0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0x74, 0x0a,
+	0x1a, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x13, 0x73,
+	0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x72, 0x0d, 0x52,
+	0x04, 0x68, 0x74, 0x74, 0x70, 0x52, 0x05, 0x68, 0x74, 0x74, 0x70, 0x73, 0x48, 0x00, 0x52, 0x11,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x54, 0x6f, 0x4f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74,
+	0x65, 0x42, 0x10, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x81, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22,
 	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
 	0x76, 0x33, 0x42, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f, 0x74,
@@ -2049,8 +2081,7 @@ var file_envoy_config_core_v3_protocol_proto_rawDesc = []byte{
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.validate.go
index 9e9a9155e98..feb1489c21d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/protocol.pb.validate.go
@@ -412,6 +412,10 @@ func (m *QuicProtocolOptions) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for ConnectionOptions
+
+	// no validation rules for ClientConnectionOptions
+
 	if len(errors) > 0 {
 		return QuicProtocolOptionsMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/proxy_protocol.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/proxy_protocol.pb.go
index 90b7aaebe64..56e3119f4b8 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/proxy_protocol.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/proxy_protocol.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/proxy_protocol.proto
 
 package corev3
@@ -274,16 +274,16 @@ var file_envoy_config_core_v3_proxy_protocol_proto_rawDesc = []byte{
 	0x6c, 0x50, 0x61, 0x73, 0x73, 0x54, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x54, 0x4c, 0x56, 0x73,
 	0x52, 0x0f, 0x70, 0x61, 0x73, 0x73, 0x54, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x54, 0x6c, 0x76,
 	0x73, 0x22, 0x19, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x06, 0x0a, 0x02,
-	0x56, 0x31, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x32, 0x10, 0x01, 0x42, 0x86, 0x01, 0x0a,
-	0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x42, 0x12, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x56, 0x31, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x56, 0x32, 0x10, 0x01, 0x42, 0x86, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x12, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63,
+	0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/resolver.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/resolver.pb.go
index 9094e47f743..3c0a2fe07c5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/resolver.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/resolver.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/resolver.proto
 
 package corev3
@@ -172,15 +172,15 @@ var file_envoy_config_core_v3_resolver_proto_rawDesc = []byte{
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
 	0x33, 0x2e, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x4f, 0x70, 0x74,
 	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x12, 0x64, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
-	0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x81, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42,
-	0x0d, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f,
-	0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x81, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/socket_option.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/socket_option.pb.go
index 5ade94fcadd..646973476e0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/socket_option.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/socket_option.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/socket_option.proto
 
 package corev3
@@ -81,13 +81,13 @@ func (SocketOption_SocketState) EnumDescriptor() ([]byte, []int) {
 //
 // .. code-block:: json
 //
-//  {
-//    "description": "support tcp keep alive",
-//    "state": 0,
-//    "level": 1,
-//    "name": 9,
-//    "int_value": 1,
-//  }
+//	{
+//	  "description": "support tcp keep alive",
+//	  "state": 0,
+//	  "level": 1,
+//	  "name": 9,
+//	  "int_value": 1,
+//	}
 //
 // 1 means SOL_SOCKET and 9 means SO_KEEPALIVE on Linux.
 // With the above configuration, `TCP Keep-Alives <https://www.freesoft.org/CIE/RFC/1122/114.htm>`_
@@ -110,6 +110,7 @@ type SocketOption struct {
 	// The numeric name as passed to setsockopt
 	Name int64 `protobuf:"varint,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to Value:
+	//
 	//	*SocketOption_IntValue
 	//	*SocketOption_BufValue
 	Value isSocketOption_Value `protobuf_oneof:"value"`
@@ -305,15 +306,15 @@ var file_envoy_config_core_v3_socket_option_proto_rawDesc = []byte{
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x6f, 0x63, 0x6b,
 	0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x85, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x11,
-	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x85, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.go
index 745b4c18604..6692c1d5d09 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/substitution_format_string.proto
 
 package corev3
@@ -24,45 +24,97 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// Optional configuration options to be used with json_format.
+type JsonFormatOptions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The output JSON string properties will be sorted.
+	SortProperties bool `protobuf:"varint,1,opt,name=sort_properties,json=sortProperties,proto3" json:"sort_properties,omitempty"`
+}
+
+func (x *JsonFormatOptions) Reset() {
+	*x = JsonFormatOptions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *JsonFormatOptions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*JsonFormatOptions) ProtoMessage() {}
+
+func (x *JsonFormatOptions) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use JsonFormatOptions.ProtoReflect.Descriptor instead.
+func (*JsonFormatOptions) Descriptor() ([]byte, []int) {
+	return file_envoy_config_core_v3_substitution_format_string_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *JsonFormatOptions) GetSortProperties() bool {
+	if x != nil {
+		return x.SortProperties
+	}
+	return false
+}
+
 // Configuration to use multiple :ref:`command operators <config_access_log_command_operators>`
 // to generate a new string in either plain text or JSON format.
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 type SubstitutionFormatString struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Format:
+	//
 	//	*SubstitutionFormatString_TextFormat
 	//	*SubstitutionFormatString_JsonFormat
 	//	*SubstitutionFormatString_TextFormatSource
 	Format isSubstitutionFormatString_Format `protobuf_oneof:"format"`
 	// If set to true, when command operators are evaluated to null,
 	//
-	// * for ``text_format``, the output of the empty operator is changed from ``-`` to an
-	//   empty string, so that empty values are omitted entirely.
-	// * for ``json_format`` the keys with null values are omitted in the output structure.
+	//   - for “text_format“, the output of the empty operator is changed from “-“ to an
+	//     empty string, so that empty values are omitted entirely.
+	//   - for “json_format“ the keys with null values are omitted in the output structure.
 	OmitEmptyValues bool `protobuf:"varint,3,opt,name=omit_empty_values,json=omitEmptyValues,proto3" json:"omit_empty_values,omitempty"`
-	// Specify a ``content_type`` field.
-	// If this field is not set then ``text/plain`` is used for ``text_format`` and
-	// ``application/json`` is used for ``json_format``.
+	// Specify a “content_type“ field.
+	// If this field is not set then “text/plain“ is used for “text_format“ and
+	// “application/json“ is used for “json_format“.
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   content_type: "text/html; charset=UTF-8"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
+	//	content_type: "text/html; charset=UTF-8"
 	ContentType string `protobuf:"bytes,4,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"`
 	// Specifies a collection of Formatter plugins that can be called from the access log configuration.
 	// See the formatters extensions documentation for details.
 	// [#extension-category: envoy.formatter]
 	Formatters []*TypedExtensionConfig `protobuf:"bytes,6,rep,name=formatters,proto3" json:"formatters,omitempty"`
+	// If json_format is used, the options will be applied to the output JSON string.
+	JsonFormatOptions *JsonFormatOptions `protobuf:"bytes,7,opt,name=json_format_options,json=jsonFormatOptions,proto3" json:"json_format_options,omitempty"`
 }
 
 func (x *SubstitutionFormatString) Reset() {
 	*x = SubstitutionFormatString{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0]
+		mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -75,7 +127,7 @@ func (x *SubstitutionFormatString) String() string {
 func (*SubstitutionFormatString) ProtoMessage() {}
 
 func (x *SubstitutionFormatString) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0]
+	mi := &file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -88,7 +140,7 @@ func (x *SubstitutionFormatString) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SubstitutionFormatString.ProtoReflect.Descriptor instead.
 func (*SubstitutionFormatString) Descriptor() ([]byte, []int) {
-	return file_envoy_config_core_v3_substitution_format_string_proto_rawDescGZIP(), []int{0}
+	return file_envoy_config_core_v3_substitution_format_string_proto_rawDescGZIP(), []int{1}
 }
 
 func (m *SubstitutionFormatString) GetFormat() isSubstitutionFormatString_Format {
@@ -98,7 +150,7 @@ func (m *SubstitutionFormatString) GetFormat() isSubstitutionFormatString_Format
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/core/v3/substitution_format_string.proto.
 func (x *SubstitutionFormatString) GetTextFormat() string {
 	if x, ok := x.GetFormat().(*SubstitutionFormatString_TextFormat); ok {
 		return x.TextFormat
@@ -141,6 +193,13 @@ func (x *SubstitutionFormatString) GetFormatters() []*TypedExtensionConfig {
 	return nil
 }
 
+func (x *SubstitutionFormatString) GetJsonFormatOptions() *JsonFormatOptions {
+	if x != nil {
+		return x.JsonFormatOptions
+	}
+	return nil
+}
+
 type isSubstitutionFormatString_Format interface {
 	isSubstitutionFormatString_Format()
 }
@@ -149,22 +208,23 @@ type SubstitutionFormatString_TextFormat struct {
 	// Specify a format with command operators to form a text string.
 	// Its details is described in :ref:`format string<config_access_log_format_strings>`.
 	//
-	// For example, setting ``text_format`` like below,
+	// For example, setting “text_format“ like below,
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
+	//
+	//	text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
 	//
 	// generates plain text similar to:
 	//
 	// .. code-block:: text
 	//
-	//   upstream connect error:503:path=/foo
+	//	upstream connect error:503:path=/foo
 	//
 	// Deprecated in favor of :ref:`text_format_source <envoy_v3_api_field_config.core.v3.SubstitutionFormatString.text_format_source>`. To migrate text format strings, use the :ref:`inline_string <envoy_v3_api_field_config.core.v3.DataSource.inline_string>` field.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/core/v3/substitution_format_string.proto.
 	TextFormat string `protobuf:"bytes,1,opt,name=text_format,json=textFormat,proto3,oneof"`
 }
 
@@ -176,21 +236,21 @@ type SubstitutionFormatString_JsonFormat struct {
 	// See the documentation for a specific command operator for details.
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   json_format:
-	//     status: "%RESPONSE_CODE%"
-	//     message: "%LOCAL_REPLY_BODY%"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
+	//
+	//	json_format:
+	//	  status: "%RESPONSE_CODE%"
+	//	  message: "%LOCAL_REPLY_BODY%"
 	//
 	// The following JSON object would be created:
 	//
 	// .. code-block:: json
 	//
-	//  {
-	//    "status": 500,
-	//    "message": "My error message"
-	//  }
-	//
+	//	{
+	//	  "status": 500,
+	//	  "message": "My error message"
+	//	}
 	JsonFormat *_struct.Struct `protobuf:"bytes,2,opt,name=json_format,json=jsonFormat,proto3,oneof"`
 }
 
@@ -198,20 +258,20 @@ type SubstitutionFormatString_TextFormatSource struct {
 	// Specify a format with command operators to form a text string.
 	// Its details is described in :ref:`format string<config_access_log_format_strings>`.
 	//
-	// For example, setting ``text_format`` like below,
+	// For example, setting “text_format“ like below,
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   text_format_source:
-	//     inline_string: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
+	//
+	//	text_format_source:
+	//	  inline_string: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
 	//
 	// generates plain text similar to:
 	//
 	// .. code-block:: text
 	//
-	//   upstream connect error:503:path=/foo
-	//
+	//	upstream connect error:503:path=/foo
 	TextFormatSource *DataSource `protobuf:"bytes,5,opt,name=text_format_source,json=textFormatSource,proto3,oneof"`
 }
 
@@ -241,42 +301,51 @@ var file_envoy_config_core_v3_substitution_format_string_proto_rawDesc = []byte{
 	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
 	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x99, 0x03, 0x0a, 0x18, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x2e, 0x0a, 0x0b,
-	0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00,
-	0x52, 0x0a, 0x74, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x44, 0x0a, 0x0b,
-	0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x6a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x12, 0x50, 0x0a, 0x12, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x48, 0x00, 0x52, 0x10, 0x74, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x6d, 0x69, 0x74, 0x5f, 0x65, 0x6d, 0x70,
-	0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0f, 0x6f, 0x6d, 0x69, 0x74, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
-	0x12, 0x2e, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02,
-	0xc8, 0x01, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x4a, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x06,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x73, 0x42, 0x0d, 0x0a, 0x06,
-	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x91, 0x01, 0x0a, 0x22,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x42, 0x1d, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x3c, 0x0a, 0x11, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6f, 0x72, 0x74, 0x5f, 0x70, 0x72, 0x6f,
+	0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x73,
+	0x6f, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0xf2, 0x03,
+	0x0a, 0x18, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x2e, 0x0a, 0x0b, 0x74, 0x65,
+	0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0a,
+	0x74, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x44, 0x0a, 0x0b, 0x6a, 0x73,
+	0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x6a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x12, 0x50, 0x0a, 0x12, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00,
+	0x52, 0x10, 0x74, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x6d, 0x69, 0x74, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x6f,
+	0x6d, 0x69, 0x74, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x2e,
+	0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01,
+	0x02, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4a,
+	0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x73, 0x12, 0x57, 0x0a, 0x13, 0x6a, 0x73,
+	0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4a,
+	0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x52, 0x11, 0x6a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x42, 0x0d, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x03, 0xf8,
+	0x42, 0x01, 0x42, 0x91, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x42, 0x1d, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b,
+	0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -291,22 +360,24 @@ func file_envoy_config_core_v3_substitution_format_string_proto_rawDescGZIP() []
 	return file_envoy_config_core_v3_substitution_format_string_proto_rawDescData
 }
 
-var file_envoy_config_core_v3_substitution_format_string_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_envoy_config_core_v3_substitution_format_string_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_envoy_config_core_v3_substitution_format_string_proto_goTypes = []interface{}{
-	(*SubstitutionFormatString)(nil), // 0: envoy.config.core.v3.SubstitutionFormatString
-	(*_struct.Struct)(nil),           // 1: google.protobuf.Struct
-	(*DataSource)(nil),               // 2: envoy.config.core.v3.DataSource
-	(*TypedExtensionConfig)(nil),     // 3: envoy.config.core.v3.TypedExtensionConfig
+	(*JsonFormatOptions)(nil),        // 0: envoy.config.core.v3.JsonFormatOptions
+	(*SubstitutionFormatString)(nil), // 1: envoy.config.core.v3.SubstitutionFormatString
+	(*_struct.Struct)(nil),           // 2: google.protobuf.Struct
+	(*DataSource)(nil),               // 3: envoy.config.core.v3.DataSource
+	(*TypedExtensionConfig)(nil),     // 4: envoy.config.core.v3.TypedExtensionConfig
 }
 var file_envoy_config_core_v3_substitution_format_string_proto_depIdxs = []int32{
-	1, // 0: envoy.config.core.v3.SubstitutionFormatString.json_format:type_name -> google.protobuf.Struct
-	2, // 1: envoy.config.core.v3.SubstitutionFormatString.text_format_source:type_name -> envoy.config.core.v3.DataSource
-	3, // 2: envoy.config.core.v3.SubstitutionFormatString.formatters:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	2, // 0: envoy.config.core.v3.SubstitutionFormatString.json_format:type_name -> google.protobuf.Struct
+	3, // 1: envoy.config.core.v3.SubstitutionFormatString.text_format_source:type_name -> envoy.config.core.v3.DataSource
+	4, // 2: envoy.config.core.v3.SubstitutionFormatString.formatters:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	0, // 3: envoy.config.core.v3.SubstitutionFormatString.json_format_options:type_name -> envoy.config.core.v3.JsonFormatOptions
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_core_v3_substitution_format_string_proto_init() }
@@ -318,6 +389,18 @@ func file_envoy_config_core_v3_substitution_format_string_proto_init() {
 	file_envoy_config_core_v3_extension_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*JsonFormatOptions); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SubstitutionFormatString); i {
 			case 0:
 				return &v.state
@@ -330,7 +413,7 @@ func file_envoy_config_core_v3_substitution_format_string_proto_init() {
 			}
 		}
 	}
-	file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_envoy_config_core_v3_substitution_format_string_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*SubstitutionFormatString_TextFormat)(nil),
 		(*SubstitutionFormatString_JsonFormat)(nil),
 		(*SubstitutionFormatString_TextFormatSource)(nil),
@@ -341,7 +424,7 @@ func file_envoy_config_core_v3_substitution_format_string_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_config_core_v3_substitution_format_string_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   1,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.validate.go
index 2f3615c0b98..c805d82866a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/substitution_format_string.pb.validate.go
@@ -35,6 +35,110 @@ var (
 	_ = sort.Sort
 )
 
+// Validate checks the field values on JsonFormatOptions with the rules defined
+// in the proto definition for this message. If any rules are violated, the
+// first error encountered is returned, or nil if there are no violations.
+func (m *JsonFormatOptions) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on JsonFormatOptions with the rules
+// defined in the proto definition for this message. If any rules are
+// violated, the result is a list of violation errors wrapped in
+// JsonFormatOptionsMultiError, or nil if none found.
+func (m *JsonFormatOptions) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *JsonFormatOptions) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	// no validation rules for SortProperties
+
+	if len(errors) > 0 {
+		return JsonFormatOptionsMultiError(errors)
+	}
+
+	return nil
+}
+
+// JsonFormatOptionsMultiError is an error wrapping multiple validation errors
+// returned by JsonFormatOptions.ValidateAll() if the designated constraints
+// aren't met.
+type JsonFormatOptionsMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m JsonFormatOptionsMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m JsonFormatOptionsMultiError) AllErrors() []error { return m }
+
+// JsonFormatOptionsValidationError is the validation error returned by
+// JsonFormatOptions.Validate if the designated constraints aren't met.
+type JsonFormatOptionsValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e JsonFormatOptionsValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e JsonFormatOptionsValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e JsonFormatOptionsValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e JsonFormatOptionsValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e JsonFormatOptionsValidationError) ErrorName() string {
+	return "JsonFormatOptionsValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e JsonFormatOptionsValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sJsonFormatOptions.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = JsonFormatOptionsValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = JsonFormatOptionsValidationError{}
+
 // Validate checks the field values on SubstitutionFormatString with the rules
 // defined in the proto definition for this message. If any rules are
 // violated, the first error encountered is returned, or nil if there are no violations.
@@ -104,6 +208,35 @@ func (m *SubstitutionFormatString) validate(all bool) error {
 
 	}
 
+	if all {
+		switch v := interface{}(m.GetJsonFormatOptions()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, SubstitutionFormatStringValidationError{
+					field:  "JsonFormatOptions",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, SubstitutionFormatStringValidationError{
+					field:  "JsonFormatOptions",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetJsonFormatOptions()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return SubstitutionFormatStringValidationError{
+				field:  "JsonFormatOptions",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	oneofFormatPresent := false
 	switch v := m.Format.(type) {
 	case *SubstitutionFormatString_TextFormat:
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/udp_socket_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/udp_socket_config.pb.go
index d5ff6d382fb..b7f9f8229b9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/udp_socket_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/udp_socket_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/core/v3/udp_socket_config.proto
 
 package corev3
@@ -110,16 +110,16 @@ var file_envoy_config_core_v3_udp_socket_config_proto_rawDesc = []byte{
 	0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x67, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
 	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72,
-	0x65, 0x66, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x42, 0x88, 0x01, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x14,
-	0x55, 0x64, 0x70, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65,
-	0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x66, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x42, 0x88, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x14, 0x55, 0x64, 0x70, 0x53, 0x6f, 0x63, 0x6b, 0x65,
+	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/ya.make
index 3f4610424ce..a80a91bb22b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/core/v3/ya.make
@@ -21,6 +21,8 @@ SRCS(
     grpc_service.pb.validate.go
     health_check.pb.go
     health_check.pb.validate.go
+    http_service.pb.go
+    http_service.pb.validate.go
     http_uri.pb.go
     http_uri.pb.validate.go
     protocol.pb.go
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.go
index 24f1baab7a5..6472d1120a2 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/endpoint/v3/endpoint.proto
 
 package endpointv3
@@ -115,7 +115,7 @@ func (x *ClusterLoadAssignment) GetPolicy() *ClusterLoadAssignment_Policy {
 }
 
 // Load balancing policy settings.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 type ClusterLoadAssignment_Policy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -131,16 +131,19 @@ type ClusterLoadAssignment_Policy struct {
 	//
 	// .. code-block:: json
 	//
-	//  { "drop_overloads": [
-	//      { "category": "throttle", "drop_percentage": 60 }
-	//      { "category": "lb", "drop_percentage": 50 }
-	//  ]}
+	//	{ "drop_overloads": [
+	//	    { "category": "throttle", "drop_percentage": 60 }
+	//	    { "category": "lb", "drop_percentage": 50 }
+	//	]}
 	//
 	// The actual drop percentages applied to the traffic at the clients will be
-	//    "throttle"_drop = 60%
-	//    "lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
-	//    actual_outgoing_load = 20% // remaining after applying all categories.
-	// [#not-implemented-hide:]
+	//
+	//	"throttle"_drop = 60%
+	//	"lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
+	//	actual_outgoing_load = 20% // remaining after applying all categories.
+	//
+	// Envoy supports only one element and will NACK if more than one element is present.
+	// Other xDS-capable data planes will not necessarily have this limitation.
 	DropOverloads []*ClusterLoadAssignment_Policy_DropOverload `protobuf:"bytes,2,rep,name=drop_overloads,json=dropOverloads,proto3" json:"drop_overloads,omitempty"`
 	// Priority levels and localities are considered overprovisioned with this
 	// factor (in percentage). This means that we don't consider a priority
@@ -152,7 +155,7 @@ type ClusterLoadAssignment_Policy struct {
 	//
 	// .. code-block:: json
 	//
-	//  { "overprovisioning_factor": 100 }
+	//	{ "overprovisioning_factor": 100 }
 	//
 	// Read more at :ref:`priority levels <arch_overview_load_balancing_priority_levels>` and
 	// :ref:`localities <arch_overview_load_balancing_locality_weighted_lb>`.
@@ -162,6 +165,15 @@ type ClusterLoadAssignment_Policy struct {
 	// are considered stale and should be marked unhealthy.
 	// Defaults to 0 which means endpoints never go stale.
 	EndpointStaleAfter *duration.Duration `protobuf:"bytes,4,opt,name=endpoint_stale_after,json=endpointStaleAfter,proto3" json:"endpoint_stale_after,omitempty"`
+	// If true, use the :ref:`load balancing weight
+	// <envoy_v3_api_field_config.endpoint.v3.LbEndpoint.load_balancing_weight>` of healthy and unhealthy
+	// hosts to determine the health of the priority level. If false, use the number of healthy and unhealthy hosts
+	// to determine the health of the priority level, or in other words assume each host has a weight of 1 for
+	// this calculation.
+	//
+	// Note: this is not currently implemented for
+	// :ref:`locality weighted load balancing <arch_overview_load_balancing_locality_weighted_lb>`.
+	WeightedPriorityHealth bool `protobuf:"varint,6,opt,name=weighted_priority_health,json=weightedPriorityHealth,proto3" json:"weighted_priority_health,omitempty"`
 }
 
 func (x *ClusterLoadAssignment_Policy) Reset() {
@@ -217,7 +229,13 @@ func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *duration.Duratio
 	return nil
 }
 
-// [#not-implemented-hide:]
+func (x *ClusterLoadAssignment_Policy) GetWeightedPriorityHealth() bool {
+	if x != nil {
+		return x.WeightedPriorityHealth
+	}
+	return false
+}
+
 type ClusterLoadAssignment_Policy_DropOverload struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -297,7 +315,7 @@ var file_envoy_config_endpoint_v3_endpoint_proto_rawDesc = []byte{
 	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
 	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xa6, 0x08, 0x0a, 0x15, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41,
+	0xe0, 0x08, 0x0a, 0x15, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41,
 	0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x0c, 0x63, 0x6c, 0x75,
 	0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
 	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
@@ -318,7 +336,7 @@ var file_envoy_config_endpoint_v3_endpoint_proto_rawDesc = []byte{
 	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73,
 	0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e,
 	0x74, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x1a, 0xc3, 0x04, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x6a, 0x0a, 0x0e, 0x64,
+	0x1a, 0xfd, 0x04, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x6a, 0x0a, 0x0e, 0x64,
 	0x72, 0x6f, 0x70, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x02, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x43,
@@ -336,43 +354,47 @@ var file_envoy_config_endpoint_v3_endpoint_proto_rawDesc = []byte{
 	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x12, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x1a, 0xbd,
-	0x01, 0x0a, 0x0c, 0x44, 0x72, 0x6f, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x12,
-	0x23, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65,
-	0x67, 0x6f, 0x72, 0x79, 0x12, 0x49, 0x0a, 0x0f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x65, 0x72,
-	0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52,
-	0x0e, 0x64, 0x72, 0x6f, 0x70, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x3a,
-	0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38, 0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64,
-	0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x3a, 0x30,
-	0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41,
-	0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x18, 0x64, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x1a, 0x65, 0x0a, 0x13, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x45,
-	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x38, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x29, 0x9a,
-	0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73,
-	0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x8d, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x6f, 0x69, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x38,
+	0x0a, 0x18, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72,
+	0x69, 0x74, 0x79, 0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x16, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69,
+	0x74, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x1a, 0xbd, 0x01, 0x0a, 0x0c, 0x44, 0x72, 0x6f,
+	0x70, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x23, 0x0a, 0x08, 0x63, 0x61, 0x74,
+	0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x10, 0x01, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x49,
+	0x0a, 0x0f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x64, 0x72, 0x6f, 0x70, 0x50,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38,
+	0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
+	0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x44, 0x72, 0x6f, 0x70,
+	0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a,
+	0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d,
+	0x65, 0x6e, 0x74, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02,
+	0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x6f, 0x76, 0x65, 0x72, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67,
+	0x1a, 0x65, 0x0a, 0x13, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x38, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x2e, 0x76, 0x33, 0x42, 0x0d, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65,
+	0x6e, 0x74, 0x42, 0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.validate.go
index 50dfaafab3e..1ed6aa20bd0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint.pb.validate.go
@@ -358,6 +358,8 @@ func (m *ClusterLoadAssignment_Policy) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for WeightedPriorityHealth
+
 	if len(errors) > 0 {
 		return ClusterLoadAssignment_PolicyMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.go
index 0c8f3c09902..83f56bd7250 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/endpoint/v3/endpoint_components.proto
 
 package endpointv3
@@ -34,25 +34,31 @@ type Endpoint struct {
 	//
 	// .. attention::
 	//
-	//   The form of host address depends on the given cluster type. For STATIC or EDS,
-	//   it is expected to be a direct IP address (or something resolvable by the
-	//   specified :ref:`resolver <envoy_v3_api_field_config.core.v3.SocketAddress.resolver_name>`
-	//   in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
-	//   and will be resolved via DNS.
+	//	The form of host address depends on the given cluster type. For STATIC or EDS,
+	//	it is expected to be a direct IP address (or something resolvable by the
+	//	specified :ref:`resolver <envoy_v3_api_field_config.core.v3.SocketAddress.resolver_name>`
+	//	in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
+	//	and will be resolved via DNS.
 	Address *v3.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	// The optional health check configuration is used as configuration for the
 	// health checker to contact the health checked host.
 	//
 	// .. attention::
 	//
-	//   This takes into effect only for upstream clusters with
-	//   :ref:`active health checking <arch_overview_health_checking>` enabled.
+	//	This takes into effect only for upstream clusters with
+	//	:ref:`active health checking <arch_overview_health_checking>` enabled.
 	HealthCheckConfig *Endpoint_HealthCheckConfig `protobuf:"bytes,2,opt,name=health_check_config,json=healthCheckConfig,proto3" json:"health_check_config,omitempty"`
 	// The hostname associated with this endpoint. This hostname is not used for routing or address
 	// resolution. If provided, it will be associated with the endpoint, and can be used for features
 	// that require a hostname, like
 	// :ref:`auto_host_rewrite <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>`.
 	Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	// An ordered list of addresses that together with “address“ comprise the
+	// list of addresses for an endpoint. The address given in the “address“ is
+	// prepended to this list. It is assumed that the list must already be
+	// sorted by preference order of the addresses. This will only be supported
+	// for STATIC and EDS clusters.
+	AdditionalAddresses []*Endpoint_AdditionalAddress `protobuf:"bytes,4,rep,name=additional_addresses,json=additionalAddresses,proto3" json:"additional_addresses,omitempty"`
 }
 
 func (x *Endpoint) Reset() {
@@ -108,6 +114,13 @@ func (x *Endpoint) GetHostname() string {
 	return ""
 }
 
+func (x *Endpoint) GetAdditionalAddresses() []*Endpoint_AdditionalAddress {
+	if x != nil {
+		return x.AdditionalAddresses
+	}
+	return nil
+}
+
 // An Endpoint that Envoy can route traffic to.
 // [#next-free-field: 6]
 type LbEndpoint struct {
@@ -118,6 +131,7 @@ type LbEndpoint struct {
 	// Upstream host identifier or a named reference.
 	//
 	// Types that are assignable to HostIdentifier:
+	//
 	//	*LbEndpoint_Endpoint
 	//	*LbEndpoint_EndpointName
 	HostIdentifier isLbEndpoint_HostIdentifier `protobuf_oneof:"host_identifier"`
@@ -125,8 +139,8 @@ type LbEndpoint struct {
 	HealthStatus v3.HealthStatus `protobuf:"varint,2,opt,name=health_status,json=healthStatus,proto3,enum=envoy.config.core.v3.HealthStatus" json:"health_status,omitempty"`
 	// The endpoint metadata specifies values that may be used by the load
 	// balancer to select endpoints in a cluster for a given request. The filter
-	// name should be specified as ``envoy.lb``. An example boolean key-value pair
-	// is ``canary``, providing the optional canary status of the upstream host.
+	// name should be specified as “envoy.lb“. An example boolean key-value pair
+	// is “canary“, providing the optional canary status of the upstream host.
 	// This may be matched against in a route's
 	// :ref:`RouteAction <envoy_v3_api_msg_config.route.v3.RouteAction>` metadata_match field
 	// to subset the endpoints considered in cluster load balancing.
@@ -307,11 +321,12 @@ type LocalityLbEndpoints struct {
 	Locality *v3.Locality `protobuf:"bytes,1,opt,name=locality,proto3" json:"locality,omitempty"`
 	// The group of endpoints belonging to the locality specified.
 	// [#comment:TODO(adisuissa): Once LEDS is implemented this field needs to be
-	// deprecated and replaced by ``load_balancer_endpoints``.]
+	// deprecated and replaced by “load_balancer_endpoints“.]
 	LbEndpoints []*LbEndpoint `protobuf:"bytes,2,rep,name=lb_endpoints,json=lbEndpoints,proto3" json:"lb_endpoints,omitempty"`
 	// [#not-implemented-hide:]
 	//
 	// Types that are assignable to LbConfig:
+	//
 	//	*LocalityLbEndpoints_LoadBalancerEndpoints
 	//	*LocalityLbEndpoints_LedsClusterLocalityConfig
 	LbConfig isLocalityLbEndpoints_LbConfig `protobuf_oneof:"lb_config"`
@@ -331,9 +346,9 @@ type LocalityLbEndpoints struct {
 	// default to the highest priority (0).
 	//
 	// Under usual circumstances, Envoy will only select endpoints for the highest
-	// priority (0). In the event all endpoints for a particular priority are
+	// priority (0). In the event that enough endpoints for a particular priority are
 	// unavailable/unhealthy, Envoy will fail over to selecting endpoints for the
-	// next highest priority group.
+	// next highest priority group. Read more at :ref:`priority levels <arch_overview_load_balancing_priority_levels>`.
 	//
 	// Priorities should range from 0 (highest) to N (lowest) without skipping.
 	Priority uint32 `protobuf:"varint,5,opt,name=priority,proto3" json:"priority,omitempty"`
@@ -440,7 +455,7 @@ type isLocalityLbEndpoints_LbConfig interface {
 
 type LocalityLbEndpoints_LoadBalancerEndpoints struct {
 	// The group of endpoints belonging to the locality.
-	// [#comment:TODO(adisuissa): Once LEDS is implemented the ``lb_endpoints`` field
+	// [#comment:TODO(adisuissa): Once LEDS is implemented the “lb_endpoints“ field
 	// needs to be deprecated.]
 	LoadBalancerEndpoints *LocalityLbEndpoints_LbEndpointList `protobuf:"bytes,7,opt,name=load_balancer_endpoints,json=loadBalancerEndpoints,proto3,oneof"`
 }
@@ -477,7 +492,7 @@ type Endpoint_HealthCheckConfig struct {
 	//
 	// .. attention::
 	//
-	//   The form of the health check host address is expected to be a direct IP address.
+	//	The form of the health check host address is expected to be a direct IP address.
 	Address *v3.Address `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"`
 	// Optional flag to control if perform active health check for this endpoint.
 	// Active health check is enabled by default if there is a health checker.
@@ -544,6 +559,54 @@ func (x *Endpoint_HealthCheckConfig) GetDisableActiveHealthCheck() bool {
 	return false
 }
 
+type Endpoint_AdditionalAddress struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Additional address that is associated with the endpoint.
+	Address *v3.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+}
+
+func (x *Endpoint_AdditionalAddress) Reset() {
+	*x = Endpoint_AdditionalAddress{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Endpoint_AdditionalAddress) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Endpoint_AdditionalAddress) ProtoMessage() {}
+
+func (x *Endpoint_AdditionalAddress) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Endpoint_AdditionalAddress.ProtoReflect.Descriptor instead.
+func (*Endpoint_AdditionalAddress) Descriptor() ([]byte, []int) {
+	return file_envoy_config_endpoint_v3_endpoint_components_proto_rawDescGZIP(), []int{0, 1}
+}
+
+func (x *Endpoint_AdditionalAddress) GetAddress() *v3.Address {
+	if x != nil {
+		return x.Address
+	}
+	return nil
+}
+
 // [#not-implemented-hide:]
 // A list of endpoints of a specific locality.
 type LocalityLbEndpoints_LbEndpointList struct {
@@ -557,7 +620,7 @@ type LocalityLbEndpoints_LbEndpointList struct {
 func (x *LocalityLbEndpoints_LbEndpointList) Reset() {
 	*x = LocalityLbEndpoints_LbEndpointList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[5]
+		mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -570,7 +633,7 @@ func (x *LocalityLbEndpoints_LbEndpointList) String() string {
 func (*LocalityLbEndpoints_LbEndpointList) ProtoMessage() {}
 
 func (x *LocalityLbEndpoints_LbEndpointList) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[5]
+	mi := &file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -618,7 +681,7 @@ var file_envoy_config_endpoint_v3_endpoint_components_proto_rawDesc = []byte{
 	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69,
 	0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
 	0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xf9, 0x03, 0x0a, 0x08, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37,
+	0x6f, 0x22, 0xb0, 0x05, 0x0a, 0x08, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x37,
 	0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
 	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x07,
@@ -630,117 +693,129 @@ var file_envoy_config_endpoint_v3_endpoint_components_proto_rawDesc = []byte{
 	0x68, 0x65, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x68, 0x65, 0x61, 0x6c,
 	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a,
 	0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x8a, 0x02, 0x0a, 0x11, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x28, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x2a, 0x04, 0x18, 0xff, 0xff, 0x03, 0x52, 0x09,
-	0x70, 0x6f, 0x72, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73,
-	0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73,
-	0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3d,
-	0x0a, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
-	0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x63, 0x74, 0x69,
-	0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x3a, 0x37, 0x9a,
-	0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65,
+	0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x67, 0x0a, 0x14, 0x61, 0x64, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e,
+	0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x41, 0x64, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x13, 0x61,
+	0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x65, 0x73, 0x1a, 0x8a, 0x02, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x28, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x09, 0xfa, 0x42,
+	0x06, 0x2a, 0x04, 0x18, 0xff, 0xff, 0x03, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37,
+	0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x07,
+	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x64, 0x69,
+	0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x22, 0x91, 0x03,
-	0x0a, 0x0a, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x40, 0x0a, 0x08,
-	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x48, 0x00, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x25,
-	0x0a, 0x0d, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x47, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3a,
-	0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x59, 0x0a, 0x15, 0x6c, 0x6f,
+	0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a,
+	0x4c, 0x0a, 0x11, 0x41, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x25, 0x9a,
+	0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x22, 0x91, 0x03, 0x0a, 0x0a, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x12, 0x40, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33,
+	0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x08, 0x65, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c,
+	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x47, 0x0a, 0x0d,
+	0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x12, 0x59, 0x0a, 0x15, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
+	0x69, 0x6e, 0x67, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x27, 0x9a, 0xc5,
+	0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x11, 0x0a, 0x0f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0x92, 0x01, 0x0a, 0x19, 0x4c, 0x65, 0x64,
+	0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x43, 0x0a, 0x0b, 0x6c, 0x65, 0x64, 0x73, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
+	0x0a, 0x6c, 0x65, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x6c,
+	0x65, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x65, 0x64, 0x73, 0x43,
+	0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xe1, 0x05,
+	0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x3a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4c,
+	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x12, 0x47, 0x0a, 0x0c, 0x6c, 0x62, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e,
+	0x76, 0x33, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x0b, 0x6c,
+	0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x76, 0x0a, 0x17, 0x6c, 0x6f,
+	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x64, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c,
+	0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x15, 0x6c, 0x6f, 0x61,
+	0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x12, 0x76, 0x0a, 0x1c, 0x6c, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x65, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c,
+	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52,
+	0x19, 0x6c, 0x65, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x61,
+	0x6c, 0x69, 0x74, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x15, 0x6c, 0x6f,
 	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x77, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
 	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01,
 	0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x57,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x11,
-	0x0a, 0x0f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x22, 0x92, 0x01, 0x0a, 0x19, 0x4c, 0x65, 0x64, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x43, 0x0a, 0x0b, 0x6c, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0a, 0x6c, 0x65, 0x64, 0x73, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6c,
-	0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x12, 0x6c, 0x65, 0x64, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xe1, 0x05, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x69, 0x74, 0x79, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x3a,
-	0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
-	0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x47, 0x0a, 0x0c, 0x6c, 0x62,
-	0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x62, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x0b, 0x6c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x12, 0x76, 0x0a, 0x17, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
-	0x6e, 0x63, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69,
-	0x73, 0x74, 0x48, 0x00, 0x52, 0x15, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x72, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x76, 0x0a, 0x1c, 0x6c,
-	0x65, 0x64, 0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61,
-	0x6c, 0x69, 0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x65, 0x64,
-	0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x19, 0x6c, 0x65, 0x64, 0x73, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x15, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
-	0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x42,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x24,
-	0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f,
-	0x72, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74,
-	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79,
-	0x1a, 0x59, 0x0a, 0x0e, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x47, 0x0a, 0x0c, 0x6c, 0x62, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x0b,
-	0x6c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3a, 0x30, 0x9a, 0xc5, 0x88,
-	0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x42, 0x0b, 0x0a,
-	0x09, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x97, 0x01, 0x0a, 0x26, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43,
-	0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76,
-	0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x24, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
+	0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0x80,
+	0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x09, 0x70,
+	0x72, 0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72,
+	0x6f, 0x78, 0x69, 0x6d, 0x69, 0x74, 0x79, 0x1a, 0x59, 0x0a, 0x0e, 0x4c, 0x62, 0x45, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x47, 0x0a, 0x0c, 0x6c, 0x62, 0x5f,
+	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65,
+	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x0b, 0x6c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x45, 0x6e, 0x64, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x73, 0x42, 0x0b, 0x0a, 0x09, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x42, 0x97, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f,
+	0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33,
+	0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -755,42 +830,45 @@ func file_envoy_config_endpoint_v3_endpoint_components_proto_rawDescGZIP() []byt
 	return file_envoy_config_endpoint_v3_endpoint_components_proto_rawDescData
 }
 
-var file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_envoy_config_endpoint_v3_endpoint_components_proto_goTypes = []interface{}{
 	(*Endpoint)(nil),                           // 0: envoy.config.endpoint.v3.Endpoint
 	(*LbEndpoint)(nil),                         // 1: envoy.config.endpoint.v3.LbEndpoint
 	(*LedsClusterLocalityConfig)(nil),          // 2: envoy.config.endpoint.v3.LedsClusterLocalityConfig
 	(*LocalityLbEndpoints)(nil),                // 3: envoy.config.endpoint.v3.LocalityLbEndpoints
 	(*Endpoint_HealthCheckConfig)(nil),         // 4: envoy.config.endpoint.v3.Endpoint.HealthCheckConfig
-	(*LocalityLbEndpoints_LbEndpointList)(nil), // 5: envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList
-	(*v3.Address)(nil),                         // 6: envoy.config.core.v3.Address
-	(v3.HealthStatus)(0),                       // 7: envoy.config.core.v3.HealthStatus
-	(*v3.Metadata)(nil),                        // 8: envoy.config.core.v3.Metadata
-	(*wrappers.UInt32Value)(nil),               // 9: google.protobuf.UInt32Value
-	(*v3.ConfigSource)(nil),                    // 10: envoy.config.core.v3.ConfigSource
-	(*v3.Locality)(nil),                        // 11: envoy.config.core.v3.Locality
+	(*Endpoint_AdditionalAddress)(nil),         // 5: envoy.config.endpoint.v3.Endpoint.AdditionalAddress
+	(*LocalityLbEndpoints_LbEndpointList)(nil), // 6: envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList
+	(*v3.Address)(nil),                         // 7: envoy.config.core.v3.Address
+	(v3.HealthStatus)(0),                       // 8: envoy.config.core.v3.HealthStatus
+	(*v3.Metadata)(nil),                        // 9: envoy.config.core.v3.Metadata
+	(*wrappers.UInt32Value)(nil),               // 10: google.protobuf.UInt32Value
+	(*v3.ConfigSource)(nil),                    // 11: envoy.config.core.v3.ConfigSource
+	(*v3.Locality)(nil),                        // 12: envoy.config.core.v3.Locality
 }
 var file_envoy_config_endpoint_v3_endpoint_components_proto_depIdxs = []int32{
-	6,  // 0: envoy.config.endpoint.v3.Endpoint.address:type_name -> envoy.config.core.v3.Address
+	7,  // 0: envoy.config.endpoint.v3.Endpoint.address:type_name -> envoy.config.core.v3.Address
 	4,  // 1: envoy.config.endpoint.v3.Endpoint.health_check_config:type_name -> envoy.config.endpoint.v3.Endpoint.HealthCheckConfig
-	0,  // 2: envoy.config.endpoint.v3.LbEndpoint.endpoint:type_name -> envoy.config.endpoint.v3.Endpoint
-	7,  // 3: envoy.config.endpoint.v3.LbEndpoint.health_status:type_name -> envoy.config.core.v3.HealthStatus
-	8,  // 4: envoy.config.endpoint.v3.LbEndpoint.metadata:type_name -> envoy.config.core.v3.Metadata
-	9,  // 5: envoy.config.endpoint.v3.LbEndpoint.load_balancing_weight:type_name -> google.protobuf.UInt32Value
-	10, // 6: envoy.config.endpoint.v3.LedsClusterLocalityConfig.leds_config:type_name -> envoy.config.core.v3.ConfigSource
-	11, // 7: envoy.config.endpoint.v3.LocalityLbEndpoints.locality:type_name -> envoy.config.core.v3.Locality
-	1,  // 8: envoy.config.endpoint.v3.LocalityLbEndpoints.lb_endpoints:type_name -> envoy.config.endpoint.v3.LbEndpoint
-	5,  // 9: envoy.config.endpoint.v3.LocalityLbEndpoints.load_balancer_endpoints:type_name -> envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList
-	2,  // 10: envoy.config.endpoint.v3.LocalityLbEndpoints.leds_cluster_locality_config:type_name -> envoy.config.endpoint.v3.LedsClusterLocalityConfig
-	9,  // 11: envoy.config.endpoint.v3.LocalityLbEndpoints.load_balancing_weight:type_name -> google.protobuf.UInt32Value
-	9,  // 12: envoy.config.endpoint.v3.LocalityLbEndpoints.proximity:type_name -> google.protobuf.UInt32Value
-	6,  // 13: envoy.config.endpoint.v3.Endpoint.HealthCheckConfig.address:type_name -> envoy.config.core.v3.Address
-	1,  // 14: envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList.lb_endpoints:type_name -> envoy.config.endpoint.v3.LbEndpoint
-	15, // [15:15] is the sub-list for method output_type
-	15, // [15:15] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
+	5,  // 2: envoy.config.endpoint.v3.Endpoint.additional_addresses:type_name -> envoy.config.endpoint.v3.Endpoint.AdditionalAddress
+	0,  // 3: envoy.config.endpoint.v3.LbEndpoint.endpoint:type_name -> envoy.config.endpoint.v3.Endpoint
+	8,  // 4: envoy.config.endpoint.v3.LbEndpoint.health_status:type_name -> envoy.config.core.v3.HealthStatus
+	9,  // 5: envoy.config.endpoint.v3.LbEndpoint.metadata:type_name -> envoy.config.core.v3.Metadata
+	10, // 6: envoy.config.endpoint.v3.LbEndpoint.load_balancing_weight:type_name -> google.protobuf.UInt32Value
+	11, // 7: envoy.config.endpoint.v3.LedsClusterLocalityConfig.leds_config:type_name -> envoy.config.core.v3.ConfigSource
+	12, // 8: envoy.config.endpoint.v3.LocalityLbEndpoints.locality:type_name -> envoy.config.core.v3.Locality
+	1,  // 9: envoy.config.endpoint.v3.LocalityLbEndpoints.lb_endpoints:type_name -> envoy.config.endpoint.v3.LbEndpoint
+	6,  // 10: envoy.config.endpoint.v3.LocalityLbEndpoints.load_balancer_endpoints:type_name -> envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList
+	2,  // 11: envoy.config.endpoint.v3.LocalityLbEndpoints.leds_cluster_locality_config:type_name -> envoy.config.endpoint.v3.LedsClusterLocalityConfig
+	10, // 12: envoy.config.endpoint.v3.LocalityLbEndpoints.load_balancing_weight:type_name -> google.protobuf.UInt32Value
+	10, // 13: envoy.config.endpoint.v3.LocalityLbEndpoints.proximity:type_name -> google.protobuf.UInt32Value
+	7,  // 14: envoy.config.endpoint.v3.Endpoint.HealthCheckConfig.address:type_name -> envoy.config.core.v3.Address
+	7,  // 15: envoy.config.endpoint.v3.Endpoint.AdditionalAddress.address:type_name -> envoy.config.core.v3.Address
+	1,  // 16: envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList.lb_endpoints:type_name -> envoy.config.endpoint.v3.LbEndpoint
+	17, // [17:17] is the sub-list for method output_type
+	17, // [17:17] is the sub-list for method input_type
+	17, // [17:17] is the sub-list for extension type_name
+	17, // [17:17] is the sub-list for extension extendee
+	0,  // [0:17] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_endpoint_v3_endpoint_components_proto_init() }
@@ -860,6 +938,18 @@ func file_envoy_config_endpoint_v3_endpoint_components_proto_init() {
 			}
 		}
 		file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Endpoint_AdditionalAddress); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_endpoint_v3_endpoint_components_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LocalityLbEndpoints_LbEndpointList); i {
 			case 0:
 				return &v.state
@@ -886,7 +976,7 @@ func file_envoy_config_endpoint_v3_endpoint_components_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_config_endpoint_v3_endpoint_components_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.validate.go
index e2162fbff6d..c668c86c7e3 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/endpoint_components.pb.validate.go
@@ -121,6 +121,40 @@ func (m *Endpoint) validate(all bool) error {
 
 	// no validation rules for Hostname
 
+	for idx, item := range m.GetAdditionalAddresses() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, EndpointValidationError{
+						field:  fmt.Sprintf("AdditionalAddresses[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, EndpointValidationError{
+						field:  fmt.Sprintf("AdditionalAddresses[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return EndpointValidationError{
+					field:  fmt.Sprintf("AdditionalAddresses[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
 	if len(errors) > 0 {
 		return EndpointMultiError(errors)
 	}
@@ -987,6 +1021,137 @@ var _ interface {
 	ErrorName() string
 } = Endpoint_HealthCheckConfigValidationError{}
 
+// Validate checks the field values on Endpoint_AdditionalAddress with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the first error encountered is returned, or nil if there are no violations.
+func (m *Endpoint_AdditionalAddress) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on Endpoint_AdditionalAddress with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the result is a list of violation errors wrapped in
+// Endpoint_AdditionalAddressMultiError, or nil if none found.
+func (m *Endpoint_AdditionalAddress) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *Endpoint_AdditionalAddress) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if all {
+		switch v := interface{}(m.GetAddress()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, Endpoint_AdditionalAddressValidationError{
+					field:  "Address",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, Endpoint_AdditionalAddressValidationError{
+					field:  "Address",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return Endpoint_AdditionalAddressValidationError{
+				field:  "Address",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if len(errors) > 0 {
+		return Endpoint_AdditionalAddressMultiError(errors)
+	}
+
+	return nil
+}
+
+// Endpoint_AdditionalAddressMultiError is an error wrapping multiple
+// validation errors returned by Endpoint_AdditionalAddress.ValidateAll() if
+// the designated constraints aren't met.
+type Endpoint_AdditionalAddressMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m Endpoint_AdditionalAddressMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m Endpoint_AdditionalAddressMultiError) AllErrors() []error { return m }
+
+// Endpoint_AdditionalAddressValidationError is the validation error returned
+// by Endpoint_AdditionalAddress.Validate if the designated constraints aren't met.
+type Endpoint_AdditionalAddressValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e Endpoint_AdditionalAddressValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e Endpoint_AdditionalAddressValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e Endpoint_AdditionalAddressValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e Endpoint_AdditionalAddressValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e Endpoint_AdditionalAddressValidationError) ErrorName() string {
+	return "Endpoint_AdditionalAddressValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e Endpoint_AdditionalAddressValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sEndpoint_AdditionalAddress.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = Endpoint_AdditionalAddressValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = Endpoint_AdditionalAddressValidationError{}
+
 // Validate checks the field values on LocalityLbEndpoints_LbEndpointList with
 // the rules defined in the proto definition for this message. If any rules
 // are violated, the first error encountered is returned, or nil if there are
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/load_report.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/load_report.pb.go
index c0aae02a493..0d9aa200eb6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/load_report.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3/load_report.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/endpoint/v3/load_report.proto
 
 package endpointv3
@@ -361,9 +361,9 @@ type ClusterStats struct {
 	// in the DropOverload policy.
 	DroppedRequests []*ClusterStats_DroppedRequests `protobuf:"bytes,5,rep,name=dropped_requests,json=droppedRequests,proto3" json:"dropped_requests,omitempty"`
 	// Period over which the actual load report occurred. This will be guaranteed to include every
-	// request reported. Due to system load and delays between the ``LoadStatsRequest`` sent from Envoy
-	// and the ``LoadStatsResponse`` message sent from the management server, this may be longer than
-	// the requested load reporting interval in the ``LoadStatsResponse``.
+	// request reported. Due to system load and delays between the “LoadStatsRequest“ sent from Envoy
+	// and the “LoadStatsResponse“ message sent from the management server, this may be longer than
+	// the requested load reporting interval in the “LoadStatsResponse“.
 	LoadReportInterval *duration.Duration `protobuf:"bytes,4,opt,name=load_report_interval,json=loadReportInterval,proto3" json:"load_report_interval,omitempty"`
 }
 
@@ -643,16 +643,16 @@ var file_envoy_config_endpoint_v3_load_report_proto_rawDesc = []byte{
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x65, 0x6e, 0x64,
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x42, 0x8f, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4c,
-	0x6f, 0x61, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76,
-	0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x73, 0x42, 0x8f, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x65, 0x6e,
+	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go
index 07274c40502..f7b09399ef5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/filter/accesslog/v2/accesslog.proto
 
 package accesslogv2
@@ -188,13 +188,19 @@ type AccessLog struct {
 	// configurations include:
 	//
 	// #. "envoy.access_loggers.file": :ref:`FileAccessLog
-	//    <envoy_api_msg_config.accesslog.v2.FileAccessLog>`
+	//
+	//	<envoy_api_msg_config.accesslog.v2.FileAccessLog>`
+	//
 	// #. "envoy.access_loggers.http_grpc": :ref:`HttpGrpcAccessLogConfig
-	//    <envoy_api_msg_config.accesslog.v2.HttpGrpcAccessLogConfig>`
+	//
+	//	<envoy_api_msg_config.accesslog.v2.HttpGrpcAccessLogConfig>`
+	//
 	// #. "envoy.access_loggers.tcp_grpc": :ref:`TcpGrpcAccessLogConfig
-	//    <envoy_api_msg_config.accesslog.v2.TcpGrpcAccessLogConfig>`
+	//
+	//	<envoy_api_msg_config.accesslog.v2.TcpGrpcAccessLogConfig>`
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*AccessLog_Config
 	//	*AccessLog_TypedConfig
 	ConfigType isAccessLog_ConfigType `protobuf_oneof:"config_type"`
@@ -253,7 +259,7 @@ func (m *AccessLog) GetConfigType() isAccessLog_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto.
 func (x *AccessLog) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*AccessLog_Config); ok {
 		return x.Config
@@ -273,7 +279,7 @@ type isAccessLog_ConfigType interface {
 }
 
 type AccessLog_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto.
 	Config *_struct.Struct `protobuf:"bytes,3,opt,name=config,proto3,oneof"`
 }
 
@@ -292,6 +298,7 @@ type AccessLogFilter struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to FilterSpecifier:
+	//
 	//	*AccessLogFilter_StatusCodeFilter
 	//	*AccessLogFilter_DurationFilter
 	//	*AccessLogFilter_NotHealthCheckFilter
@@ -1093,6 +1100,7 @@ type ExtensionFilter struct {
 	// Custom configuration that depends on the filter being instantiated.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*ExtensionFilter_Config
 	//	*ExtensionFilter_TypedConfig
 	ConfigType isExtensionFilter_ConfigType `protobuf_oneof:"config_type"`
@@ -1144,7 +1152,7 @@ func (m *ExtensionFilter) GetConfigType() isExtensionFilter_ConfigType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto.
 func (x *ExtensionFilter) GetConfig() *_struct.Struct {
 	if x, ok := x.GetConfigType().(*ExtensionFilter_Config); ok {
 		return x.Config
@@ -1164,7 +1172,7 @@ type isExtensionFilter_ConfigType interface {
 }
 
 type ExtensionFilter_Config struct {
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"`
 }
 
@@ -1388,19 +1396,19 @@ var file_envoy_config_filter_accesslog_v2_accesslog_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79,
 	0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0xc0, 0x01, 0x0a, 0x2e, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x41, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67,
-	0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1b, 0x12, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67,
-	0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0xc0, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x1b, 0x12, 0x19, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x2e, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f,
+	0x67, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x3b,
+	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v2/api_listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v2/api_listener.pb.go
index f7e80d739d0..431effa655c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v2/api_listener.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v2/api_listener.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v2/api_listener.proto
 
 package listenerv2
@@ -96,18 +96,18 @@ var file_envoy_config_listener_v2_api_listener_proto_rawDesc = []byte{
 	0x12, 0x37, 0x0a, 0x0c, 0x61, 0x70, 0x69, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x61, 0x70,
-	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0xb0, 0x01, 0x0a, 0x26, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x2e, 0x76, 0x32, 0x42, 0x10, 0x41, 0x70, 0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x76, 0x32, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72,
+	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0xb0, 0x01, 0xf2, 0x98, 0xfe, 0x8f,
+	0x05, 0x1a, 0x12, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x42, 0x10, 0x41, 0x70,
+	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76,
+	0x32, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/api_listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/api_listener.pb.go
index e01516c2e68..88a229220f5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/api_listener.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/api_listener.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v3/api_listener.proto
 
 package listenerv3
@@ -100,16 +100,16 @@ var file_envoy_config_listener_v3_api_listener_proto_rawDesc = []byte{
 	0x0b, 0x61, 0x70, 0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x3a, 0x2b, 0x9a, 0xc5,
 	0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70,
-	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x90, 0x01, 0x0a, 0x26, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x41, 0x70, 0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x90, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x41, 0x70,
+	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76,
+	0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.go
index ca07e648cbc..686820df248 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v3/listener.proto
 
 package listenerv3
@@ -144,7 +144,7 @@ func (x *AdditionalAddress) GetSocketOptions() *v3.SocketOptionsOverride {
 	return nil
 }
 
-// Listener list collections. Entries are ``Listener`` resources or references.
+// Listener list collections. Entries are “Listener“ resources or references.
 // [#not-implemented-hide:]
 type ListenerCollection struct {
 	state         protoimpl.MessageState
@@ -193,7 +193,7 @@ func (x *ListenerCollection) GetEntries() []*v31.CollectionEntry {
 	return nil
 }
 
-// [#next-free-field: 34]
+// [#next-free-field: 35]
 type Listener struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -206,15 +206,15 @@ type Listener struct {
 	// The address that the listener should listen on. In general, the address must be unique, though
 	// that is governed by the bind rules of the OS. E.g., multiple listeners can listen on port 0 on
 	// Linux as the actual port will be allocated by the OS.
-	// Required unless ``api_listener`` or ``listener_specifier`` is populated.
+	// Required unless “api_listener“ or “listener_specifier“ is populated.
 	Address *v3.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	// The additional addresses the listener should listen on. The addresses must be unique across all
 	// listeners. Multiple addresses with port 0 can be supplied. When using multiple addresses in a single listener,
 	// all addresses use the same protocol, and multiple internal addresses are not supported.
 	AdditionalAddresses []*AdditionalAddress `protobuf:"bytes,33,rep,name=additional_addresses,json=additionalAddresses,proto3" json:"additional_addresses,omitempty"`
 	// Optional prefix to use on listener stats. If empty, the stats will be rooted at
-	// ``listener.<address as string>.``. If non-empty, stats will be rooted at
-	// ``listener.<stat_prefix>.``.
+	// “listener.<address as string>.“. If non-empty, stats will be rooted at
+	// “listener.<stat_prefix>.“.
 	StatPrefix string `protobuf:"bytes,28,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 	// A list of filter chains to consider for this listener. The
 	// :ref:`FilterChain <envoy_v3_api_msg_config.listener.v3.FilterChain>` with the most specific
@@ -235,13 +235,13 @@ type Listener struct {
 	//
 	// .. note::
 	//
-	//  Once matched, each connection is permanently bound to its filter chain.
-	//  If the matcher changes but the filter chain remains the same, the
-	//  connections bound to the filter chain are not drained. If, however, the
-	//  filter chain is removed or structurally modified, then the drain for its
-	//  connections is initiated.
+	//	Once matched, each connection is permanently bound to its filter chain.
+	//	If the matcher changes but the filter chain remains the same, the
+	//	connections bound to the filter chain are not drained. If, however, the
+	//	filter chain is removed or structurally modified, then the drain for its
+	//	connections is initiated.
 	FilterChainMatcher *v32.Matcher `protobuf:"bytes,32,opt,name=filter_chain_matcher,json=filterChainMatcher,proto3" json:"filter_chain_matcher,omitempty"`
-	// If a connection is redirected using ``iptables``, the port on which the proxy
+	// If a connection is redirected using “iptables“, the port on which the proxy
 	// receives it might be different from the original destination address. When this flag is set to
 	// true, the listener hands off redirected connections to the listener associated with the
 	// original destination address. If there is no listener associated with the original destination
@@ -257,7 +257,7 @@ type Listener struct {
 	Metadata *v3.Metadata `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener.proto.
 	DeprecatedV1 *Listener_DeprecatedV1 `protobuf:"bytes,7,opt,name=deprecated_v1,json=deprecatedV1,proto3" json:"deprecated_v1,omitempty"`
 	// The type of draining to perform at a listener-wide level.
 	DrainType Listener_DrainType `protobuf:"varint,8,opt,name=drain_type,json=drainType,proto3,enum=envoy.config.listener.v3.Listener_DrainType" json:"drain_type,omitempty"`
@@ -268,47 +268,52 @@ type Listener struct {
 	// before a connection is created.
 	// UDP Listener filters can be specified when the protocol in the listener socket address in
 	// :ref:`protocol <envoy_v3_api_field_config.core.v3.SocketAddress.protocol>` is :ref:`UDP
-	// <envoy_v3_api_enum_value_config.core.v3.SocketAddress.Protocol.UDP>`.
+	// <envoy_v3_api_enum_value_config.core.v3.SocketAddress.Protocol.UDP>` and no
+	// :ref:`quic_options <envoy_v3_api_field_config.listener.v3.UdpListenerConfig.quic_options>` is specified in :ref:`udp_listener_config <envoy_v3_api_field_config.listener.v3.Listener.udp_listener_config>`.
+	// QUIC listener filters can be specified when :ref:`quic_options
+	// <envoy_v3_api_field_config.listener.v3.UdpListenerConfig.quic_options>` is
+	// specified in :ref:`udp_listener_config <envoy_v3_api_field_config.listener.v3.Listener.udp_listener_config>`.
+	// They are processed sequentially right before connection creation. And like TCP Listener filters, they can be used to manipulate the connection metadata and socket. But the difference is that they can't be used to pause connection creation.
 	ListenerFilters []*ListenerFilter `protobuf:"bytes,9,rep,name=listener_filters,json=listenerFilters,proto3" json:"listener_filters,omitempty"`
 	// The timeout to wait for all listener filters to complete operation. If the timeout is reached,
 	// the accepted socket is closed without a connection being created unless
-	// ``continue_on_listener_filters_timeout`` is set to true. Specify 0 to disable the
+	// “continue_on_listener_filters_timeout“ is set to true. Specify 0 to disable the
 	// timeout. If not specified, a default timeout of 15s is used.
 	ListenerFiltersTimeout *duration.Duration `protobuf:"bytes,15,opt,name=listener_filters_timeout,json=listenerFiltersTimeout,proto3" json:"listener_filters_timeout,omitempty"`
 	// Whether a connection should be created when listener filters timeout. Default is false.
 	//
 	// .. attention::
 	//
-	//   Some listener filters, such as :ref:`Proxy Protocol filter
-	//   <config_listener_filters_proxy_protocol>`, should not be used with this option. It will cause
-	//   unexpected behavior when a connection is created.
+	//	Some listener filters, such as :ref:`Proxy Protocol filter
+	//	<config_listener_filters_proxy_protocol>`, should not be used with this option. It will cause
+	//	unexpected behavior when a connection is created.
 	ContinueOnListenerFiltersTimeout bool `protobuf:"varint,17,opt,name=continue_on_listener_filters_timeout,json=continueOnListenerFiltersTimeout,proto3" json:"continue_on_listener_filters_timeout,omitempty"`
 	// Whether the listener should be set as a transparent socket.
 	// When this flag is set to true, connections can be redirected to the listener using an
-	// ``iptables`` ``TPROXY`` target, in which case the original source and destination addresses and
+	// “iptables“ “TPROXY“ target, in which case the original source and destination addresses and
 	// ports are preserved on accepted connections. This flag should be used in combination with
 	// :ref:`an original_dst <config_listener_filters_original_dst>` :ref:`listener filter
 	// <envoy_v3_api_field_config.listener.v3.Listener.listener_filters>` to mark the connections' local addresses as
 	// "restored." This can be used to hand off each redirected connection to another listener
 	// associated with the connection's destination address. Direct connections to the socket without
-	// using ``TPROXY`` cannot be distinguished from connections redirected using ``TPROXY`` and are
+	// using “TPROXY“ cannot be distinguished from connections redirected using “TPROXY“ and are
 	// therefore treated as if they were redirected.
 	// When this flag is set to false, the listener's socket is explicitly reset as non-transparent.
-	// Setting this flag requires Envoy to run with the ``CAP_NET_ADMIN`` capability.
+	// Setting this flag requires Envoy to run with the “CAP_NET_ADMIN“ capability.
 	// When this flag is not set (default), the socket is not modified, i.e. the transparent option
 	// is neither set nor reset.
 	Transparent *wrappers.BoolValue `protobuf:"bytes,10,opt,name=transparent,proto3" json:"transparent,omitempty"`
-	// Whether the listener should set the ``IP_FREEBIND`` socket option. When this
+	// Whether the listener should set the “IP_FREEBIND“ socket option. When this
 	// flag is set to true, listeners can be bound to an IP address that is not
 	// configured on the system running Envoy. When this flag is set to false, the
-	// option ``IP_FREEBIND`` is disabled on the socket. When this flag is not set
+	// option “IP_FREEBIND“ is disabled on the socket. When this flag is not set
 	// (default), the socket is not modified, i.e. the option is neither enabled
 	// nor disabled.
 	Freebind *wrappers.BoolValue `protobuf:"bytes,11,opt,name=freebind,proto3" json:"freebind,omitempty"`
 	// Additional socket options that may not be present in Envoy source code or
 	// precompiled binaries. The socket options can be updated for a listener when
 	// :ref:`enable_reuse_port <envoy_v3_api_field_config.listener.v3.Listener.enable_reuse_port>`
-	// is `true`. Otherwise, if socket options change during a listener update the update will be rejected
+	// is “true“. Otherwise, if socket options change during a listener update the update will be rejected
 	// to make it clear that the options were not updated.
 	SocketOptions []*v3.SocketOption `protobuf:"bytes,13,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"`
 	// Whether the listener should accept TCP Fast Open (TFO) connections.
@@ -342,8 +347,8 @@ type Listener struct {
 	//
 	// .. note::
 	//
-	//  Currently only one ApiListener can be installed; and it can only be done via bootstrap config,
-	//  not LDS.
+	//	Currently only one ApiListener can be installed; and it can only be done via bootstrap config,
+	//	not LDS.
 	//
 	// [#next-major-version: In the v3 API, instead of this messy approach where the socket
 	// listener fields are directly in the top-level Listener message and the API listener types
@@ -362,32 +367,32 @@ type Listener struct {
 	// it is recommended to disable the balance config in listener X to avoid the cost of balancing, and
 	// enable the balance config in Y1 and Y2 to balance the connections among the workers.
 	ConnectionBalanceConfig *Listener_ConnectionBalanceConfig `protobuf:"bytes,20,opt,name=connection_balance_config,json=connectionBalanceConfig,proto3" json:"connection_balance_config,omitempty"`
-	// Deprecated. Use ``enable_reuse_port`` instead.
+	// Deprecated. Use “enable_reuse_port“ instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener.proto.
 	ReusePort bool `protobuf:"varint,21,opt,name=reuse_port,json=reusePort,proto3" json:"reuse_port,omitempty"`
-	// When this flag is set to true, listeners set the ``SO_REUSEPORT`` socket option and
+	// When this flag is set to true, listeners set the “SO_REUSEPORT“ socket option and
 	// create one socket for each worker thread. This makes inbound connections
 	// distribute among worker threads roughly evenly in cases where there are a high number
 	// of connections. When this flag is set to false, all worker threads share one socket. This field
 	// defaults to true. The change of field will be rejected during an listener update when the
-	// runtime flag ``envoy.reloadable_features.enable_update_listener_socket_options`` is enabled.
+	// runtime flag “envoy.reloadable_features.enable_update_listener_socket_options“ is enabled.
 	// Otherwise, the update of this field will be ignored quietly.
 	//
 	// .. attention::
 	//
-	//   Although this field defaults to true, it has different behavior on different platforms. See
-	//   the following text for more information.
+	//	Although this field defaults to true, it has different behavior on different platforms. See
+	//	the following text for more information.
 	//
-	// * On Linux, reuse_port is respected for both TCP and UDP listeners. It also works correctly
-	//   with hot restart.
-	// * On macOS, reuse_port for TCP does not do what it does on Linux. Instead of load balancing,
-	//   the last socket wins and receives all connections/packets. For TCP, reuse_port is force
-	//   disabled and the user is warned. For UDP, it is enabled, but only one worker will receive
-	//   packets. For QUIC/H3, SW routing will send packets to other workers. For "raw" UDP, only
-	//   a single worker will currently receive packets.
-	// * On Windows, reuse_port for TCP has undefined behavior. It is force disabled and the user
-	//   is warned similar to macOS. It is left enabled for UDP with undefined behavior currently.
+	//   - On Linux, reuse_port is respected for both TCP and UDP listeners. It also works correctly
+	//     with hot restart.
+	//   - On macOS, reuse_port for TCP does not do what it does on Linux. Instead of load balancing,
+	//     the last socket wins and receives all connections/packets. For TCP, reuse_port is force
+	//     disabled and the user is warned. For UDP, it is enabled, but only one worker will receive
+	//     packets. For QUIC/H3, SW routing will send packets to other workers. For "raw" UDP, only
+	//     a single worker will currently receive packets.
+	//   - On Windows, reuse_port for TCP has undefined behavior. It is force disabled and the user
+	//     is warned similar to macOS. It is left enabled for UDP with undefined behavior currently.
 	EnableReusePort *wrappers.BoolValue `protobuf:"bytes,29,opt,name=enable_reuse_port,json=enableReusePort,proto3" json:"enable_reuse_port,omitempty"`
 	// Configuration for :ref:`access logs <arch_overview_access_logs>`
 	// emitted by this listener.
@@ -395,6 +400,15 @@ type Listener struct {
 	// The maximum length a tcp listener's pending connections queue can grow to. If no value is
 	// provided net.core.somaxconn will be used on Linux and 128 otherwise.
 	TcpBacklogSize *wrappers.UInt32Value `protobuf:"bytes,24,opt,name=tcp_backlog_size,json=tcpBacklogSize,proto3" json:"tcp_backlog_size,omitempty"`
+	// The maximum number of connections to accept from the kernel per socket
+	// event. Envoy may decide to close these connections after accepting them
+	// from the kernel e.g. due to load shedding, or other policies.
+	// If there are more than max_connections_to_accept_per_socket_event
+	// connections pending accept, connections over this threshold will be
+	// accepted in later event loop iterations.
+	// If no value is provided Envoy will accept all connections pending accept
+	// from the kernel.
+	MaxConnectionsToAcceptPerSocketEvent *wrappers.UInt32Value `protobuf:"bytes,34,opt,name=max_connections_to_accept_per_socket_event,json=maxConnectionsToAcceptPerSocketEvent,proto3" json:"max_connections_to_accept_per_socket_event,omitempty"`
 	// Whether the listener should bind to the port. A listener that doesn't
 	// bind can only receive connections redirected from other listeners that set
 	// :ref:`use_original_dst <envoy_v3_api_field_config.listener.v3.Listener.use_original_dst>`
@@ -403,6 +417,7 @@ type Listener struct {
 	// The exclusive listener type and the corresponding config.
 	//
 	// Types that are assignable to ListenerSpecifier:
+	//
 	//	*Listener_InternalListener
 	ListenerSpecifier isListener_ListenerSpecifier `protobuf_oneof:"listener_specifier"`
 	// Enable MPTCP (multi-path TCP) on this listener. Clients will be allowed to establish
@@ -515,7 +530,7 @@ func (x *Listener) GetMetadata() *v3.Metadata {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener.proto.
 func (x *Listener) GetDeprecatedV1() *Listener_DeprecatedV1 {
 	if x != nil {
 		return x.DeprecatedV1
@@ -607,7 +622,7 @@ func (x *Listener) GetConnectionBalanceConfig() *Listener_ConnectionBalanceConfi
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener.proto.
 func (x *Listener) GetReusePort() bool {
 	if x != nil {
 		return x.ReusePort
@@ -636,6 +651,13 @@ func (x *Listener) GetTcpBacklogSize() *wrappers.UInt32Value {
 	return nil
 }
 
+func (x *Listener) GetMaxConnectionsToAcceptPerSocketEvent() *wrappers.UInt32Value {
+	if x != nil {
+		return x.MaxConnectionsToAcceptPerSocketEvent
+	}
+	return nil
+}
+
 func (x *Listener) GetBindToPort() *wrappers.BoolValue {
 	if x != nil {
 		return x.BindToPort
@@ -685,11 +707,11 @@ type Listener_InternalListener struct {
 	//
 	// There are some limitations that are derived from the implementation. The known limitations include:
 	//
-	// * :ref:`ConnectionBalanceConfig <envoy_v3_api_msg_config.listener.v3.Listener.ConnectionBalanceConfig>` is not
-	//   allowed because both the cluster connection and the listener connection must be owned by the same dispatcher.
-	// * :ref:`tcp_backlog_size <envoy_v3_api_field_config.listener.v3.Listener.tcp_backlog_size>`
-	// * :ref:`freebind <envoy_v3_api_field_config.listener.v3.Listener.freebind>`
-	// * :ref:`transparent <envoy_v3_api_field_config.listener.v3.Listener.transparent>`
+	//   - :ref:`ConnectionBalanceConfig <envoy_v3_api_msg_config.listener.v3.Listener.ConnectionBalanceConfig>` is not
+	//     allowed because both the cluster connection and the listener connection must be owned by the same dispatcher.
+	//   - :ref:`tcp_backlog_size <envoy_v3_api_field_config.listener.v3.Listener.tcp_backlog_size>`
+	//   - :ref:`freebind <envoy_v3_api_field_config.listener.v3.Listener.freebind>`
+	//   - :ref:`transparent <envoy_v3_api_field_config.listener.v3.Listener.transparent>`
 	InternalListener *Listener_InternalListenerConfig `protobuf:"bytes,27,opt,name=internal_listener,json=internalListener,proto3,oneof"`
 }
 
@@ -879,6 +901,7 @@ type Listener_ConnectionBalanceConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to BalanceType:
+	//
 	//	*Listener_ConnectionBalanceConfig_ExactBalance_
 	//	*Listener_ConnectionBalanceConfig_ExtendBalance
 	BalanceType isListener_ConnectionBalanceConfig_BalanceType `protobuf_oneof:"balance_type"`
@@ -947,7 +970,7 @@ type Listener_ConnectionBalanceConfig_ExactBalance_ struct {
 }
 
 type Listener_ConnectionBalanceConfig_ExtendBalance struct {
-	// The listener will use the connection balancer according to ``type_url``. If ``type_url`` is invalid,
+	// The listener will use the connection balancer according to “type_url“. If “type_url“ is invalid,
 	// Envoy will not attempt to balance active connections between worker threads.
 	// [#extension-category: envoy.network.connection_balance]
 	ExtendBalance *v3.TypedExtensionConfig `protobuf:"bytes,2,opt,name=extend_balance,json=extendBalance,proto3,oneof"`
@@ -1106,7 +1129,7 @@ var file_envoy_config_listener_v3_listener_proto_rawDesc = []byte{
 	0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x78, 0x64,
 	0x73, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
 	0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69,
-	0x65, 0x73, 0x22, 0x85, 0x17, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12,
+	0x65, 0x73, 0x22, 0x86, 0x18, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12,
 	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
 	0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
@@ -1155,8 +1178,8 @@ var file_envoy_config_listener_v3_listener_proto_rawDesc = []byte{
 	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76,
 	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x72, 0x65,
-	0x63, 0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04,
-	0x03, 0x33, 0x2e, 0x30, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x63, 0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
+	0x2e, 0x30, 0x18, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
 	0x56, 0x31, 0x12, 0x4b, 0x0a, 0x0a, 0x64, 0x72, 0x61, 0x69, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65,
 	0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76,
@@ -1219,8 +1242,8 @@ var file_envoy_config_listener_v3_listener_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
 	0x17, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e,
 	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2a, 0x0a, 0x0a, 0x72, 0x65, 0x75, 0x73,
-	0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x09, 0x72, 0x65, 0x75, 0x73, 0x65,
+	0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x09, 0x72, 0x65, 0x75, 0x73, 0x65,
 	0x50, 0x6f, 0x72, 0x74, 0x12, 0x46, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72,
 	0x65, 0x75, 0x73, 0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
@@ -1234,77 +1257,85 @@ var file_envoy_config_listener_v3_listener_proto_rawDesc = []byte{
 	0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
 	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x74, 0x63, 0x70, 0x42, 0x61,
-	0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x3c, 0x0a, 0x0c, 0x62, 0x69, 0x6e,
-	0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x62, 0x69, 0x6e,
-	0x64, 0x54, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x68, 0x0a, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x18, 0x1b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52,
-	0x10, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x70, 0x74, 0x63,
-	0x70, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d,
-	0x70, 0x74, 0x63, 0x70, 0x12, 0x37, 0x0a, 0x18, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x67,
-	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x47, 0x6c,
-	0x6f, 0x62, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x77, 0x0a,
-	0x0c, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x12, 0x3c, 0x0a,
-	0x0c, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x0a, 0x62, 0x69, 0x6e, 0x64, 0x54, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x3a, 0x29, 0x9a, 0xc5, 0x88,
-	0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x1a, 0xfc, 0x02, 0x0a, 0x17, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x6e, 0x0a, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x62, 0x61, 0x6c, 0x61,
-	0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x7f, 0x0a, 0x2a, 0x6d, 0x61, 0x78,
+	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f,
+	0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65,
+	0x74, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x2a, 0x02, 0x20, 0x00, 0x52, 0x24, 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x50, 0x65, 0x72, 0x53,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x62, 0x69,
+	0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x62, 0x69,
+	0x6e, 0x64, 0x54, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x68, 0x0a, 0x11, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x18, 0x1b, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00,
+	0x52, 0x10, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e,
+	0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x70, 0x74,
+	0x63, 0x70, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x4d, 0x70, 0x74, 0x63, 0x70, 0x12, 0x37, 0x0a, 0x18, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f,
+	0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x6c, 0x69, 0x6d, 0x69,
+	0x74, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x47,
+	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x77,
+	0x0a, 0x0c, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x12, 0x3c,
+	0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x0a, 0x62, 0x69, 0x6e, 0x64, 0x54, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x3a, 0x29, 0x9a, 0xc5,
+	0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x72, 0x65,
+	0x63, 0x61, 0x74, 0x65, 0x64, 0x56, 0x31, 0x1a, 0xfc, 0x02, 0x0a, 0x17, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x62, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45, 0x78, 0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x65, 0x78, 0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x62, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0d, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x1a, 0x51, 0x0a, 0x0c, 0x45, 0x78, 0x61, 0x63,
+	0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x41, 0x9a, 0xc5, 0x88, 0x1e, 0x3c, 0x0a,
+	0x3a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45,
+	0x78, 0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x34, 0x9a, 0xc5, 0x88,
+	0x1e, 0x2f, 0x0a, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x42, 0x13, 0x0a, 0x0c, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0x18, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x22, 0x29, 0x0a, 0x09, 0x44, 0x72, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a,
+	0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x4f,
+	0x44, 0x49, 0x46, 0x59, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x3a, 0x1c, 0x9a, 0xc5, 0x88,
+	0x1e, 0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x12, 0x6c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a,
+	0x04, 0x08, 0x0e, 0x10, 0x0f, 0x4a, 0x04, 0x08, 0x17, 0x10, 0x18, 0x22, 0x11, 0x0a, 0x0f, 0x4c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x22, 0x1b,
+	0x0a, 0x19, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x22, 0x14, 0x0a, 0x12, 0x41,
+	0x70, 0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x42, 0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45, 0x78, 0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e,
-	0x63, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x65, 0x78, 0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e,
-	0x63, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x62, 0x61, 0x6c,
-	0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0d, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64,
-	0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x1a, 0x51, 0x0a, 0x0c, 0x45, 0x78, 0x61, 0x63, 0x74,
-	0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x41, 0x9a, 0xc5, 0x88, 0x1e, 0x3c, 0x0a, 0x3a,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45, 0x78,
-	0x61, 0x63, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x34, 0x9a, 0xc5, 0x88, 0x1e,
-	0x2f, 0x0a, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x42, 0x13, 0x0a, 0x0c, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0x18, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22,
-	0x29, 0x0a, 0x09, 0x44, 0x72, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07,
-	0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x4f, 0x44,
-	0x49, 0x46, 0x59, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e,
-	0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x12, 0x6c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04,
-	0x08, 0x0e, 0x10, 0x0f, 0x4a, 0x04, 0x08, 0x17, 0x10, 0x18, 0x22, 0x11, 0x0a, 0x0f, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x22, 0x1b, 0x0a,
-	0x19, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x22, 0x14, 0x0a, 0x12, 0x41, 0x70,
-	0x69, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
-	0x42, 0x8d, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1377,16 +1408,17 @@ var file_envoy_config_listener_v3_listener_proto_depIdxs = []int32{
 	16, // 23: envoy.config.listener.v3.Listener.enable_reuse_port:type_name -> google.protobuf.BoolValue
 	25, // 24: envoy.config.listener.v3.Listener.access_log:type_name -> envoy.config.accesslog.v3.AccessLog
 	17, // 25: envoy.config.listener.v3.Listener.tcp_backlog_size:type_name -> google.protobuf.UInt32Value
-	16, // 26: envoy.config.listener.v3.Listener.bind_to_port:type_name -> google.protobuf.BoolValue
-	9,  // 27: envoy.config.listener.v3.Listener.internal_listener:type_name -> envoy.config.listener.v3.Listener.InternalListenerConfig
-	16, // 28: envoy.config.listener.v3.Listener.DeprecatedV1.bind_to_port:type_name -> google.protobuf.BoolValue
-	10, // 29: envoy.config.listener.v3.Listener.ConnectionBalanceConfig.exact_balance:type_name -> envoy.config.listener.v3.Listener.ConnectionBalanceConfig.ExactBalance
-	26, // 30: envoy.config.listener.v3.Listener.ConnectionBalanceConfig.extend_balance:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	31, // [31:31] is the sub-list for method output_type
-	31, // [31:31] is the sub-list for method input_type
-	31, // [31:31] is the sub-list for extension type_name
-	31, // [31:31] is the sub-list for extension extendee
-	0,  // [0:31] is the sub-list for field type_name
+	17, // 26: envoy.config.listener.v3.Listener.max_connections_to_accept_per_socket_event:type_name -> google.protobuf.UInt32Value
+	16, // 27: envoy.config.listener.v3.Listener.bind_to_port:type_name -> google.protobuf.BoolValue
+	9,  // 28: envoy.config.listener.v3.Listener.internal_listener:type_name -> envoy.config.listener.v3.Listener.InternalListenerConfig
+	16, // 29: envoy.config.listener.v3.Listener.DeprecatedV1.bind_to_port:type_name -> google.protobuf.BoolValue
+	10, // 30: envoy.config.listener.v3.Listener.ConnectionBalanceConfig.exact_balance:type_name -> envoy.config.listener.v3.Listener.ConnectionBalanceConfig.ExactBalance
+	26, // 31: envoy.config.listener.v3.Listener.ConnectionBalanceConfig.extend_balance:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	32, // [32:32] is the sub-list for method output_type
+	32, // [32:32] is the sub-list for method input_type
+	32, // [32:32] is the sub-list for extension type_name
+	32, // [32:32] is the sub-list for extension extendee
+	0,  // [0:32] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_listener_v3_listener_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.validate.go
index 6550642a177..a7cfd8f6633 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener.pb.validate.go
@@ -1003,6 +1003,21 @@ func (m *Listener) validate(all bool) error {
 		}
 	}
 
+	if wrapper := m.GetMaxConnectionsToAcceptPerSocketEvent(); wrapper != nil {
+
+		if wrapper.GetValue() <= 0 {
+			err := ListenerValidationError{
+				field:  "MaxConnectionsToAcceptPerSocketEvent",
+				reason: "value must be greater than 0",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+
+	}
+
 	if all {
 		switch v := interface{}(m.GetBindToPort()).(type) {
 		case interface{ ValidateAll() error }:
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener_components.pb.go
index 413254a43dd..9b9efeb8ec0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/listener_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v3/listener_components.proto
 
 package listenerv3
@@ -89,6 +89,7 @@ type Filter struct {
 	// The name of the filter configuration.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*Filter_TypedConfig
 	//	*Filter_ConfigDiscovery
 	ConfigType isFilter_ConfigType `protobuf_oneof:"config_type"`
@@ -169,7 +170,6 @@ type Filter_ConfigDiscovery struct {
 	// Configuration source specifier for an extension configuration discovery
 	// service. In case of a failure and without the default configuration, the
 	// listener closes the connections.
-	// [#not-implemented-hide:]
 	ConfigDiscovery *v3.ExtensionConfigSource `protobuf:"bytes,5,opt,name=config_discovery,json=configDiscovery,proto3,oneof"`
 }
 
@@ -186,23 +186,23 @@ func (*Filter_ConfigDiscovery) isFilter_ConfigType() {}
 //
 // The following order applies:
 //
-// 1. Destination port.
-// 2. Destination IP address.
-// 3. Server name (e.g. SNI for TLS protocol),
-// 4. Transport protocol.
-// 5. Application protocols (e.g. ALPN for TLS protocol).
-// 6. Directly connected source IP address (this will only be different from the source IP address
-//    when using a listener filter that overrides the source address, such as the :ref:`Proxy Protocol
-//    listener filter <config_listener_filters_proxy_protocol>`).
-// 7. Source type (e.g. any, local or external network).
-// 8. Source IP address.
-// 9. Source port.
+//  1. Destination port.
+//  2. Destination IP address.
+//  3. Server name (e.g. SNI for TLS protocol),
+//  4. Transport protocol.
+//  5. Application protocols (e.g. ALPN for TLS protocol).
+//  6. Directly connected source IP address (this will only be different from the source IP address
+//     when using a listener filter that overrides the source address, such as the :ref:`Proxy Protocol
+//     listener filter <config_listener_filters_proxy_protocol>`).
+//  7. Source type (e.g. any, local or external network).
+//  8. Source IP address.
+//  9. Source port.
 //
 // For criteria that allow ranges or wildcards, the most specific value in any
 // of the configured filter chains that matches the incoming connection is going
-// to be used (e.g. for SNI ``www.example.com`` the most specific match would be
-// ``www.example.com``, then ``*.example.com``, then ``*.com``, then any filter
-// chain without ``server_names`` requirements).
+// to be used (e.g. for SNI “www.example.com“ the most specific match would be
+// “www.example.com“, then “*.example.com“, then “*.com“, then any filter
+// chain without “server_names“ requirements).
 //
 // A different way to reason about the filter chain matches:
 // Suppose there exists N filter chains. Prune the filter chain set using the above 8 steps.
@@ -257,16 +257,16 @@ type FilterChainMatch struct {
 	// a filter chain match. Those values will be compared against the server names of a new
 	// connection, when detected by one of the listener filters.
 	//
-	// The server name will be matched against all wildcard domains, i.e. ``www.example.com``
-	// will be first matched against ``www.example.com``, then ``*.example.com``, then ``*.com``.
+	// The server name will be matched against all wildcard domains, i.e. “www.example.com“
+	// will be first matched against “www.example.com“, then “*.example.com“, then “*.com“.
 	//
-	// Note that partial wildcards are not supported, and values like ``*w.example.com`` are invalid.
-	// The value ``*`` is also not supported, and ``server_names`` should be omitted instead.
+	// Note that partial wildcards are not supported, and values like “*w.example.com“ are invalid.
+	// The value “*“ is also not supported, and “server_names“ should be omitted instead.
 	//
 	// .. attention::
 	//
-	//   See the :ref:`FAQ entry <faq_how_to_setup_sni>` on how to configure SNI for more
-	//   information.
+	//	See the :ref:`FAQ entry <faq_how_to_setup_sni>` on how to configure SNI for more
+	//	information.
 	ServerNames []string `protobuf:"bytes,11,rep,name=server_names,json=serverNames,proto3" json:"server_names,omitempty"`
 	// If non-empty, a transport protocol to consider when determining a filter chain match.
 	// This value will be compared against the transport protocol of a new connection, when
@@ -274,9 +274,9 @@ type FilterChainMatch struct {
 	//
 	// Suggested values include:
 	//
-	// * ``raw_buffer`` - default, used when no transport protocol is detected,
-	// * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
-	//   when TLS protocol is detected.
+	//   - “raw_buffer“ - default, used when no transport protocol is detected,
+	//   - “tls“ - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
+	//     when TLS protocol is detected.
 	TransportProtocol string `protobuf:"bytes,9,opt,name=transport_protocol,json=transportProtocol,proto3" json:"transport_protocol,omitempty"`
 	// If non-empty, a list of application protocols (e.g. ALPN for TLS protocol) to consider when
 	// determining a filter chain match. Those values will be compared against the application
@@ -284,19 +284,19 @@ type FilterChainMatch struct {
 	//
 	// Suggested values include:
 	//
-	// * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector
-	//   <config_listener_filters_tls_inspector>`,
-	// * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
+	//   - “http/1.1“ - set by :ref:`envoy.filters.listener.tls_inspector
+	//     <config_listener_filters_tls_inspector>`,
+	//   - “h2“ - set by :ref:`envoy.filters.listener.tls_inspector <config_listener_filters_tls_inspector>`
 	//
 	// .. attention::
 	//
-	//   Currently, only :ref:`TLS Inspector <config_listener_filters_tls_inspector>` provides
-	//   application protocol detection based on the requested
-	//   `ALPN <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_ values.
+	//	Currently, only :ref:`TLS Inspector <config_listener_filters_tls_inspector>` provides
+	//	application protocol detection based on the requested
+	//	`ALPN <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_ values.
 	//
-	//   However, the use of ALPN is pretty much limited to the HTTP/2 traffic on the Internet,
-	//   and matching on values other than ``h2`` is going to lead to a lot of false negatives,
-	//   unless all connecting clients are known to use ALPN.
+	//	However, the use of ALPN is pretty much limited to the HTTP/2 traffic on the Internet,
+	//	and matching on values other than ``h2`` is going to lead to a lot of false negatives,
+	//	unless all connecting clients are known to use ALPN.
 	ApplicationProtocols []string `protobuf:"bytes,10,rep,name=application_protocols,json=applicationProtocols,proto3" json:"application_protocols,omitempty"`
 }
 
@@ -441,13 +441,13 @@ type FilterChain struct {
 	// :ref:`PROXY protocol listener filter <config_listener_filters_proxy_protocol>`
 	// explicitly instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener_components.proto.
 	UseProxyProto *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"`
 	// [#not-implemented-hide:] filter chain metadata.
 	Metadata *v3.Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// Optional custom transport socket implementation to use for downstream connections.
-	// To setup TLS, set a transport socket with name ``envoy.transport_sockets.tls`` and
-	// :ref:`DownstreamTlsContext <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.DownstreamTlsContext>` in the ``typed_config``.
+	// To setup TLS, set a transport socket with name “envoy.transport_sockets.tls“ and
+	// :ref:`DownstreamTlsContext <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.DownstreamTlsContext>` in the “typed_config“.
 	// If no transport socket configuration is specified, new connections
 	// will be set up with plaintext.
 	// [#extension-category: envoy.transport_sockets.downstream]
@@ -513,7 +513,7 @@ func (x *FilterChain) GetFilters() []*Filter {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/listener/v3/listener_components.proto.
 func (x *FilterChain) GetUseProxyProto() *wrappers.BoolValue {
 	if x != nil {
 		return x.UseProxyProto
@@ -565,22 +565,22 @@ func (x *FilterChain) GetOnDemandConfiguration() *FilterChain_OnDemandConfigurat
 //
 // .. code-block:: yaml
 //
-//  destination_port_range:
-//   start: 3306
-//   end: 3307
+//	destination_port_range:
+//	 start: 3306
+//	 end: 3307
 //
 // * Matches if the destination port is 3306 or 15000.
 //
 // .. code-block:: yaml
 //
-//  or_match:
-//    rules:
-//      - destination_port_range:
-//          start: 3306
-//          end: 3307
-//      - destination_port_range:
-//          start: 15000
-//          end: 15001
+//	or_match:
+//	  rules:
+//	    - destination_port_range:
+//	        start: 3306
+//	        end: 3307
+//	    - destination_port_range:
+//	        start: 15000
+//	        end: 15001
 //
 // [#next-free-field: 6]
 type ListenerFilterChainMatchPredicate struct {
@@ -589,6 +589,7 @@ type ListenerFilterChainMatchPredicate struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*ListenerFilterChainMatchPredicate_OrMatch
 	//	*ListenerFilterChainMatchPredicate_AndMatch
 	//	*ListenerFilterChainMatchPredicate_NotMatch
@@ -723,6 +724,7 @@ type ListenerFilter struct {
 	// The name of the filter configuration.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*ListenerFilter_TypedConfig
 	//	*ListenerFilter_ConfigDiscovery
 	ConfigType isListenerFilter_ConfigType `protobuf_oneof:"config_type"`
@@ -1043,7 +1045,7 @@ var file_envoy_config_listener_v3_listener_components_proto_rawDesc = []byte{
 	0x73, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x18, 0x04,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x0d, 0x75,
+	0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0d, 0x75,
 	0x73, 0x65, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x3a, 0x0a, 0x08,
 	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
@@ -1145,17 +1147,17 @@ var file_envoy_config_listener_v3_listener_components_proto_rawDesc = []byte{
 	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e,
 	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x0d,
 	0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08,
-	0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x97, 0x01, 0x0a, 0x26,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f,
-	0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x97, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x17,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e,
+	0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/quic_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/quic_config.pb.go
index 55614afa25c..90d5204748c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/quic_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/quic_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v3/quic_config.proto
 
 package listenerv3
@@ -54,15 +54,15 @@ type QuicProtocolOptions struct {
 	// The actual number of packets to read in total by the UDP listener is also
 	// bound by 6000, regardless of this field or how many connections there are.
 	PacketsToReadToConnectionCountRatio *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=packets_to_read_to_connection_count_ratio,json=packetsToReadToConnectionCountRatio,proto3" json:"packets_to_read_to_connection_count_ratio,omitempty"`
-	// Configure which implementation of ``quic::QuicCryptoClientStreamBase`` to be used for this listener.
+	// Configure which implementation of “quic::QuicCryptoClientStreamBase“ to be used for this listener.
 	// If not specified the :ref:`QUICHE default one configured by <envoy_v3_api_msg_extensions.quic.crypto_stream.v3.CryptoServerStreamConfig>` will be used.
 	// [#extension-category: envoy.quic.server.crypto_stream]
 	CryptoStreamConfig *v3.TypedExtensionConfig `protobuf:"bytes,6,opt,name=crypto_stream_config,json=cryptoStreamConfig,proto3" json:"crypto_stream_config,omitempty"`
-	// Configure which implementation of ``quic::ProofSource`` to be used for this listener.
+	// Configure which implementation of “quic::ProofSource“ to be used for this listener.
 	// If not specified the :ref:`default one configured by <envoy_v3_api_msg_extensions.quic.proof_source.v3.ProofSourceConfig>` will be used.
 	// [#extension-category: envoy.quic.proof_source]
 	ProofSourceConfig *v3.TypedExtensionConfig `protobuf:"bytes,7,opt,name=proof_source_config,json=proofSourceConfig,proto3" json:"proof_source_config,omitempty"`
-	// Config which implementation of ``quic::ConnectionIdGeneratorInterface`` to be used for this listener.
+	// Config which implementation of “quic::ConnectionIdGeneratorInterface“ to be used for this listener.
 	// If not specified the :ref:`default one configured by <envoy_v3_api_msg_extensions.quic.connection_id_generator.v3.DeterministicConnectionIdGeneratorConfig>` will be used.
 	// [#extension-category: envoy.quic.connection_id_generator]
 	ConnectionIdGeneratorConfig *v3.TypedExtensionConfig `protobuf:"bytes,8,opt,name=connection_id_generator_config,json=connectionIdGeneratorConfig,proto3" json:"connection_id_generator_config,omitempty"`
@@ -252,16 +252,16 @@ var file_envoy_config_listener_v3_quic_config_proto_rawDesc = []byte{
 	0x66, 0x69, 0x67, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
 	0x72, 0x2e, 0x51, 0x75, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x8f, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x42, 0x0f, 0x51, 0x75, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x8f, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x51, 0x75, 0x69, 0x63, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/udp_listener_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/udp_listener_config.pb.go
index 4bcd978e066..9998da13396 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/udp_listener_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/listener/v3/udp_listener_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/listener/v3/udp_listener_config.proto
 
 package listenerv3
@@ -186,17 +186,17 @@ var file_envoy_config_listener_v3_udp_listener_config_proto_rawDesc = []byte{
 	0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
 	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x41, 0x63,
 	0x74, 0x69, 0x76, 0x65, 0x52, 0x61, 0x77, 0x55, 0x64, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x96, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x42, 0x16, 0x55, 0x64, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x96, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x16, 0x55, 0x64, 0x70,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/metrics_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/metrics_service.pb.go
index ace02175b8c..6e71666d77a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/metrics_service.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/metrics_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/metrics/v3/metrics_service.proto
 
 package metricsv3
@@ -77,7 +77,7 @@ func (HistogramEmitMode) EnumDescriptor() ([]byte, []int) {
 	return file_envoy_config_metrics_v3_metrics_service_proto_rawDescGZIP(), []int{0}
 }
 
-// Metrics Service is configured as a built-in ``envoy.stat_sinks.metrics_service`` :ref:`StatsSink
+// Metrics Service is configured as a built-in “envoy.stat_sinks.metrics_service“ :ref:`StatsSink
 // <envoy_v3_api_msg_config.metrics.v3.StatsSink>`. This opaque configuration will be used to create
 // Metrics Service.
 //
@@ -85,11 +85,11 @@ func (HistogramEmitMode) EnumDescriptor() ([]byte, []int) {
 //
 // .. code-block:: yaml
 //
-//     stats_sinks:
-//       - name: envoy.stat_sinks.metrics_service
-//         typed_config:
-//           "@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig
-//           transport_api_version: V3
+//	stats_sinks:
+//	  - name: envoy.stat_sinks.metrics_service
+//	    typed_config:
+//	      "@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig
+//	      transport_api_version: V3
 //
 // [#extension: envoy.stat_sinks.metrics_service]
 // [#next-free-field: 6]
@@ -238,16 +238,16 @@ var file_envoy_config_metrics_v3_metrics_service_proto_rawDesc = []byte{
 	0x74, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x55, 0x4d, 0x4d, 0x41, 0x52, 0x59,
 	0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x00,
 	0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x4d, 0x4d, 0x41, 0x52, 0x59, 0x10, 0x01, 0x12, 0x0d, 0x0a,
-	0x09, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x02, 0x42, 0x90, 0x01, 0x0a,
-	0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72,
-	0x69, 0x63, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65,
-	0x74, 0x72, 0x69, 0x63, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
+	0x09, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x02, 0x42, 0x90, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x13,
+	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69,
+	0x63, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x76, 0x33, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/stats.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/stats.pb.go
index 6f9d035d3a3..de4a360ce4a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/stats.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3/stats.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/metrics/v3/stats.proto
 
 package metricsv3
@@ -42,6 +42,7 @@ type StatsSink struct {
 	// [#extension-category: envoy.stats_sinks]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*StatsSink_TypedConfig
 	ConfigType isStatsSink_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -128,8 +129,8 @@ type StatsConfig struct {
 	//
 	// .. note::
 	//
-	//   If any default tags are specified twice, the config will be considered
-	//   invalid.
+	//	If any default tags are specified twice, the config will be considered
+	//	invalid.
 	//
 	// See :repo:`well_known_names.h <source/common/config/well_known_names.h>` for a list of the
 	// default tags in Envoy.
@@ -141,37 +142,38 @@ type StatsConfig struct {
 	// performance for Envoys running especially large configs.
 	//
 	// .. warning::
-	//   Excluding stats may affect Envoy's behavior in undocumented ways. See
-	//   `issue #8771 <https://github.com/envoyproxy/envoy/issues/8771>`_ for more information.
-	//   If any unexpected behavior changes are observed, please open a new issue immediately.
+	//
+	//	Excluding stats may affect Envoy's behavior in undocumented ways. See
+	//	`issue #8771 <https://github.com/envoyproxy/envoy/issues/8771>`_ for more information.
+	//	If any unexpected behavior changes are observed, please open a new issue immediately.
 	StatsMatcher *StatsMatcher `protobuf:"bytes,3,opt,name=stats_matcher,json=statsMatcher,proto3" json:"stats_matcher,omitempty"`
 	// Defines rules for setting the histogram buckets. Rules are evaluated in order, and the first
 	// match is applied. If no match is found (or if no rules are set), the following default buckets
 	// are used:
 	//
-	//   .. code-block:: json
+	//	.. code-block:: json
 	//
-	//     [
-	//       0.5,
-	//       1,
-	//       5,
-	//       10,
-	//       25,
-	//       50,
-	//       100,
-	//       250,
-	//       500,
-	//       1000,
-	//       2500,
-	//       5000,
-	//       10000,
-	//       30000,
-	//       60000,
-	//       300000,
-	//       600000,
-	//       1800000,
-	//       3600000
-	//     ]
+	//	  [
+	//	    0.5,
+	//	    1,
+	//	    5,
+	//	    10,
+	//	    25,
+	//	    50,
+	//	    100,
+	//	    250,
+	//	    500,
+	//	    1000,
+	//	    2500,
+	//	    5000,
+	//	    10000,
+	//	    30000,
+	//	    60000,
+	//	    300000,
+	//	    600000,
+	//	    1800000,
+	//	    3600000
+	//	  ]
 	HistogramBucketSettings []*HistogramBucketSettings `protobuf:"bytes,4,rep,name=histogram_bucket_settings,json=histogramBucketSettings,proto3" json:"histogram_bucket_settings,omitempty"`
 }
 
@@ -242,6 +244,7 @@ type StatsMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to StatsMatcher:
+	//
 	//	*StatsMatcher_RejectAll
 	//	*StatsMatcher_ExclusionList
 	//	*StatsMatcher_InclusionList
@@ -313,7 +316,7 @@ type isStatsMatcher_StatsMatcher interface {
 }
 
 type StatsMatcher_RejectAll struct {
-	// If ``reject_all`` is true, then all stats are disabled. If ``reject_all`` is false, then all
+	// If “reject_all“ is true, then all stats are disabled. If “reject_all“ is false, then all
 	// stats are enabled.
 	RejectAll bool `protobuf:"varint,1,opt,name=reject_all,json=rejectAll,proto3,oneof"`
 }
@@ -356,13 +359,14 @@ type TagSpecifier struct {
 	//
 	// .. note::
 	//
-	//   A stat name may be spelled in such a way that it matches two different
-	//   tag extractors for the same tag name. In that case, all but one of the
-	//   tag values will be dropped. It is not specified which tag value will be
-	//   retained. The extraction will only occur for one of the extractors, and
-	//   only the matched extraction will be removed from the tag name.
+	//	A stat name may be spelled in such a way that it matches two different
+	//	tag extractors for the same tag name. In that case, all but one of the
+	//	tag values will be dropped. It is not specified which tag value will be
+	//	retained. The extraction will only occur for one of the extractors, and
+	//	only the matched extraction will be removed from the tag name.
 	TagName string `protobuf:"bytes,1,opt,name=tag_name,json=tagName,proto3" json:"tag_name,omitempty"`
 	// Types that are assignable to TagValue:
+	//
 	//	*TagSpecifier_Regex
 	//	*TagSpecifier_FixedValue
 	TagValue isTagSpecifier_TagValue `protobuf_oneof:"tag_value"`
@@ -443,55 +447,55 @@ type TagSpecifier_Regex struct {
 	// group is provided, the first will also be used to set the value of the tag.
 	// All other capture groups will be ignored.
 	//
-	// Example 1. a stat name ``cluster.foo_cluster.upstream_rq_timeout`` and
+	// Example 1. a stat name “cluster.foo_cluster.upstream_rq_timeout“ and
 	// one tag specifier:
 	//
 	// .. code-block:: json
 	//
-	//   {
-	//     "tag_name": "envoy.cluster_name",
-	//     "regex": "^cluster\\.((.+?)\\.)"
-	//   }
+	//	{
+	//	  "tag_name": "envoy.cluster_name",
+	//	  "regex": "^cluster\\.((.+?)\\.)"
+	//	}
 	//
-	// Note that the regex will remove ``foo_cluster.`` making the tag extracted
-	// name ``cluster.upstream_rq_timeout`` and the tag value for
-	// ``envoy.cluster_name`` will be ``foo_cluster`` (note: there will be no
-	// ``.`` character because of the second capture group).
+	// Note that the regex will remove “foo_cluster.“ making the tag extracted
+	// name “cluster.upstream_rq_timeout“ and the tag value for
+	// “envoy.cluster_name“ will be “foo_cluster“ (note: there will be no
+	// “.“ character because of the second capture group).
 	//
 	// Example 2. a stat name
-	// ``http.connection_manager_1.user_agent.ios.downstream_cx_total`` and two
+	// “http.connection_manager_1.user_agent.ios.downstream_cx_total“ and two
 	// tag specifiers:
 	//
 	// .. code-block:: json
 	//
-	//   [
-	//     {
-	//       "tag_name": "envoy.http_user_agent",
-	//       "regex": "^http(?=\\.).*?\\.user_agent\\.((.+?)\\.)\\w+?$"
-	//     },
-	//     {
-	//       "tag_name": "envoy.http_conn_manager_prefix",
-	//       "regex": "^http\\.((.*?)\\.)"
-	//     }
-	//   ]
+	//	[
+	//	  {
+	//	    "tag_name": "envoy.http_user_agent",
+	//	    "regex": "^http(?=\\.).*?\\.user_agent\\.((.+?)\\.)\\w+?$"
+	//	  },
+	//	  {
+	//	    "tag_name": "envoy.http_conn_manager_prefix",
+	//	    "regex": "^http\\.((.*?)\\.)"
+	//	  }
+	//	]
 	//
 	// The two regexes of the specifiers will be processed from the elaborated
 	// stat name.
 	//
-	// The first regex will save ``ios.`` as the tag value for ``envoy.http_user_agent``. It will
+	// The first regex will save “ios.“ as the tag value for “envoy.http_user_agent“. It will
 	// leave it in the name for potential matching with additional tag specifiers. After all tag
 	// specifiers are processed the tags will be removed from the name.
 	//
-	// The second regex will populate tag ``envoy.http_conn_manager_prefix`` with value
-	// ``connection_manager_1.``, based on the original stat name.
+	// The second regex will populate tag “envoy.http_conn_manager_prefix“ with value
+	// “connection_manager_1.“, based on the original stat name.
 	//
 	// As a final step, the matched tags are removed, leaving
-	// ``http.user_agent.downstream_cx_total`` as the tag extracted name.
+	// “http.user_agent.downstream_cx_total“ as the tag extracted name.
 	Regex string `protobuf:"bytes,2,opt,name=regex,proto3,oneof"`
 }
 
 type TagSpecifier_FixedValue struct {
-	// Specifies a fixed tag value for the ``tag_name``.
+	// Specifies a fixed tag value for the “tag_name“.
 	FixedValue string `protobuf:"bytes,3,opt,name=fixed_value,json=fixedValue,proto3,oneof"`
 }
 
@@ -506,7 +510,7 @@ type HistogramBucketSettings struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The stats that this rule applies to. The match is applied to the original stat name
-	// before tag-extraction, for example ``cluster.exampleclustername.upstream_cx_length_ms``.
+	// before tag-extraction, for example “cluster.exampleclustername.upstream_cx_length_ms“.
 	Match *v3.StringMatcher `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"`
 	// Each value is the upper bound of a bucket. Each bucket must be greater than 0 and unique.
 	// The order of the buckets does not matter.
@@ -559,7 +563,7 @@ func (x *HistogramBucketSettings) GetBuckets() []float64 {
 	return nil
 }
 
-// Stats configuration proto schema for built-in ``envoy.stat_sinks.statsd`` sink. This sink does not support
+// Stats configuration proto schema for built-in “envoy.stat_sinks.statsd“ sink. This sink does not support
 // tagged metrics.
 // [#extension: envoy.stat_sinks.statsd]
 type StatsdSink struct {
@@ -568,6 +572,7 @@ type StatsdSink struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to StatsdSpecifier:
+	//
 	//	*StatsdSink_Address
 	//	*StatsdSink_TcpClusterName
 	StatsdSpecifier isStatsdSink_StatsdSpecifier `protobuf_oneof:"statsd_specifier"`
@@ -577,16 +582,16 @@ type StatsdSink struct {
 	//
 	// .. code-block:: json
 	//
-	//   {
-	//     "prefix" : "envoy-prod"
-	//   }
+	//	{
+	//	  "prefix" : "envoy-prod"
+	//	}
 	//
 	// will change emitted stats to
 	//
 	// .. code-block:: cpp
 	//
-	//   envoy-prod.test_counter:1|c
-	//   envoy-prod.test_timer:5|ms
+	//	envoy-prod.test_counter:1|c
+	//	envoy-prod.test_timer:5|ms
 	//
 	// Note that the default prefix, "envoy", will be used if a prefix is not
 	// specified.
@@ -595,8 +600,8 @@ type StatsdSink struct {
 	//
 	// .. code-block:: cpp
 	//
-	//   envoy.test_counter:1|c
-	//   envoy.test_timer:5|ms
+	//	envoy.test_counter:1|c
+	//	envoy.test_timer:5|ms
 	Prefix string `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"`
 }
 
@@ -682,7 +687,7 @@ func (*StatsdSink_Address) isStatsdSink_StatsdSpecifier() {}
 
 func (*StatsdSink_TcpClusterName) isStatsdSink_StatsdSpecifier() {}
 
-// Stats configuration proto schema for built-in ``envoy.stat_sinks.dog_statsd`` sink.
+// Stats configuration proto schema for built-in “envoy.stat_sinks.dog_statsd“ sink.
 // The sink emits stats with `DogStatsD <https://docs.datadoghq.com/guides/dogstatsd/>`_
 // compatible tags. Tags are configurable via :ref:`StatsConfig
 // <envoy_v3_api_msg_config.metrics.v3.StatsConfig>`.
@@ -693,6 +698,7 @@ type DogStatsdSink struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to DogStatsdSpecifier:
+	//
 	//	*DogStatsdSink_Address
 	DogStatsdSpecifier isDogStatsdSink_DogStatsdSpecifier `protobuf_oneof:"dog_statsd_specifier"`
 	// Optional custom metric name prefix. See :ref:`StatsdSink's prefix field
@@ -779,7 +785,7 @@ type DogStatsdSink_Address struct {
 
 func (*DogStatsdSink_Address) isDogStatsdSink_DogStatsdSpecifier() {}
 
-// Stats configuration proto schema for built-in ``envoy.stat_sinks.hystrix`` sink.
+// Stats configuration proto schema for built-in “envoy.stat_sinks.hystrix“ sink.
 // The sink emits stats in `text/event-stream
 // <https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events>`_
 // formatted stream for use by `Hystrix dashboard
@@ -801,7 +807,7 @@ type HystrixSink struct {
 	// in the process). The sink then outputs the aggregate statistics across the
 	// current rolling window to the event stream(s).
 	//
-	// ``rolling_window(ms)`` = ``stats_flush_interval(ms)`` * ``num_of_buckets``
+	// “rolling_window(ms)“ = “stats_flush_interval(ms)“ * “num_of_buckets“
 	//
 	// More detailed explanation can be found in `Hystrix wiki
 	// <https://github.com/Netflix/Hystrix/wiki/Metrics-and-Monitoring#hystrixrollingnumber>`_.
@@ -976,15 +982,15 @@ var file_envoy_config_metrics_v3_stats_proto_rawDesc = []byte{
 	0x6d, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a,
 	0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65,
 	0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x79, 0x73, 0x74, 0x72, 0x69, 0x78,
-	0x53, 0x69, 0x6e, 0x6b, 0x42, 0x87, 0x01, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0a,
-	0x53, 0x74, 0x61, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65, 0x74,
-	0x72, 0x69, 0x63, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
+	0x53, 0x69, 0x6e, 0x6b, 0x42, 0x87, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6d, 0x65, 0x74, 0x72,
+	0x69, 0x63, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x73, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63,
+	0x73, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x76, 0x33, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v3/overload.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v3/overload.pb.go
index 670801abb47..7f51f07f349 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v3/overload.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v3/overload.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/overload/v3/overload.proto
 
 package overloadv3
@@ -102,6 +102,7 @@ type ResourceMonitor struct {
 	// [#extension-category: envoy.resource_monitors]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*ResourceMonitor_TypedConfig
 	ConfigType isResourceMonitor_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -225,7 +226,7 @@ type ScaledTrigger struct {
 
 	// If the resource pressure is greater than this value, the trigger will be in the
 	// :ref:`scaling <arch_overview_overload_manager-triggers-state>` state with value
-	// ``(pressure - scaling_threshold) / (saturation_threshold - scaling_threshold)``.
+	// “(pressure - scaling_threshold) / (saturation_threshold - scaling_threshold)“.
 	ScalingThreshold float64 `protobuf:"fixed64,1,opt,name=scaling_threshold,json=scalingThreshold,proto3" json:"scaling_threshold,omitempty"`
 	// If the resource pressure is greater than this value, the trigger will enter saturation.
 	SaturationThreshold float64 `protobuf:"fixed64,2,opt,name=saturation_threshold,json=saturationThreshold,proto3" json:"saturation_threshold,omitempty"`
@@ -285,6 +286,7 @@ type Trigger struct {
 	// The name of the resource this is a trigger for.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to TriggerOneof:
+	//
 	//	*Trigger_Threshold
 	//	*Trigger_Scaled
 	TriggerOneof isTrigger_TriggerOneof `protobuf_oneof:"trigger_oneof"`
@@ -715,6 +717,7 @@ type ScaleTimersOverloadActionConfig_ScaleTimer struct {
 	// The type of timer this minimum applies to.
 	Timer ScaleTimersOverloadActionConfig_TimerType `protobuf:"varint,1,opt,name=timer,proto3,enum=envoy.config.overload.v3.ScaleTimersOverloadActionConfig_TimerType" json:"timer,omitempty"`
 	// Types that are assignable to OverloadAdjust:
+	//
 	//	*ScaleTimersOverloadActionConfig_ScaleTimer_MinTimeout
 	//	*ScaleTimersOverloadActionConfig_ScaleTimer_MinScale
 	OverloadAdjust isScaleTimersOverloadActionConfig_ScaleTimer_OverloadAdjust `protobuf_oneof:"overload_adjust"`
@@ -958,16 +961,16 @@ var file_envoy_config_overload_v3_overload_proto_rawDesc = []byte{
 	0x9a, 0xc5, 0x88, 0x1e, 0x2f, 0x0a, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x76, 0x32, 0x61,
 	0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x42, 0x8d, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x76, 0x33, 0x42,
-	0x0d, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x2f, 0x76,
-	0x33, 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x67, 0x65, 0x72, 0x42, 0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6f, 0x76, 0x65, 0x72,
+	0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61,
+	0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6f, 0x76,
+	0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x2f, 0x76, 0x33, 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f,
+	0x61, 0x64, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3/rbac.pb.go
index dd98cec6350..126084f32bc 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3/rbac.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3/rbac.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/rbac/v3/rbac.proto
 
 package rbacv3
@@ -38,7 +38,7 @@ const (
 	// The policies deny access to principals. The rest are allowed. This is block-list style
 	// access control.
 	RBAC_DENY RBAC_Action = 1
-	// The policies set the ``access_log_hint`` dynamic metadata key based on if requests match.
+	// The policies set the “access_log_hint“ dynamic metadata key based on if requests match.
 	// All requests are allowed.
 	RBAC_LOG RBAC_Action = 2
 )
@@ -142,54 +142,63 @@ func (RBAC_AuditLoggingOptions_AuditCondition) EnumDescriptor() ([]byte, []int)
 }
 
 // Role Based Access Control (RBAC) provides service-level and method-level access control for a
-// service. Requests are allowed or denied based on the ``action`` and whether a matching policy is
+// service. Requests are allowed or denied based on the “action“ and whether a matching policy is
 // found. For instance, if the action is ALLOW and a matching policy is found the request should be
 // allowed.
 //
 // RBAC can also be used to make access logging decisions by communicating with access loggers
 // through dynamic metadata. When the action is LOG and at least one policy matches, the
-// ``access_log_hint`` value in the shared key namespace 'envoy.common' is set to ``true`` indicating
+// “access_log_hint“ value in the shared key namespace 'envoy.common' is set to “true“ indicating
 // the request should be logged.
 //
 // Here is an example of RBAC configuration. It has two policies:
 //
-// * Service account ``cluster.local/ns/default/sa/admin`` has full access to the service, and so
-//   does "cluster.local/ns/default/sa/superuser".
+//   - Service account “cluster.local/ns/default/sa/admin“ has full access to the service, and so
+//     does "cluster.local/ns/default/sa/superuser".
 //
-// * Any user can read (``GET``) the service at paths with prefix ``/products``, so long as the
-//   destination port is either 80 or 443.
+//   - Any user can read (“GET“) the service at paths with prefix “/products“, so long as the
+//     destination port is either 80 or 443.
 //
-//  .. code-block:: yaml
+//     .. code-block:: yaml
 //
-//   action: ALLOW
-//   policies:
+//     action: ALLOW
+//     policies:
 //     "service-admin":
-//       permissions:
-//         - any: true
-//       principals:
-//         - authenticated:
-//             principal_name:
-//               exact: "cluster.local/ns/default/sa/admin"
-//         - authenticated:
-//             principal_name:
-//               exact: "cluster.local/ns/default/sa/superuser"
+//     permissions:
+//
+//   - any: true
+//     principals:
+//
+//   - authenticated:
+//     principal_name:
+//     exact: "cluster.local/ns/default/sa/admin"
+//
+//   - authenticated:
+//     principal_name:
+//     exact: "cluster.local/ns/default/sa/superuser"
 //     "product-viewer":
-//       permissions:
-//           - and_rules:
-//               rules:
-//                 - header:
-//                     name: ":method"
-//                     string_match:
-//                       exact: "GET"
-//                 - url_path:
-//                     path: { prefix: "/products" }
-//                 - or_rules:
-//                     rules:
-//                       - destination_port: 80
-//                       - destination_port: 443
-//       principals:
-//         - any: true
+//     permissions:
+//
+//   - and_rules:
+//     rules:
+//
+//   - header:
+//     name: ":method"
+//     string_match:
+//     exact: "GET"
+//
+//   - url_path:
+//     path: { prefix: "/products" }
+//
+//   - or_rules:
+//     rules:
 //
+//   - destination_port: 80
+//
+//   - destination_port: 443
+//     principals:
+//
+//   - any: true
 type RBAC struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -200,15 +209,14 @@ type RBAC struct {
 	//
 	// Actions:
 	//
-	//  * ``ALLOW``: Allows the request if and only if there is a policy that matches
-	//    the request.
-	//  * ``DENY``: Allows the request if and only if there are no policies that
-	//    match the request.
-	//  * ``LOG``: Allows all requests. If at least one policy matches, the dynamic
-	//    metadata key ``access_log_hint`` is set to the value ``true`` under the shared
-	//    key namespace ``envoy.common``. If no policies match, it is set to ``false``.
-	//    Other actions do not modify this key.
-	//
+	//   - “ALLOW“: Allows the request if and only if there is a policy that matches
+	//     the request.
+	//   - “DENY“: Allows the request if and only if there are no policies that
+	//     match the request.
+	//   - “LOG“: Allows all requests. If at least one policy matches, the dynamic
+	//     metadata key “access_log_hint“ is set to the value “true“ under the shared
+	//     key namespace “envoy.common“. If no policies match, it is set to “false“.
+	//     Other actions do not modify this key.
 	Action RBAC_Action `protobuf:"varint,1,opt,name=action,proto3,enum=envoy.config.rbac.v3.RBAC_Action" json:"action,omitempty"`
 	// Maps from policy name to policy. A match occurs when at least one policy matches the request.
 	// The policies are evaluated in lexicographic order of the policy name.
@@ -284,11 +292,11 @@ type Policy struct {
 
 	// Required. The set of permissions that define a role. Each permission is
 	// matched with OR semantics. To match all actions for this policy, a single
-	// Permission with the ``any`` field set to true should be used.
+	// Permission with the “any“ field set to true should be used.
 	Permissions []*Permission `protobuf:"bytes,1,rep,name=permissions,proto3" json:"permissions,omitempty"`
 	// Required. The set of principals that are assigned/denied the role based on
 	// “action”. Each principal is matched with OR semantics. To match all
-	// downstreams for this policy, a single Principal with the ``any`` field set to
+	// downstreams for this policy, a single Principal with the “any“ field set to
 	// true should be used.
 	Principals []*Principal `protobuf:"bytes,2,rep,name=principals,proto3" json:"principals,omitempty"`
 	// An optional symbolic expression specifying an access control
@@ -370,6 +378,7 @@ type Permission struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*Permission_AndRules
 	//	*Permission_OrRules
 	//	*Permission_Any
@@ -530,7 +539,7 @@ type Permission_Any struct {
 type Permission_Header struct {
 	// A header (or pseudo-header such as :path or :method) on the incoming HTTP request. Only
 	// available for HTTP request.
-	// Note: the pseudo-header :path includes the query and fragment string. Use the ``url_path``
+	// Note: the pseudo-header :path includes the query and fragment string. Use the “url_path“
 	// field if you want to match the URL path without the query and fragment string.
 	Header *v3.HeaderMatcher `protobuf:"bytes,4,opt,name=header,proto3,oneof"`
 }
@@ -562,8 +571,8 @@ type Permission_Metadata struct {
 
 type Permission_NotRule struct {
 	// Negates matching the provided permission. For instance, if the value of
-	// ``not_rule`` would match, this permission would not match. Conversely, if
-	// the value of ``not_rule`` would not match, this permission would match.
+	// “not_rule“ would match, this permission would not match. Conversely, if
+	// the value of “not_rule“ would not match, this permission would match.
 	NotRule *Permission `protobuf:"bytes,8,opt,name=not_rule,json=notRule,proto3,oneof"`
 }
 
@@ -573,18 +582,18 @@ type Permission_RequestedServerName struct {
 	//
 	// .. attention::
 	//
-	//   The behavior of this field may be affected by how Envoy is configured
-	//   as explained below.
+	//	The behavior of this field may be affected by how Envoy is configured
+	//	as explained below.
 	//
-	//   * If the :ref:`TLS Inspector <config_listener_filters_tls_inspector>`
-	//     filter is not added, and if a ``FilterChainMatch`` is not defined for
-	//     the :ref:`server name
-	//     <envoy_v3_api_field_config.listener.v3.FilterChainMatch.server_names>`,
-	//     a TLS connection's requested SNI server name will be treated as if it
-	//     wasn't present.
+	//	* If the :ref:`TLS Inspector <config_listener_filters_tls_inspector>`
+	//	  filter is not added, and if a ``FilterChainMatch`` is not defined for
+	//	  the :ref:`server name
+	//	  <envoy_v3_api_field_config.listener.v3.FilterChainMatch.server_names>`,
+	//	  a TLS connection's requested SNI server name will be treated as if it
+	//	  wasn't present.
 	//
-	//   * A :ref:`listener filter <arch_overview_listener_filters>` may
-	//     overwrite a connection's requested server name within Envoy.
+	//	* A :ref:`listener filter <arch_overview_listener_filters>` may
+	//	  overwrite a connection's requested server name within Envoy.
 	//
 	// Please refer to :ref:`this FAQ entry <faq_how_to_setup_sni>` to learn to
 	// setup SNI.
@@ -630,6 +639,7 @@ type Principal struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Identifier:
+	//
 	//	*Principal_AndIds
 	//	*Principal_OrIds
 	//	*Principal_Any
@@ -712,7 +722,7 @@ func (x *Principal) GetAuthenticated() *Principal_Authenticated {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/rbac/v3/rbac.proto.
 func (x *Principal) GetSourceIp() *v32.CidrRange {
 	if x, ok := x.GetIdentifier().(*Principal_SourceIp); ok {
 		return x.SourceIp
@@ -804,7 +814,7 @@ type Principal_SourceIp struct {
 	// behavior, or use
 	// :ref:`direct_remote_ip <envoy_v3_api_field_config.rbac.v3.Principal.direct_remote_ip>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/rbac/v3/rbac.proto.
 	SourceIp *v32.CidrRange `protobuf:"bytes,5,opt,name=source_ip,json=sourceIp,proto3,oneof"`
 }
 
@@ -830,7 +840,7 @@ type Principal_RemoteIp struct {
 type Principal_Header struct {
 	// A header (or pseudo-header such as :path or :method) on the incoming HTTP
 	// request. Only available for HTTP request. Note: the pseudo-header :path
-	// includes the query and fragment string. Use the ``url_path`` field if you
+	// includes the query and fragment string. Use the “url_path“ field if you
 	// want to match the URL path without the query and fragment string.
 	Header *v3.HeaderMatcher `protobuf:"bytes,6,opt,name=header,proto3,oneof"`
 }
@@ -852,8 +862,8 @@ type Principal_FilterState struct {
 
 type Principal_NotId struct {
 	// Negates matching the provided principal. For instance, if the value of
-	// ``not_id`` would match, this principal would not match. Conversely, if the
-	// value of ``not_id`` would not match, this principal would match.
+	// “not_id“ would match, this principal would not match. Conversely, if the
+	// value of “not_id“ would not match, this principal would match.
 	NotId *Principal `protobuf:"bytes,8,opt,name=not_id,json=notId,proto3,oneof"`
 }
 
@@ -894,19 +904,18 @@ type Action struct {
 	//
 	// Actions:
 	//
-	//  * ``ALLOW``: If the request gets matched on ALLOW, it is permitted.
-	//  * ``DENY``: If the request gets matched on DENY, it is not permitted.
-	//  * ``LOG``: If the request gets matched on LOG, it is permitted. Besides, the
-	//    dynamic metadata key ``access_log_hint`` under the shared key namespace
-	//    ``envoy.common`` will be set to the value ``true``.
-	//  * If the request cannot get matched, it will fallback to ``DENY``.
+	//   - “ALLOW“: If the request gets matched on ALLOW, it is permitted.
+	//   - “DENY“: If the request gets matched on DENY, it is not permitted.
+	//   - “LOG“: If the request gets matched on LOG, it is permitted. Besides, the
+	//     dynamic metadata key “access_log_hint“ under the shared key namespace
+	//     “envoy.common“ will be set to the value “true“.
+	//   - If the request cannot get matched, it will fallback to “DENY“.
 	//
 	// Log behavior:
 	//
-	//  If the RBAC matcher contains at least one LOG action, the dynamic
-	//  metadata key ``access_log_hint`` will be set based on if the request
-	//  get matched on the LOG action.
-	//
+	//	If the RBAC matcher contains at least one LOG action, the dynamic
+	//	metadata key ``access_log_hint`` will be set based on if the request
+	//	get matched on the LOG action.
 	Action RBAC_Action `protobuf:"varint,2,opt,name=action,proto3,enum=envoy.config.rbac.v3.RBAC_Action" json:"action,omitempty"`
 }
 
@@ -1078,7 +1087,7 @@ func (x *RBAC_AuditLoggingOptions_AuditLoggerConfig) GetIsOptional() bool {
 	return false
 }
 
-// Used in the ``and_rules`` and ``or_rules`` fields in the ``rule`` oneof. Depending on the context,
+// Used in the “and_rules“ and “or_rules“ fields in the “rule“ oneof. Depending on the context,
 // each are applied with the associated behavior.
 type Permission_Set struct {
 	state         protoimpl.MessageState
@@ -1127,7 +1136,7 @@ func (x *Permission_Set) GetRules() []*Permission {
 	return nil
 }
 
-// Used in the ``and_ids`` and ``or_ids`` fields in the ``identifier`` oneof.
+// Used in the “and_ids“ and “or_ids“ fields in the “identifier“ oneof.
 // Depending on the context, each are applied with the associated behavior.
 type Principal_Set struct {
 	state         protoimpl.MessageState
@@ -1427,8 +1436,8 @@ var file_envoy_config_rbac_v3_rbac_proto_rawDesc = []byte{
 	0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x5f, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7,
-	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8,
+	0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63,
 	0x65, 0x49, 0x70, 0x12, 0x4b, 0x0a, 0x10, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65,
 	0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
@@ -1485,15 +1494,15 @@ var file_envoy_config_rbac_v3_rbac_proto_rawDesc = []byte{
 	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x62, 0x61, 0x63, 0x2e,
 	0x76, 0x33, 0x2e, 0x52, 0x42, 0x41, 0x43, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x7d, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x62, 0x61, 0x63, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x52, 0x62,
-	0x61, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72,
-	0x62, 0x61, 0x63, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x62, 0x61, 0x63, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x7d, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x62, 0x61,
+	0x63, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x52, 0x62, 0x61, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x62, 0x61, 0x63, 0x2f, 0x76, 0x33, 0x3b, 0x72,
+	0x62, 0x61, 0x63, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.go
index d87450fb960..152bc22bc32 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/route/v3/route.proto
 
 package routev3
@@ -25,7 +25,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// [#next-free-field: 17]
+// [#next-free-field: 18]
 type RouteConfiguration struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -39,10 +39,10 @@ type RouteConfiguration struct {
 	// An array of virtual hosts that make up the route table.
 	VirtualHosts []*VirtualHost `protobuf:"bytes,2,rep,name=virtual_hosts,json=virtualHosts,proto3" json:"virtual_hosts,omitempty"`
 	// An array of virtual hosts will be dynamically loaded via the VHDS API.
-	// Both ``virtual_hosts`` and ``vhds`` fields will be used when present. ``virtual_hosts`` can be used
-	// for a base routing table or for infrequently changing virtual hosts. ``vhds`` is used for
+	// Both “virtual_hosts“ and “vhds“ fields will be used when present. “virtual_hosts“ can be used
+	// for a base routing table or for infrequently changing virtual hosts. “vhds“ is used for
 	// on-demand discovery of virtual hosts. The contents of these two fields will be merged to
-	// generate a routing table for a given RouteConfiguration, with ``vhds`` derived configuration
+	// generate a routing table for a given RouteConfiguration, with “vhds“ derived configuration
 	// taking precedence.
 	Vhds *Vhds `protobuf:"bytes,9,opt,name=vhds,proto3" json:"vhds,omitempty"`
 	// Optionally specifies a list of HTTP headers that the connection manager
@@ -78,7 +78,6 @@ type RouteConfiguration struct {
 	//
 	// To allow setting overrides at the route or virtual host level, this order can be reversed
 	// by setting this option to true. Defaults to false.
-	//
 	MostSpecificHeaderMutationsWins bool `protobuf:"varint,10,opt,name=most_specific_header_mutations_wins,json=mostSpecificHeaderMutationsWins,proto3" json:"most_specific_header_mutations_wins,omitempty"`
 	// An optional boolean that specifies whether the clusters that the route
 	// table refers to will be validated by the cluster manager. If set to true
@@ -100,15 +99,14 @@ type RouteConfiguration struct {
 	//
 	// .. warning::
 	//
-	//   Envoy currently holds the content of :ref:`direct response body
-	//   <envoy_v3_api_field_config.route.v3.DirectResponseAction.body>` in memory. Be careful setting
-	//   this to be larger than the default 4KB, since the allocated memory for direct response body
-	//   is not subject to data plane buffering controls.
-	//
+	//	Envoy currently holds the content of :ref:`direct response body
+	//	<envoy_v3_api_field_config.route.v3.DirectResponseAction.body>` in memory. Be careful setting
+	//	this to be larger than the default 4KB, since the allocated memory for direct response body
+	//	is not subject to data plane buffering controls.
 	MaxDirectResponseBodySizeBytes *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=max_direct_response_body_size_bytes,json=maxDirectResponseBodySizeBytes,proto3" json:"max_direct_response_body_size_bytes,omitempty"`
 	// A list of plugins and their configurations which may be used by a
 	// :ref:`cluster specifier plugin name <envoy_v3_api_field_config.route.v3.RouteAction.cluster_specifier_plugin>`
-	// within the route. All ``extension.name`` fields in this list must be unique.
+	// within the route. All “extension.name“ fields in this list must be unique.
 	ClusterSpecifierPlugins []*ClusterSpecifierPlugin `protobuf:"bytes,12,rep,name=cluster_specifier_plugins,json=clusterSpecifierPlugins,proto3" json:"cluster_specifier_plugins,omitempty"`
 	// Specify a set of default request mirroring policies which apply to all routes under its virtual hosts.
 	// Note that policies are not merged, the most specific non-empty one becomes the mirror policies.
@@ -123,19 +121,21 @@ type RouteConfiguration struct {
 	// Envoy by default takes ":path" as "<path>;<params>".
 	// For users who want to only match path on the "<path>" portion, this option should be true.
 	IgnorePathParametersInPathMatching bool `protobuf:"varint,15,opt,name=ignore_path_parameters_in_path_matching,json=ignorePathParametersInPathMatching,proto3" json:"ignore_path_parameters_in_path_matching,omitempty"`
-	// The typed_per_filter_config field can be used to provide RouteConfiguration level per filter config.
-	// The key should match the :ref:`filter config name
+	// This field can be used to provide RouteConfiguration level per filter config. The key should match the
+	// :ref:`filter config name
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpFilter.name>`.
-	// The canonical filter name (e.g., ``envoy.filters.http.buffer`` for the HTTP buffer filter) can also
-	// be used for the backwards compatibility. If there is no entry referred by the filter config name, the
-	// entry referred by the canonical filter name will be provided to the filters as fallback.
-	//
-	// Use of this field is filter specific;
-	// see the :ref:`HTTP filter documentation <config_http_filters>` for if and how it is utilized.
+	// See :ref:`Http filter route specific config <arch_overview_http_filters_per_filter_config>`
+	// for details.
 	// [#comment: An entry's value may be wrapped in a
 	// :ref:`FilterConfig<envoy_v3_api_msg_config.route.v3.FilterConfig>`
 	// message to specify additional options.]
 	TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,16,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// The metadata field can be used to provide additional information
+	// about the route configuration. It can be used for configuration, stats, and logging.
+	// The metadata should go under the filter namespace that will need it.
+	// For instance, if the metadata is intended for the Router filter,
+	// the filter name should be specified as “envoy.filters.http.router“.
+	Metadata *v3.Metadata `protobuf:"bytes,17,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (x *RouteConfiguration) Reset() {
@@ -282,6 +282,13 @@ func (x *RouteConfiguration) GetTypedPerFilterConfig() map[string]*any1.Any {
 	return nil
 }
 
+func (x *RouteConfiguration) GetMetadata() *v3.Metadata {
+	if x != nil {
+		return x.Metadata
+	}
+	return nil
+}
+
 type Vhds struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -353,7 +360,7 @@ var file_envoy_config_route_v3_route_proto_rawDesc = []byte{
 	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
 	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcd, 0x0b, 0x0a, 0x12, 0x52, 0x6f,
+	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x0c, 0x0a, 0x12, 0x52, 0x6f,
 	0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
 	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x47, 0x0a, 0x0d, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x5f,
@@ -366,7 +373,7 @@ var file_envoy_config_route_v3_route_proto_rawDesc = []byte{
 	0x2e, 0x76, 0x33, 0x2e, 0x56, 0x68, 0x64, 0x73, 0x52, 0x04, 0x76, 0x68, 0x64, 0x73, 0x12, 0x44,
 	0x0a, 0x15, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x5f,
 	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa,
-	0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52,
+	0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52,
 	0x13, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4f, 0x6e, 0x6c, 0x79, 0x48, 0x65, 0x61,
 	0x64, 0x65, 0x72, 0x73, 0x12, 0x69, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18,
@@ -377,8 +384,8 @@ var file_envoy_config_route_v3_route_proto_rawDesc = []byte{
 	0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12,
 	0x4d, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64,
 	0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0,
-	0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48,
+	0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48,
 	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x67,
 	0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
 	0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27,
@@ -389,7 +396,7 @@ var file_envoy_config_route_v3_route_proto_rawDesc = []byte{
 	0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4b, 0x0a, 0x19, 0x72, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65,
 	0x6d, 0x6f, 0x76, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92,
-	0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x16, 0x72, 0x65,
+	0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x16, 0x72, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65,
 	0x6d, 0x6f, 0x76, 0x65, 0x12, 0x4c, 0x0a, 0x23, 0x6d, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x70, 0x65,
 	0x63, 0x69, 0x66, 0x69, 0x63, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74,
@@ -438,31 +445,35 @@ var file_envoy_config_route_v3_route_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65,
 	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x74, 0x79,
 	0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x1a, 0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x73, 0x0a, 0x04, 0x56, 0x68, 0x64,
-	0x73, 0x12, 0x51, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x3a, 0x18, 0x9a, 0xc5, 0x88, 0x1e, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x68, 0x64, 0x73, 0x42, 0x81,
-	0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f,
-	0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x67, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x11,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x5d,
+	0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
+	0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x26, 0x9a,
+	0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x73, 0x0a, 0x04, 0x56, 0x68, 0x64, 0x73, 0x12, 0x51, 0x0a,
+	0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x3a, 0x18, 0x9a, 0xc5, 0x88, 0x1e, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x68, 0x64, 0x73, 0x42, 0x81, 0x01, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -488,8 +499,9 @@ var file_envoy_config_route_v3_route_proto_goTypes = []interface{}{
 	(*wrappers.UInt32Value)(nil),            // 6: google.protobuf.UInt32Value
 	(*ClusterSpecifierPlugin)(nil),          // 7: envoy.config.route.v3.ClusterSpecifierPlugin
 	(*RouteAction_RequestMirrorPolicy)(nil), // 8: envoy.config.route.v3.RouteAction.RequestMirrorPolicy
-	(*v3.ConfigSource)(nil),                 // 9: envoy.config.core.v3.ConfigSource
-	(*any1.Any)(nil),                        // 10: google.protobuf.Any
+	(*v3.Metadata)(nil),                     // 9: envoy.config.core.v3.Metadata
+	(*v3.ConfigSource)(nil),                 // 10: envoy.config.core.v3.ConfigSource
+	(*any1.Any)(nil),                        // 11: google.protobuf.Any
 }
 var file_envoy_config_route_v3_route_proto_depIdxs = []int32{
 	3,  // 0: envoy.config.route.v3.RouteConfiguration.virtual_hosts:type_name -> envoy.config.route.v3.VirtualHost
@@ -501,13 +513,14 @@ var file_envoy_config_route_v3_route_proto_depIdxs = []int32{
 	7,  // 6: envoy.config.route.v3.RouteConfiguration.cluster_specifier_plugins:type_name -> envoy.config.route.v3.ClusterSpecifierPlugin
 	8,  // 7: envoy.config.route.v3.RouteConfiguration.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy
 	2,  // 8: envoy.config.route.v3.RouteConfiguration.typed_per_filter_config:type_name -> envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry
-	9,  // 9: envoy.config.route.v3.Vhds.config_source:type_name -> envoy.config.core.v3.ConfigSource
-	10, // 10: envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
-	11, // [11:11] is the sub-list for method output_type
-	11, // [11:11] is the sub-list for method input_type
-	11, // [11:11] is the sub-list for extension type_name
-	11, // [11:11] is the sub-list for extension extendee
-	0,  // [0:11] is the sub-list for field type_name
+	9,  // 9: envoy.config.route.v3.RouteConfiguration.metadata:type_name -> envoy.config.core.v3.Metadata
+	10, // 10: envoy.config.route.v3.Vhds.config_source:type_name -> envoy.config.core.v3.ConfigSource
+	11, // 11: envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
+	12, // [12:12] is the sub-list for method output_type
+	12, // [12:12] is the sub-list for method input_type
+	12, // [12:12] is the sub-list for extension type_name
+	12, // [12:12] is the sub-list for extension extendee
+	0,  // [0:12] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_route_v3_route_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.validate.go
index ce8a399e8da..78991464dc9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route.pb.validate.go
@@ -438,6 +438,35 @@ func (m *RouteConfiguration) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetMetadata()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, RouteConfigurationValidationError{
+					field:  "Metadata",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, RouteConfigurationValidationError{
+					field:  "Metadata",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return RouteConfigurationValidationError{
+				field:  "Metadata",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return RouteConfigurationMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.go
index 8c0220a94b3..3b0e41c354d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/route/v3/route_components.proto
 
 package routev3
@@ -142,7 +142,7 @@ func (RouteAction_ClusterNotFoundResponseCode) EnumDescriptor() ([]byte, []int)
 // Configures :ref:`internal redirect <arch_overview_internal_redirects>` behavior.
 // [#next-major-version: remove this definition - it's defined in the InternalRedirectPolicy message.]
 //
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 type RouteAction_InternalRedirectAction int32
 
 const (
@@ -348,7 +348,7 @@ func (RateLimit_Action_MetaData_Source) EnumDescriptor() ([]byte, []int) {
 // host header. This allows a single listener to service multiple top level domain path trees. Once
 // a virtual host is selected based on the domain, the routes are processed in order to see which
 // upstream cluster to route to or whether to perform a redirect.
-// [#next-free-field: 24]
+// [#next-free-field: 25]
 type VirtualHost struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -361,27 +361,27 @@ type VirtualHost struct {
 	// virtual host. Wildcard hosts are supported in the suffix or prefix form.
 	//
 	// Domain search order:
-	//  1. Exact domain names: ``www.foo.com``.
-	//  2. Suffix domain wildcards: ``*.foo.com`` or ``*-bar.foo.com``.
-	//  3. Prefix domain wildcards: ``foo.*`` or ``foo-*``.
-	//  4. Special wildcard ``*`` matching any domain.
+	//  1. Exact domain names: “www.foo.com“.
+	//  2. Suffix domain wildcards: “*.foo.com“ or “*-bar.foo.com“.
+	//  3. Prefix domain wildcards: “foo.*“ or “foo-*“.
+	//  4. Special wildcard “*“ matching any domain.
 	//
 	// .. note::
 	//
-	//   The wildcard will not match the empty string.
-	//   e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``.
-	//   The longest wildcards match first.
-	//   Only a single virtual host in the entire route configuration can match on ``*``. A domain
-	//   must be unique across all virtual hosts or the config will fail to load.
+	//	The wildcard will not match the empty string.
+	//	e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``.
+	//	The longest wildcards match first.
+	//	Only a single virtual host in the entire route configuration can match on ``*``. A domain
+	//	must be unique across all virtual hosts or the config will fail to load.
 	//
 	// Domains cannot contain control characters. This is validated by the well_known_regex HTTP_HEADER_VALUE.
 	Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"`
 	// The list of routes that will be matched, in order, for incoming requests.
 	// The first route that matches will be used.
-	// Only one of this and ``matcher`` can be specified.
+	// Only one of this and “matcher“ can be specified.
 	Routes []*Route `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes,omitempty"`
 	// [#next-major-version: This should be included in a oneof with routes wrapped in a message.]
-	// The match tree to use when resolving route actions for incoming requests. Only one of this and ``routes``
+	// The match tree to use when resolving route actions for incoming requests. Only one of this and “routes“
 	// can be specified.
 	Matcher *v3.Matcher `protobuf:"bytes,21,opt,name=matcher,proto3" json:"matcher,omitempty"`
 	// Specifies the type of TLS enforcement the virtual host expects. If this option is not
@@ -419,21 +419,17 @@ type VirtualHost struct {
 	//
 	// .. attention::
 	//
-	//   This option has been deprecated. Please use
-	//   :ref:`VirtualHost.typed_per_filter_config<envoy_v3_api_field_config.route.v3.VirtualHost.typed_per_filter_config>`
-	//   to configure the CORS HTTP filter.
+	//	This option has been deprecated. Please use
+	//	:ref:`VirtualHost.typed_per_filter_config<envoy_v3_api_field_config.route.v3.VirtualHost.typed_per_filter_config>`
+	//	to configure the CORS HTTP filter.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	Cors *CorsPolicy `protobuf:"bytes,8,opt,name=cors,proto3" json:"cors,omitempty"`
-	// The per_filter_config field can be used to provide virtual host-specific configurations for filters.
-	// The key should match the :ref:`filter config name
+	// This field can be used to provide virtual host level per filter config. The key should match the
+	// :ref:`filter config name
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpFilter.name>`.
-	// The canonical filter name (e.g., ``envoy.filters.http.buffer`` for the HTTP buffer filter) can also
-	// be used for the backwards compatibility. If there is no entry referred by the filter config name, the
-	// entry referred by the canonical filter name will be provided to the filters as fallback.
-	//
-	// Use of this field is filter specific;
-	// see the :ref:`HTTP filter documentation <config_http_filters>` for if and how it is utilized.
+	// See :ref:`Http filter route specific config <arch_overview_http_filters_per_filter_config>`
+	// for details.
 	// [#comment: An entry's value may be wrapped in a
 	// :ref:`FilterConfig<envoy_v3_api_msg_config.route.v3.FilterConfig>`
 	// message to specify additional options.]
@@ -483,6 +479,12 @@ type VirtualHost struct {
 	// It takes precedence over the route config mirror policy entirely.
 	// That is, policies are not merged, the most specific non-empty one becomes the mirror policies.
 	RequestMirrorPolicies []*RouteAction_RequestMirrorPolicy `protobuf:"bytes,22,rep,name=request_mirror_policies,json=requestMirrorPolicies,proto3" json:"request_mirror_policies,omitempty"`
+	// The metadata field can be used to provide additional information
+	// about the virtual host. It can be used for configuration, stats, and logging.
+	// The metadata should go under the filter namespace that will need it.
+	// For instance, if the metadata is intended for the Router filter,
+	// the filter name should be specified as “envoy.filters.http.router“.
+	Metadata *v31.Metadata `protobuf:"bytes,24,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (x *VirtualHost) Reset() {
@@ -594,7 +596,7 @@ func (x *VirtualHost) GetResponseHeadersToRemove() []string {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *VirtualHost) GetCors() *CorsPolicy {
 	if x != nil {
 		return x.Cors
@@ -665,6 +667,13 @@ func (x *VirtualHost) GetRequestMirrorPolicies() []*RouteAction_RequestMirrorPol
 	return nil
 }
 
+func (x *VirtualHost) GetMetadata() *v31.Metadata {
+	if x != nil {
+		return x.Metadata
+	}
+	return nil
+}
+
 // A filter-defined action type.
 type FilterAction struct {
 	state         protoimpl.MessageState
@@ -768,8 +777,9 @@ func (x *RouteList) GetRoutes() []*Route {
 //
 // .. attention::
 //
-//   Envoy supports routing on HTTP method via :ref:`header matching
-//   <envoy_v3_api_msg_config.route.v3.HeaderMatcher>`.
+//	Envoy supports routing on HTTP method via :ref:`header matching
+//	<envoy_v3_api_msg_config.route.v3.HeaderMatcher>`.
+//
 // [#next-free-field: 20]
 type Route struct {
 	state         protoimpl.MessageState
@@ -781,6 +791,7 @@ type Route struct {
 	// Route matching parameters.
 	Match *RouteMatch `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"`
 	// Types that are assignable to Action:
+	//
 	//	*Route_Route
 	//	*Route_Redirect
 	//	*Route_DirectResponse
@@ -791,19 +802,15 @@ type Route struct {
 	// about the route. It can be used for configuration, stats, and logging.
 	// The metadata should go under the filter namespace that will need it.
 	// For instance, if the metadata is intended for the Router filter,
-	// the filter name should be specified as ``envoy.filters.http.router``.
+	// the filter name should be specified as “envoy.filters.http.router“.
 	Metadata *v31.Metadata `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// Decorator for the matched route.
 	Decorator *Decorator `protobuf:"bytes,5,opt,name=decorator,proto3" json:"decorator,omitempty"`
-	// The per_filter_config field can be used to provide route-specific configurations for filters.
-	// The key should match the :ref:`filter config name
+	// This field can be used to provide route specific per filter config. The key should match the
+	// :ref:`filter config name
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpFilter.name>`.
-	// The canonical filter name (e.g., ``envoy.filters.http.buffer`` for the HTTP buffer filter) can also
-	// be used for the backwards compatibility. If there is no entry referred by the filter config name, the
-	// entry referred by the canonical filter name will be provided to the filters as fallback.
-	//
-	// Use of this field is filter specific;
-	// see the :ref:`HTTP filter documentation <config_http_filters>` for if and how it is utilized.
+	// See :ref:`Http filter route specific config <arch_overview_http_filters_per_filter_config>`
+	// for details.
 	// [#comment: An entry's value may be wrapped in a
 	// :ref:`FilterConfig<envoy_v3_api_msg_config.route.v3.FilterConfig>`
 	// message to specify additional options.]
@@ -845,9 +852,9 @@ type Route struct {
 	//
 	// .. warning::
 	//
-	//    We do not recommend setting up a stat prefix for
-	//    every application endpoint. This is both not easily maintainable and
-	//    statistics use a non-trivial amount of memory(approximately 1KiB per route).
+	//	We do not recommend setting up a stat prefix for
+	//	every application endpoint. This is both not easily maintainable and
+	//	statistics use a non-trivial amount of memory(approximately 1KiB per route).
 	StatPrefix string `protobuf:"bytes,19,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 }
 
@@ -1073,18 +1080,19 @@ type WeightedCluster struct {
 	// This field is now deprecated, and the client will use the sum of all
 	// cluster weights. It is up to the management server to supply the correct weights.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	TotalWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"`
 	// Specifies the runtime key prefix that should be used to construct the
-	// runtime keys associated with each cluster. When the ``runtime_key_prefix`` is
+	// runtime keys associated with each cluster. When the “runtime_key_prefix“ is
 	// specified, the router will look for weights associated with each upstream
-	// cluster under the key ``runtime_key_prefix`` + ``.`` + ``cluster[i].name`` where
-	// ``cluster[i]`` denotes an entry in the clusters array field. If the runtime
+	// cluster under the key “runtime_key_prefix“ + “.“ + “cluster[i].name“ where
+	// “cluster[i]“ denotes an entry in the clusters array field. If the runtime
 	// key for the cluster does not exist, the value specified in the
 	// configuration file will be used as the default weight. See the :ref:`runtime documentation
 	// <operations_runtime>` for how key names map to the underlying implementation.
 	RuntimeKeyPrefix string `protobuf:"bytes,2,opt,name=runtime_key_prefix,json=runtimeKeyPrefix,proto3" json:"runtime_key_prefix,omitempty"`
 	// Types that are assignable to RandomValueSpecifier:
+	//
 	//	*WeightedCluster_HeaderName
 	RandomValueSpecifier isWeightedCluster_RandomValueSpecifier `protobuf_oneof:"random_value_specifier"`
 }
@@ -1128,7 +1136,7 @@ func (x *WeightedCluster) GetClusters() []*WeightedCluster_ClusterWeight {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *WeightedCluster) GetTotalWeight() *wrappers.UInt32Value {
 	if x != nil {
 		return x.TotalWeight
@@ -1241,6 +1249,7 @@ type RouteMatch struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PathSpecifier:
+	//
 	//	*RouteMatch_Prefix
 	//	*RouteMatch_Path
 	//	*RouteMatch_SafeRegex
@@ -1262,11 +1271,11 @@ type RouteMatch struct {
 	//
 	// .. note::
 	//
-	//    Parsing this field is implemented such that the runtime key's data may be represented
-	//    as a FractionalPercent proto represented as JSON/YAML and may also be represented as an
-	//    integer with the assumption that the value is an integral percentage out of 100. For
-	//    instance, a runtime key lookup returning the value "42" would parse as a FractionalPercent
-	//    whose numerator is 42 and denominator is HUNDRED. This preserves legacy semantics.
+	//	Parsing this field is implemented such that the runtime key's data may be represented
+	//	as a FractionalPercent proto represented as JSON/YAML and may also be represented as an
+	//	integer with the assumption that the value is an integral percentage out of 100. For
+	//	instance, a runtime key lookup returning the value "42" would parse as a FractionalPercent
+	//	whose numerator is 42 and denominator is HUNDRED. This preserves legacy semantics.
 	RuntimeFraction *v31.RuntimeFractionalPercent `protobuf:"bytes,9,opt,name=runtime_fraction,json=runtimeFraction,proto3" json:"runtime_fraction,omitempty"`
 	// Specifies a set of headers that the route should match on. The router will
 	// check the request’s headers against all the specified headers in the route
@@ -1275,18 +1284,19 @@ type RouteMatch struct {
 	// is not in the config).
 	Headers []*HeaderMatcher `protobuf:"bytes,6,rep,name=headers,proto3" json:"headers,omitempty"`
 	// Specifies a set of URL query parameters on which the route should
-	// match. The router will check the query string from the ``path`` header
+	// match. The router will check the query string from the “path“ header
 	// against all the specified query parameters. If the number of specified
-	// query parameters is nonzero, they all must match the ``path`` header's
-	// query string for a match to occur.
+	// query parameters is nonzero, they all must match the “path“ header's
+	// query string for a match to occur. In the event query parameters are
+	// repeated, only the first value for each key will be considered.
 	//
 	// .. note::
 	//
-	//    If query parameters are used to pass request message fields when
-	//    `grpc_json_transcoder <https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/grpc_json_transcoder_filter>`_
-	//    is used, the transcoded message fields maybe different. The query parameters are
-	//    url encoded, but the message fields are not. For example, if a query
-	//    parameter is "foo%20bar", the message field will be "foo bar".
+	//	If query parameters are used to pass request message fields when
+	//	`grpc_json_transcoder <https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/grpc_json_transcoder_filter>`_
+	//	is used, the transcoded message fields maybe different. The query parameters are
+	//	url encoded, but the message fields are not. For example, if a query
+	//	parameter is "foo%20bar", the message field will be "foo bar".
 	QueryParameters []*QueryParameterMatcher `protobuf:"bytes,7,rep,name=query_parameters,json=queryParameters,proto3" json:"query_parameters,omitempty"`
 	// If specified, only gRPC requests will be matched. The router will check
 	// that the content-type header has a application/grpc or one of the various
@@ -1440,21 +1450,21 @@ type isRouteMatch_PathSpecifier interface {
 
 type RouteMatch_Prefix struct {
 	// If specified, the route is a prefix rule meaning that the prefix must
-	// match the beginning of the ``:path`` header.
+	// match the beginning of the “:path“ header.
 	Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3,oneof"`
 }
 
 type RouteMatch_Path struct {
 	// If specified, the route is an exact path rule meaning that the path must
-	// exactly match the ``:path`` header once the query string is removed.
+	// exactly match the “:path“ header once the query string is removed.
 	Path string `protobuf:"bytes,2,opt,name=path,proto3,oneof"`
 }
 
 type RouteMatch_SafeRegex struct {
 	// If specified, the route is a regular expression rule meaning that the
-	// regex must match the ``:path`` header once the query string is removed. The entire path
+	// regex must match the “:path“ header once the query string is removed. The entire path
 	// (without the query string) must match the regex. The rule will not match if only a
-	// subsequence of the ``:path`` header matches the regex.
+	// subsequence of the “:path“ header matches the regex.
 	//
 	// [#next-major-version: In the v3 API we should redo how path specification works such
 	// that we utilize StringMatcher, and additionally have consistent options around whether we
@@ -1467,11 +1477,10 @@ type RouteMatch_SafeRegex struct {
 }
 
 type RouteMatch_ConnectMatcher_ struct {
-	// If this is used as the matcher, the matcher will only match CONNECT requests.
-	// Note that this will not match HTTP/2 upgrade-style CONNECT requests
-	// (WebSocket and the like) as they are normalized in Envoy as HTTP/1.1 style
-	// upgrades.
-	// This is the only way to match CONNECT requests for HTTP/1.1. For HTTP/2,
+	// If this is used as the matcher, the matcher will only match CONNECT or CONNECT-UDP requests.
+	// Note that this will not match other Extended CONNECT requests (WebSocket and the like) as
+	// they are normalized in Envoy as HTTP/1.1 style upgrades.
+	// This is the only way to match CONNECT requests for HTTP/1.1. For HTTP/2 and HTTP/3,
 	// where Extended CONNECT requests may have a path, the path matchers will work if
 	// there is a path present.
 	// Note that CONNECT support is currently considered alpha in Envoy.
@@ -1481,14 +1490,14 @@ type RouteMatch_ConnectMatcher_ struct {
 
 type RouteMatch_PathSeparatedPrefix struct {
 	// If specified, the route is a path-separated prefix rule meaning that the
-	// ``:path`` header (without the query string) must either exactly match the
-	// ``path_separated_prefix`` or have it as a prefix, followed by ``/``
+	// “:path“ header (without the query string) must either exactly match the
+	// “path_separated_prefix“ or have it as a prefix, followed by “/“
 	//
-	// For example, ``/api/dev`` would match
-	// ``/api/dev``, ``/api/dev/``, ``/api/dev/v1``, and ``/api/dev?param=true``
-	// but would not match ``/api/developer``
+	// For example, “/api/dev“ would match
+	// “/api/dev“, “/api/dev/“, “/api/dev/v1“, and “/api/dev?param=true“
+	// but would not match “/api/developer“
 	//
-	// Expect the value to not contain ``?`` or ``#`` and not to end in ``/``
+	// Expect the value to not contain “?“ or “#“ and not to end in “/“
 	PathSeparatedPrefix string `protobuf:"bytes,14,opt,name=path_separated_prefix,json=pathSeparatedPrefix,proto3,oneof"`
 }
 
@@ -1513,9 +1522,9 @@ func (*RouteMatch_PathMatchPolicy) isRouteMatch_PathSpecifier() {}
 //
 // .. attention::
 //
-//   This message has been deprecated. Please use
-//   :ref:`CorsPolicy in filter extension <envoy_v3_api_msg_extensions.filters.http.cors.v3.CorsPolicy>`
-//   as as alternative.
+//	This message has been deprecated. Please use
+//	:ref:`CorsPolicy in filter extension <envoy_v3_api_msg_extensions.filters.http.cors.v3.CorsPolicy>`
+//	as as alternative.
 //
 // [#next-free-field: 13]
 type CorsPolicy struct {
@@ -1526,28 +1535,29 @@ type CorsPolicy struct {
 	// Specifies string patterns that match allowed origins. An origin is allowed if any of the
 	// string matchers match.
 	AllowOriginStringMatch []*v32.StringMatcher `protobuf:"bytes,11,rep,name=allow_origin_string_match,json=allowOriginStringMatch,proto3" json:"allow_origin_string_match,omitempty"`
-	// Specifies the content for the ``access-control-allow-methods`` header.
+	// Specifies the content for the “access-control-allow-methods“ header.
 	AllowMethods string `protobuf:"bytes,2,opt,name=allow_methods,json=allowMethods,proto3" json:"allow_methods,omitempty"`
-	// Specifies the content for the ``access-control-allow-headers`` header.
+	// Specifies the content for the “access-control-allow-headers“ header.
 	AllowHeaders string `protobuf:"bytes,3,opt,name=allow_headers,json=allowHeaders,proto3" json:"allow_headers,omitempty"`
-	// Specifies the content for the ``access-control-expose-headers`` header.
+	// Specifies the content for the “access-control-expose-headers“ header.
 	ExposeHeaders string `protobuf:"bytes,4,opt,name=expose_headers,json=exposeHeaders,proto3" json:"expose_headers,omitempty"`
-	// Specifies the content for the ``access-control-max-age`` header.
+	// Specifies the content for the “access-control-max-age“ header.
 	MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"`
 	// Specifies whether the resource allows credentials.
 	AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"`
 	// Types that are assignable to EnabledSpecifier:
+	//
 	//	*CorsPolicy_FilterEnabled
 	EnabledSpecifier isCorsPolicy_EnabledSpecifier `protobuf_oneof:"enabled_specifier"`
 	// Specifies the % of requests for which the CORS policies will be evaluated and tracked, but not
 	// enforced.
 	//
-	// This field is intended to be used when ``filter_enabled`` and ``enabled`` are off. One of those
+	// This field is intended to be used when “filter_enabled“ and “enabled“ are off. One of those
 	// fields have to explicitly disable the filter in order for this setting to take effect.
 	//
 	// If :ref:`runtime_key <envoy_v3_api_field_config.core.v3.RuntimeFractionalPercent.runtime_key>` is specified,
 	// Envoy will lookup the runtime key to get the percentage of requests for which it will evaluate
-	// and track the request's ``Origin`` to determine if it's valid but will not enforce any policies.
+	// and track the request's “Origin“ to determine if it's valid but will not enforce any policies.
 	ShadowEnabled *v31.RuntimeFractionalPercent `protobuf:"bytes,10,opt,name=shadow_enabled,json=shadowEnabled,proto3" json:"shadow_enabled,omitempty"`
 	// Specify whether allow requests whose target server's IP address is more private than that from
 	// which the request initiator was fetched.
@@ -1665,7 +1675,7 @@ type isCorsPolicy_EnabledSpecifier interface {
 type CorsPolicy_FilterEnabled struct {
 	// Specifies the % of requests for which the CORS filter is enabled.
 	//
-	// If neither ``enabled``, ``filter_enabled``, nor ``shadow_enabled`` are specified, the CORS
+	// If neither “enabled“, “filter_enabled“, nor “shadow_enabled“ are specified, the CORS
 	// filter will be enabled for 100% of the requests.
 	//
 	// If :ref:`runtime_key <envoy_v3_api_field_config.core.v3.RuntimeFractionalPercent.runtime_key>` is
@@ -1682,6 +1692,7 @@ type RouteAction struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ClusterSpecifier:
+	//
 	//	*RouteAction_Cluster
 	//	*RouteAction_ClusterHeader
 	//	*RouteAction_WeightedClusters
@@ -1695,7 +1706,7 @@ type RouteAction struct {
 	// in the upstream cluster with metadata matching what's set in this field will be considered
 	// for load balancing. If using :ref:`weighted_clusters
 	// <envoy_v3_api_field_config.route.v3.RouteAction.weighted_clusters>`, metadata will be merged, with values
-	// provided there taking precedence. The filter name should be specified as ``envoy.lb``.
+	// provided there taking precedence. The filter name should be specified as “envoy.lb“.
 	MetadataMatch *v31.Metadata `protobuf:"bytes,4,opt,name=metadata_match,json=metadataMatch,proto3" json:"metadata_match,omitempty"`
 	// Indicates that during forwarding, the matched prefix (or path) should be
 	// swapped with this value. This option allows application URLs to be rooted
@@ -1709,25 +1720,25 @@ type RouteAction struct {
 	//
 	// .. attention::
 	//
-	//   Pay careful attention to the use of trailing slashes in the
-	//   :ref:`route's match <envoy_v3_api_field_config.route.v3.Route.match>` prefix value.
-	//   Stripping a prefix from a path requires multiple Routes to handle all cases. For example,
-	//   rewriting ``/prefix`` to ``/`` and ``/prefix/etc`` to ``/etc`` cannot be done in a single
-	//   :ref:`Route <envoy_v3_api_msg_config.route.v3.Route>`, as shown by the below config entries:
-	//
-	//   .. code-block:: yaml
-	//
-	//     - match:
-	//         prefix: "/prefix/"
-	//       route:
-	//         prefix_rewrite: "/"
-	//     - match:
-	//         prefix: "/prefix"
-	//       route:
-	//         prefix_rewrite: "/"
-	//
-	//   Having above entries in the config, requests to ``/prefix`` will be stripped to ``/``, while
-	//   requests to ``/prefix/etc`` will be stripped to ``/etc``.
+	//	Pay careful attention to the use of trailing slashes in the
+	//	:ref:`route's match <envoy_v3_api_field_config.route.v3.Route.match>` prefix value.
+	//	Stripping a prefix from a path requires multiple Routes to handle all cases. For example,
+	//	rewriting ``/prefix`` to ``/`` and ``/prefix/etc`` to ``/etc`` cannot be done in a single
+	//	:ref:`Route <envoy_v3_api_msg_config.route.v3.Route>`, as shown by the below config entries:
+	//
+	//	.. code-block:: yaml
+	//
+	//	  - match:
+	//	      prefix: "/prefix/"
+	//	    route:
+	//	      prefix_rewrite: "/"
+	//	  - match:
+	//	      prefix: "/prefix"
+	//	    route:
+	//	      prefix_rewrite: "/"
+	//
+	//	Having above entries in the config, requests to ``/prefix`` will be stripped to ``/``, while
+	//	requests to ``/prefix/etc`` will be stripped to ``/etc``.
 	PrefixRewrite string `protobuf:"bytes,5,opt,name=prefix_rewrite,json=prefixRewrite,proto3" json:"prefix_rewrite,omitempty"`
 	// Indicates that during forwarding, portions of the path that match the
 	// pattern should be rewritten, even allowing the substitution of capture
@@ -1745,24 +1756,25 @@ type RouteAction struct {
 	//
 	// Examples using Google's `RE2 <https://github.com/google/re2>`_ engine:
 	//
-	// * The path pattern ``^/service/([^/]+)(/.*)$`` paired with a substitution
-	//   string of ``\2/instance/\1`` would transform ``/service/foo/v1/api``
-	//   into ``/v1/api/instance/foo``.
+	//   - The path pattern “^/service/([^/]+)(/.*)$“ paired with a substitution
+	//     string of “\2/instance/\1“ would transform “/service/foo/v1/api“
+	//     into “/v1/api/instance/foo“.
 	//
-	// * The pattern ``one`` paired with a substitution string of ``two`` would
-	//   transform ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/two/zzz``.
+	//   - The pattern “one“ paired with a substitution string of “two“ would
+	//     transform “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/two/zzz“.
 	//
-	// * The pattern ``^(.*?)one(.*)$`` paired with a substitution string of
-	//   ``\1two\2`` would replace only the first occurrence of ``one``,
-	//   transforming path ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/one/zzz``.
+	//   - The pattern “^(.*?)one(.*)$“ paired with a substitution string of
+	//     “\1two\2“ would replace only the first occurrence of “one“,
+	//     transforming path “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/one/zzz“.
 	//
-	// * The pattern ``(?i)/xxx/`` paired with a substitution string of ``/yyy/``
-	//   would do a case-insensitive match and transform path ``/aaa/XxX/bbb`` to
-	//   ``/aaa/yyy/bbb``.
+	//   - The pattern “(?i)/xxx/“ paired with a substitution string of “/yyy/“
+	//     would do a case-insensitive match and transform path “/aaa/XxX/bbb“ to
+	//     “/aaa/yyy/bbb“.
 	RegexRewrite *v32.RegexMatchAndSubstitute `protobuf:"bytes,32,opt,name=regex_rewrite,json=regexRewrite,proto3" json:"regex_rewrite,omitempty"`
 	// [#extension-category: envoy.path.rewrite]
 	PathRewritePolicy *v31.TypedExtensionConfig `protobuf:"bytes,41,opt,name=path_rewrite_policy,json=pathRewritePolicy,proto3" json:"path_rewrite_policy,omitempty"`
 	// Types that are assignable to HostRewriteSpecifier:
+	//
 	//	*RouteAction_HostRewriteLiteral
 	//	*RouteAction_AutoHostRewrite
 	//	*RouteAction_HostRewriteHeader
@@ -1775,7 +1787,7 @@ type RouteAction struct {
 	// :ref:`host_rewrite_path_regex <envoy_v3_api_field_config.route.v3.RouteAction.host_rewrite_path_regex>`)
 	// causes the original value of the host header, if any, to be appended to the
 	// :ref:`config_http_conn_man_headers_x-forwarded-host` HTTP header if it is different to the last value appended.
-	// This can be disabled by setting the runtime guard `envoy_reloadable_features_append_xfh_idempotent` to false.
+	// This can be disabled by setting the runtime guard “envoy_reloadable_features_append_xfh_idempotent“ to false.
 	AppendXForwardedHost bool `protobuf:"varint,38,opt,name=append_x_forwarded_host,json=appendXForwardedHost,proto3" json:"append_x_forwarded_host,omitempty"`
 	// Specifies the upstream timeout for the route. If not specified, the default is 15s. This
 	// spans between the point at which the entire downstream request (i.e. end-of-stream) has been
@@ -1784,10 +1796,10 @@ type RouteAction struct {
 	//
 	// .. note::
 	//
-	//   This timeout includes all retries. See also
-	//   :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
-	//   :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
-	//   :ref:`retry overview <arch_overview_http_routing_retry>`.
+	//	This timeout includes all retries. See also
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
+	//	:ref:`retry overview <arch_overview_http_routing_retry>`.
 	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout,
 	// although the connection manager wide :ref:`stream_idle_timeout
@@ -1842,7 +1854,7 @@ type RouteAction struct {
 	//
 	// This field is deprecated. Please use :ref:`vh_rate_limits <envoy_v3_api_field_extensions.filters.http.ratelimit.v3.RateLimitPerRoute.vh_rate_limits>`
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	IncludeVhRateLimits *wrappers.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"`
 	// Specifies a list of hash policies to use for ring hash load balancing. Each
 	// hash policy is evaluated individually and the combined result is used to
@@ -1863,12 +1875,12 @@ type RouteAction struct {
 	//
 	// .. attention::
 	//
-	//   This option has been deprecated. Please use
-	//   :ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>` or
-	//   :ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
-	//   to configure the CORS HTTP filter.
+	//	This option has been deprecated. Please use
+	//	:ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>` or
+	//	:ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
+	//	to configure the CORS HTTP filter.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	Cors *CorsPolicy `protobuf:"bytes,17,opt,name=cors,proto3" json:"cors,omitempty"`
 	// Deprecated by :ref:`grpc_timeout_header_max <envoy_v3_api_field_config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max>`
 	// If present, and the request is a gRPC request, use the
@@ -1876,7 +1888,7 @@ type RouteAction struct {
 	// or its default value (infinity) instead of
 	// :ref:`timeout <envoy_v3_api_field_config.route.v3.RouteAction.timeout>`, but limit the applied timeout
 	// to the maximum value specified here. If configured as 0, the maximum allowed timeout for
-	// gRPC requests is infinity. If not configured at all, the ``grpc-timeout`` header is not used
+	// gRPC requests is infinity. If not configured at all, the “grpc-timeout“ header is not used
 	// and gRPC requests time out like any other requests using
 	// :ref:`timeout <envoy_v3_api_field_config.route.v3.RouteAction.timeout>` or its default.
 	// This can be used to prevent unexpected upstream request timeouts due to potentially long
@@ -1884,17 +1896,17 @@ type RouteAction struct {
 	//
 	// .. note::
 	//
-	//    If a timeout is specified using :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, it takes
-	//    precedence over `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_, when
-	//    both are present. See also
-	//    :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
-	//    :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
-	//    :ref:`retry overview <arch_overview_http_routing_retry>`.
+	//	If a timeout is specified using :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, it takes
+	//	precedence over `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_, when
+	//	both are present. See also
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
+	//	:ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
+	//	:ref:`retry overview <arch_overview_http_routing_retry>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"`
 	// Deprecated by :ref:`grpc_timeout_header_offset <envoy_v3_api_field_config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_offset>`.
-	// If present, Envoy will adjust the timeout provided by the ``grpc-timeout`` header by subtracting
+	// If present, Envoy will adjust the timeout provided by the “grpc-timeout“ header by subtracting
 	// the provided duration from the header. This is useful in allowing Envoy to set its global
 	// timeout to be less than that of the deadline imposed by the calling client, which makes it more
 	// likely that Envoy will handle the timeout instead of having the call canceled by the client.
@@ -1902,7 +1914,7 @@ type RouteAction struct {
 	// ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning
 	// infinity).
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	GrpcTimeoutOffset *duration.Duration           `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"`
 	UpgradeConfigs    []*RouteAction_UpgradeConfig `protobuf:"bytes,25,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"`
 	// If present, Envoy will try to follow an upstream redirect response instead of proxying the
@@ -1910,7 +1922,7 @@ type RouteAction struct {
 	// by :ref:`redirect_response_codes
 	// <envoy_v3_api_field_config.route.v3.InternalRedirectPolicy.redirect_response_codes>`.
 	InternalRedirectPolicy *InternalRedirectPolicy `protobuf:"bytes,34,opt,name=internal_redirect_policy,json=internalRedirectPolicy,proto3" json:"internal_redirect_policy,omitempty"`
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	InternalRedirectAction RouteAction_InternalRedirectAction `protobuf:"varint,26,opt,name=internal_redirect_action,json=internalRedirectAction,proto3,enum=envoy.config.route.v3.RouteAction_InternalRedirectAction" json:"internal_redirect_action,omitempty"`
 	// An internal redirect is handled, iff the number of previous internal redirects that a
 	// downstream request has encountered is lower than this value, and
@@ -1927,7 +1939,7 @@ type RouteAction struct {
 	//
 	// If not specified, at most one redirect will be followed.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"`
 	// Indicates that the route has a hedge policy. Note that if this is set,
 	// it'll take precedence over the virtual host level hedge policy entirely
@@ -2144,7 +2156,7 @@ func (x *RouteAction) GetRateLimits() []*RateLimit {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetIncludeVhRateLimits() *wrappers.BoolValue {
 	if x != nil {
 		return x.IncludeVhRateLimits
@@ -2159,7 +2171,7 @@ func (x *RouteAction) GetHashPolicy() []*RouteAction_HashPolicy {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetCors() *CorsPolicy {
 	if x != nil {
 		return x.Cors
@@ -2167,7 +2179,7 @@ func (x *RouteAction) GetCors() *CorsPolicy {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration {
 	if x != nil {
 		return x.MaxGrpcTimeout
@@ -2175,7 +2187,7 @@ func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetGrpcTimeoutOffset() *duration.Duration {
 	if x != nil {
 		return x.GrpcTimeoutOffset
@@ -2197,7 +2209,7 @@ func (x *RouteAction) GetInternalRedirectPolicy() *InternalRedirectPolicy {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetInternalRedirectAction() RouteAction_InternalRedirectAction {
 	if x != nil {
 		return x.InternalRedirectAction
@@ -2205,7 +2217,7 @@ func (x *RouteAction) GetInternalRedirectAction() RouteAction_InternalRedirectAc
 	return RouteAction_PASS_THROUGH_INTERNAL_REDIRECT
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RouteAction) GetMaxInternalRedirects() *wrappers.UInt32Value {
 	if x != nil {
 		return x.MaxInternalRedirects
@@ -2245,12 +2257,12 @@ type RouteAction_ClusterHeader struct {
 	//
 	// .. attention::
 	//
-	//   Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
-	//   ``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
+	//	Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
+	//	``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	ClusterHeader string `protobuf:"bytes,2,opt,name=cluster_header,json=clusterHeader,proto3,oneof"`
 }
 
@@ -2304,7 +2316,9 @@ type RouteAction_AutoHostRewrite struct {
 	// Indicates that during forwarding, the host header will be swapped with
 	// the hostname of the upstream host chosen by the cluster manager. This
 	// option is applicable only when the destination cluster for a route is of
-	// type ``strict_dns`` or ``logical_dns``. Setting this to true with other cluster types
+	// type “strict_dns“ or “logical_dns“,
+	// or when :ref:`hostname <envoy_v3_api_field_config.endpoint.v3.Endpoint.hostname>`
+	// field is not empty. Setting this to true with other cluster types
 	// has no effect. Using this option will append the
 	// :ref:`config_http_conn_man_headers_x-forwarded-host` header if
 	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
@@ -2322,12 +2336,12 @@ type RouteAction_HostRewriteHeader struct {
 	//
 	// .. attention::
 	//
-	//   Pay attention to the potential security implications of using this option. Provided header
-	//   must come from trusted source.
+	//	Pay attention to the potential security implications of using this option. Provided header
+	//	must come from trusted source.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	HostRewriteHeader string `protobuf:"bytes,29,opt,name=host_rewrite_header,json=hostRewriteHeader,proto3,oneof"`
 }
 
@@ -2342,15 +2356,15 @@ type RouteAction_HostRewritePathRegex struct {
 	//
 	// For example with the following config:
 	//
-	//   .. code-block:: yaml
+	//	.. code-block:: yaml
 	//
-	//     host_rewrite_path_regex:
-	//       pattern:
-	//         google_re2: {}
-	//         regex: "^/(.+)/.+$"
-	//       substitution: \1
+	//	  host_rewrite_path_regex:
+	//	    pattern:
+	//	      google_re2: {}
+	//	      regex: "^/(.+)/.+$"
+	//	    substitution: \1
 	//
-	// Would rewrite the host header to ``envoyproxy.io`` given the path ``/envoyproxy.io/some/path``.
+	// Would rewrite the host header to “envoyproxy.io“ given the path “/envoyproxy.io/some/path“.
 	HostRewritePathRegex *v32.RegexMatchAndSubstitute `protobuf:"bytes,35,opt,name=host_rewrite_path_regex,json=hostRewritePathRegex,proto3,oneof"`
 }
 
@@ -2383,11 +2397,11 @@ type RetryPolicy struct {
 	//
 	// .. note::
 	//
-	//   If left unspecified, Envoy will use the global
-	//   :ref:`route timeout <envoy_v3_api_field_config.route.v3.RouteAction.timeout>` for the request.
-	//   Consequently, when using a :ref:`5xx <config_http_filters_router_x-envoy-retry-on>` based
-	//   retry policy, a request that times out will not be retried as the total timeout budget
-	//   would have been exhausted.
+	//	If left unspecified, Envoy will use the global
+	//	:ref:`route timeout <envoy_v3_api_field_config.route.v3.RouteAction.timeout>` for the request.
+	//	Consequently, when using a :ref:`5xx <config_http_filters_router_x-envoy-retry-on>` based
+	//	retry policy, a request that times out will not be retried as the total timeout budget
+	//	would have been exhausted.
 	PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"`
 	// Specifies an upstream idle timeout per retry attempt (including the initial attempt). This
 	// parameter is optional and if absent there is no per try idle timeout. The semantics of the per
@@ -2430,16 +2444,16 @@ type RetryPolicy struct {
 	RetriableStatusCodes []uint32 `protobuf:"varint,7,rep,packed,name=retriable_status_codes,json=retriableStatusCodes,proto3" json:"retriable_status_codes,omitempty"`
 	// Specifies parameters that control exponential retry back off. This parameter is optional, in which case the
 	// default base interval is 25 milliseconds or, if set, the current value of the
-	// ``upstream.base_retry_backoff_ms`` runtime parameter. The default maximum interval is 10 times
+	// “upstream.base_retry_backoff_ms“ runtime parameter. The default maximum interval is 10 times
 	// the base interval. The documentation for :ref:`config_http_filters_router_x-envoy-max-retries`
 	// describes Envoy's back-off algorithm.
 	RetryBackOff *RetryPolicy_RetryBackOff `protobuf:"bytes,8,opt,name=retry_back_off,json=retryBackOff,proto3" json:"retry_back_off,omitempty"`
 	// Specifies parameters that control a retry back-off strategy that is used
 	// when the request is rate limited by the upstream server. The server may
-	// return a response header like ``Retry-After`` or ``X-RateLimit-Reset`` to
+	// return a response header like “Retry-After“ or “X-RateLimit-Reset“ to
 	// provide feedback to the client on how long to wait before retrying. If
 	// configured, this back-off strategy will be used instead of the
-	// default exponential back off strategy (configured using ``retry_back_off``)
+	// default exponential back off strategy (configured using “retry_back_off“)
 	// whenever a response includes the matching headers.
 	RateLimitedRetryBackOff *RetryPolicy_RateLimitedRetryBackOff `protobuf:"bytes,11,opt,name=rate_limited_retry_back_off,json=rateLimitedRetryBackOff,proto3" json:"rate_limited_retry_back_off,omitempty"`
 	// HTTP response headers that trigger a retry if present in the response. A retry will be
@@ -2593,10 +2607,10 @@ type HedgePolicy struct {
 	// This means that a retry will be issued without resetting the original request, leaving multiple upstream requests in flight.
 	// The first request to complete successfully will be the one returned to the caller.
 	//
-	// * At any time, a successful response (i.e. not triggering any of the retry-on conditions) would be returned to the client.
-	// * Before per-try timeout, an error response (per retry-on conditions) would be retried immediately or returned ot the client
-	//   if there are no more retries left.
-	// * After per-try timeout, an error response would be discarded, as a retry in the form of a hedged request is already in progress.
+	//   - At any time, a successful response (i.e. not triggering any of the retry-on conditions) would be returned to the client.
+	//   - Before per-try timeout, an error response (per retry-on conditions) would be retried immediately or returned ot the client
+	//     if there are no more retries left.
+	//   - After per-try timeout, an error response would be discarded, as a retry in the form of a hedged request is already in progress.
 	//
 	// Note: For this to have effect, you must have a :ref:`RetryPolicy <envoy_v3_api_msg_config.route.v3.RetryPolicy>` that retries at least
 	// one error code and specifies a maximum number of retries.
@@ -2665,12 +2679,13 @@ type RedirectAction struct {
 	unknownFields protoimpl.UnknownFields
 
 	// When the scheme redirection take place, the following rules apply:
-	//  1. If the source URI scheme is ``http`` and the port is explicitly
-	//     set to ``:80``, the port will be removed after the redirection
-	//  2. If the source URI scheme is ``https`` and the port is explicitly
-	//     set to ``:443``, the port will be removed after the redirection
+	//  1. If the source URI scheme is “http“ and the port is explicitly
+	//     set to “:80“, the port will be removed after the redirection
+	//  2. If the source URI scheme is “https“ and the port is explicitly
+	//     set to “:443“, the port will be removed after the redirection
 	//
 	// Types that are assignable to SchemeRewriteSpecifier:
+	//
 	//	*RedirectAction_HttpsRedirect
 	//	*RedirectAction_SchemeRedirect
 	SchemeRewriteSpecifier isRedirectAction_SchemeRewriteSpecifier `protobuf_oneof:"scheme_rewrite_specifier"`
@@ -2679,6 +2694,7 @@ type RedirectAction struct {
 	// The port value of the URL will be swapped with this value.
 	PortRedirect uint32 `protobuf:"varint,8,opt,name=port_redirect,json=portRedirect,proto3" json:"port_redirect,omitempty"`
 	// Types that are assignable to PathRewriteSpecifier:
+	//
 	//	*RedirectAction_PathRedirect
 	//	*RedirectAction_PrefixRewrite
 	//	*RedirectAction_RegexRewrite
@@ -2829,12 +2845,12 @@ type RedirectAction_PathRedirect struct {
 	//
 	// For example, let's say we have the following routes:
 	//
-	// - match: { path: "/old-path-1" }
-	//   redirect: { path_redirect: "/new-path-1" }
-	// - match: { path: "/old-path-2" }
-	//   redirect: { path_redirect: "/new-path-2", strip-query: "true" }
-	// - match: { path: "/old-path-3" }
-	//   redirect: { path_redirect: "/new-path-3?foo=1", strip_query: "true" }
+	//   - match: { path: "/old-path-1" }
+	//     redirect: { path_redirect: "/new-path-1" }
+	//   - match: { path: "/old-path-2" }
+	//     redirect: { path_redirect: "/new-path-2", strip-query: "true" }
+	//   - match: { path: "/old-path-3" }
+	//     redirect: { path_redirect: "/new-path-3?foo=1", strip_query: "true" }
 	//
 	// 1. if request uri is "/old-path-1?bar=1", users will be redirected to "/new-path-1?bar=1"
 	// 2. if request uri is "/old-path-2?bar=1", users will be redirected to "/new-path-2"
@@ -2849,8 +2865,8 @@ type RedirectAction_PrefixRewrite struct {
 	//
 	// .. attention::
 	//
-	//   Pay attention to the use of trailing slashes as mentioned in
-	//   :ref:`RouteAction's prefix_rewrite <envoy_v3_api_field_config.route.v3.RouteAction.prefix_rewrite>`.
+	//	Pay attention to the use of trailing slashes as mentioned in
+	//	:ref:`RouteAction's prefix_rewrite <envoy_v3_api_field_config.route.v3.RouteAction.prefix_rewrite>`.
 	PrefixRewrite string `protobuf:"bytes,5,opt,name=prefix_rewrite,json=prefixRewrite,proto3,oneof"`
 }
 
@@ -2864,20 +2880,20 @@ type RedirectAction_RegexRewrite struct {
 	//
 	// Examples using Google's `RE2 <https://github.com/google/re2>`_ engine:
 	//
-	// * The path pattern ``^/service/([^/]+)(/.*)$`` paired with a substitution
-	//   string of ``\2/instance/\1`` would transform ``/service/foo/v1/api``
-	//   into ``/v1/api/instance/foo``.
+	//   - The path pattern “^/service/([^/]+)(/.*)$“ paired with a substitution
+	//     string of “\2/instance/\1“ would transform “/service/foo/v1/api“
+	//     into “/v1/api/instance/foo“.
 	//
-	// * The pattern ``one`` paired with a substitution string of ``two`` would
-	//   transform ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/two/zzz``.
+	//   - The pattern “one“ paired with a substitution string of “two“ would
+	//     transform “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/two/zzz“.
 	//
-	// * The pattern ``^(.*?)one(.*)$`` paired with a substitution string of
-	//   ``\1two\2`` would replace only the first occurrence of ``one``,
-	//   transforming path ``/xxx/one/yyy/one/zzz`` into ``/xxx/two/yyy/one/zzz``.
+	//   - The pattern “^(.*?)one(.*)$“ paired with a substitution string of
+	//     “\1two\2“ would replace only the first occurrence of “one“,
+	//     transforming path “/xxx/one/yyy/one/zzz“ into “/xxx/two/yyy/one/zzz“.
 	//
-	// * The pattern ``(?i)/xxx/`` paired with a substitution string of ``/yyy/``
-	//   would do a case-insensitive match and transform path ``/aaa/XxX/bbb`` to
-	//   ``/aaa/yyy/bbb``.
+	//   - The pattern “(?i)/xxx/“ paired with a substitution string of “/yyy/“
+	//     would do a case-insensitive match and transform path “/aaa/XxX/bbb“ to
+	//     “/aaa/yyy/bbb“.
 	RegexRewrite *v32.RegexMatchAndSubstitute `protobuf:"bytes,9,opt,name=regex_rewrite,json=regexRewrite,proto3,oneof"`
 }
 
@@ -2899,9 +2915,9 @@ type DirectResponseAction struct {
 	//
 	// .. note::
 	//
-	//   Headers can be specified using ``response_headers_to_add`` in the enclosing
-	//   :ref:`envoy_v3_api_msg_config.route.v3.Route`, :ref:`envoy_v3_api_msg_config.route.v3.RouteConfiguration` or
-	//   :ref:`envoy_v3_api_msg_config.route.v3.VirtualHost`.
+	//	Headers can be specified using ``response_headers_to_add`` in the enclosing
+	//	:ref:`envoy_v3_api_msg_config.route.v3.Route`, :ref:`envoy_v3_api_msg_config.route.v3.RouteConfiguration` or
+	//	:ref:`envoy_v3_api_msg_config.route.v3.VirtualHost`.
 	Body *v31.DataSource `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
 }
 
@@ -3000,9 +3016,9 @@ type Decorator struct {
 	//
 	// .. note::
 	//
-	//   For ingress (inbound) requests, or egress (outbound) responses, this value may be overridden
-	//   by the :ref:`x-envoy-decorator-operation
-	//   <config_http_filters_router_x-envoy-decorator-operation>` header.
+	//	For ingress (inbound) requests, or egress (outbound) responses, this value may be overridden
+	//	by the :ref:`x-envoy-decorator-operation
+	//	<config_http_filters_router_x-envoy-decorator-operation>` header.
 	Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"`
 	// Whether the decorated details should be propagated to the other party. The default is true.
 	Propagate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"`
@@ -3164,16 +3180,16 @@ func (x *Tracing) GetCustomTags() []*v34.CustomTag {
 //
 // .. note::
 //
-//    Virtual clusters are a useful tool, but we do not recommend setting up a virtual cluster for
-//    every application endpoint. This is both not easily maintainable and as well the matching and
-//    statistics output are not free.
+//	Virtual clusters are a useful tool, but we do not recommend setting up a virtual cluster for
+//	every application endpoint. This is both not easily maintainable and as well the matching and
+//	statistics output are not free.
 type VirtualCluster struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// Specifies a list of header matchers to use for matching requests. Each specified header must
-	// match. The pseudo-headers ``:path`` and ``:method`` can be used to match the request path and
+	// match. The pseudo-headers “:path“ and “:method“ can be used to match the request path and
 	// method, respectively.
 	Headers []*HeaderMatcher `protobuf:"bytes,4,rep,name=headers,proto3" json:"headers,omitempty"`
 	// Specifies the name of the virtual cluster. The virtual cluster name as well
@@ -3241,7 +3257,7 @@ type RateLimit struct {
 	//
 	// .. note::
 	//
-	//   The filter supports a range of 0 - 10 inclusively for stage numbers.
+	//	The filter supports a range of 0 - 10 inclusively for stage numbers.
 	Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"`
 	// The key to be set in runtime to disable this rate limit configuration.
 	DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"`
@@ -3321,30 +3337,32 @@ func (x *RateLimit) GetLimit() *RateLimit_Override {
 
 // .. attention::
 //
-//   Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1 ``Host``
-//   header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
+//	Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1 ``Host``
+//	header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
 //
 // .. attention::
 //
-//   To route on HTTP method, use the special HTTP/2 ``:method`` header. This works for both
-//   HTTP/1 and HTTP/2 as Envoy normalizes headers. E.g.,
+//	To route on HTTP method, use the special HTTP/2 ``:method`` header. This works for both
+//	HTTP/1 and HTTP/2 as Envoy normalizes headers. E.g.,
 //
-//   .. code-block:: json
+//	.. code-block:: json
 //
-//     {
-//       "name": ":method",
-//       "string_match": {
-//         "exact": "POST"
-//       }
-//     }
+//	  {
+//	    "name": ":method",
+//	    "string_match": {
+//	      "exact": "POST"
+//	    }
+//	  }
 //
 // .. attention::
-//   In the absence of any header match specifier, match will default to :ref:`present_match
-//   <envoy_v3_api_field_config.route.v3.HeaderMatcher.present_match>`. i.e, a request that has the :ref:`name
-//   <envoy_v3_api_field_config.route.v3.HeaderMatcher.name>` header will match, regardless of the header's
-//   value.
 //
-//  [#next-major-version: HeaderMatcher should be refactored to use StringMatcher.]
+//	 In the absence of any header match specifier, match will default to :ref:`present_match
+//	 <envoy_v3_api_field_config.route.v3.HeaderMatcher.present_match>`. i.e, a request that has the :ref:`name
+//	 <envoy_v3_api_field_config.route.v3.HeaderMatcher.name>` header will match, regardless of the header's
+//	 value.
+//
+//	[#next-major-version: HeaderMatcher should be refactored to use StringMatcher.]
+//
 // [#next-free-field: 15]
 type HeaderMatcher struct {
 	state         protoimpl.MessageState
@@ -3356,6 +3374,7 @@ type HeaderMatcher struct {
 	// Specifies how the header match will be performed to route the request.
 	//
 	// Types that are assignable to HeaderMatchSpecifier:
+	//
 	//	*HeaderMatcher_ExactMatch
 	//	*HeaderMatcher_SafeRegexMatch
 	//	*HeaderMatcher_RangeMatch
@@ -3369,7 +3388,7 @@ type HeaderMatcher struct {
 	//
 	// Examples:
 	//
-	// * The regex ``\d{3}`` does not match the value ``1234``, so it will match when inverted.
+	// * The regex “\d{3}“ does not match the value “1234“, so it will match when inverted.
 	// * The range [-10,0) will match the value -1, so it will not match when inverted.
 	InvertMatch bool `protobuf:"varint,8,opt,name=invert_match,json=invertMatch,proto3" json:"invert_match,omitempty"`
 	// If specified, for any header match rule, if the header match rule specified header
@@ -3377,27 +3396,27 @@ type HeaderMatcher struct {
 	//
 	// Examples:
 	//
-	// * The header match rule specified header "header1" to range match of [0, 10],
-	//   :ref:`invert_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.invert_match>`
-	//   is set to true and :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
-	//   is set to true; The "header1" header is not present. The match rule will
-	//   treat the "header1" as an empty header. The empty header does not match the range,
-	//   so it will match when inverted.
-	// * The header match rule specified header "header2" to range match of [0, 10],
-	//   :ref:`invert_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.invert_match>`
-	//   is set to true and :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
-	//   is set to false; The "header2" header is not present and the header
-	//   matcher rule for "header2" will be ignored so it will not match.
-	// * The header match rule specified header "header3" to a string regex match
-	//   ``^$`` which means an empty string, and
-	//   :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
-	//   is set to true; The "header3" header is not present.
-	//   The match rule will treat the "header3" header as an empty header so it will match.
-	// * The header match rule specified header "header4" to a string regex match
-	//   ``^$`` which means an empty string, and
-	//   :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
-	//   is set to false; The "header4" header is not present.
-	//   The match rule for "header4" will be ignored so it will not match.
+	//   - The header match rule specified header "header1" to range match of [0, 10],
+	//     :ref:`invert_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.invert_match>`
+	//     is set to true and :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
+	//     is set to true; The "header1" header is not present. The match rule will
+	//     treat the "header1" as an empty header. The empty header does not match the range,
+	//     so it will match when inverted.
+	//   - The header match rule specified header "header2" to range match of [0, 10],
+	//     :ref:`invert_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.invert_match>`
+	//     is set to true and :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
+	//     is set to false; The "header2" header is not present and the header
+	//     matcher rule for "header2" will be ignored so it will not match.
+	//   - The header match rule specified header "header3" to a string regex match
+	//     “^$“ which means an empty string, and
+	//     :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
+	//     is set to true; The "header3" header is not present.
+	//     The match rule will treat the "header3" header as an empty header so it will match.
+	//   - The header match rule specified header "header4" to a string regex match
+	//     “^$“ which means an empty string, and
+	//     :ref:`treat_missing_header_as_empty <envoy_v3_api_field_config.route.v3.HeaderMatcher.treat_missing_header_as_empty>`
+	//     is set to false; The "header4" header is not present.
+	//     The match rule for "header4" will be ignored so it will not match.
 	TreatMissingHeaderAsEmpty bool `protobuf:"varint,14,opt,name=treat_missing_header_as_empty,json=treatMissingHeaderAsEmpty,proto3" json:"treat_missing_header_as_empty,omitempty"`
 }
 
@@ -3447,7 +3466,7 @@ func (m *HeaderMatcher) GetHeaderMatchSpecifier() isHeaderMatcher_HeaderMatchSpe
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *HeaderMatcher) GetExactMatch() string {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_ExactMatch); ok {
 		return x.ExactMatch
@@ -3455,7 +3474,7 @@ func (x *HeaderMatcher) GetExactMatch() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *HeaderMatcher) GetSafeRegexMatch() *v32.RegexMatcher {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_SafeRegexMatch); ok {
 		return x.SafeRegexMatch
@@ -3477,7 +3496,7 @@ func (x *HeaderMatcher) GetPresentMatch() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *HeaderMatcher) GetPrefixMatch() string {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_PrefixMatch); ok {
 		return x.PrefixMatch
@@ -3485,7 +3504,7 @@ func (x *HeaderMatcher) GetPrefixMatch() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *HeaderMatcher) GetSuffixMatch() string {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_SuffixMatch); ok {
 		return x.SuffixMatch
@@ -3493,7 +3512,7 @@ func (x *HeaderMatcher) GetSuffixMatch() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *HeaderMatcher) GetContainsMatch() string {
 	if x, ok := x.GetHeaderMatchSpecifier().(*HeaderMatcher_ContainsMatch); ok {
 		return x.ContainsMatch
@@ -3530,7 +3549,7 @@ type HeaderMatcher_ExactMatch struct {
 	// If specified, header match will be performed based on the value of the header.
 	// This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	ExactMatch string `protobuf:"bytes,4,opt,name=exact_match,json=exactMatch,proto3,oneof"`
 }
 
@@ -3540,7 +3559,7 @@ type HeaderMatcher_SafeRegexMatch struct {
 	// request header value matches the regex.
 	// This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	SafeRegexMatch *v32.RegexMatcher `protobuf:"bytes,11,opt,name=safe_regex_match,json=safeRegexMatch,proto3,oneof"`
 }
 
@@ -3554,8 +3573,8 @@ type HeaderMatcher_RangeMatch struct {
 	//
 	// Examples:
 	//
-	// * For range [-10,0), route will match for header value -1, but not for 0, ``somestring``, 10.9,
-	//   ``-1somestring``
+	//   - For range [-10,0), route will match for header value -1, but not for 0, “somestring“, 10.9,
+	//     “-1somestring“
 	RangeMatch *v33.Int64Range `protobuf:"bytes,6,opt,name=range_match,json=rangeMatch,proto3,oneof"`
 }
 
@@ -3572,9 +3591,9 @@ type HeaderMatcher_PrefixMatch struct {
 	//
 	// Examples:
 	//
-	// * The prefix ``abcd`` matches the value ``abcdxyz``, but not for ``abcxyz``.
+	// * The prefix “abcd“ matches the value “abcdxyz“, but not for “abcxyz“.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	PrefixMatch string `protobuf:"bytes,9,opt,name=prefix_match,json=prefixMatch,proto3,oneof"`
 }
 
@@ -3585,9 +3604,9 @@ type HeaderMatcher_SuffixMatch struct {
 	//
 	// Examples:
 	//
-	// * The suffix ``abcd`` matches the value ``xyzabcd``, but not for ``xyzbcd``.
+	// * The suffix “abcd“ matches the value “xyzabcd“, but not for “xyzbcd“.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	SuffixMatch string `protobuf:"bytes,10,opt,name=suffix_match,json=suffixMatch,proto3,oneof"`
 }
 
@@ -3599,9 +3618,9 @@ type HeaderMatcher_ContainsMatch struct {
 	//
 	// Examples:
 	//
-	// * The value ``abcd`` matches the value ``xyzabcdpqr``, but not for ``xyzbcdpqr``.
+	// * The value “abcd“ matches the value “xyzabcdpqr“, but not for “xyzbcdpqr“.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	ContainsMatch string `protobuf:"bytes,12,opt,name=contains_match,json=containsMatch,proto3,oneof"`
 }
 
@@ -3635,9 +3654,10 @@ type QueryParameterMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Specifies the name of a key that must be present in the requested
-	// ``path``'s query string.
+	// “path“'s query string.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to QueryParameterMatchSpecifier:
+	//
 	//	*QueryParameterMatcher_StringMatch
 	//	*QueryParameterMatcher_PresentMatch
 	QueryParameterMatchSpecifier isQueryParameterMatcher_QueryParameterMatchSpecifier `protobuf_oneof:"query_parameter_match_specifier"`
@@ -3722,6 +3742,7 @@ func (*QueryParameterMatcher_StringMatch) isQueryParameterMatcher_QueryParameter
 func (*QueryParameterMatcher_PresentMatch) isQueryParameterMatcher_QueryParameterMatchSpecifier() {}
 
 // HTTP Internal Redirect :ref:`architecture overview <arch_overview_internal_redirects>`.
+// [#next-free-field: 6]
 type InternalRedirectPolicy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3748,6 +3769,10 @@ type InternalRedirectPolicy struct {
 	// Allow internal redirect to follow a target URI with a different scheme than the value of
 	// x-forwarded-proto. The default is false.
 	AllowCrossSchemeRedirect bool `protobuf:"varint,4,opt,name=allow_cross_scheme_redirect,json=allowCrossSchemeRedirect,proto3" json:"allow_cross_scheme_redirect,omitempty"`
+	// Specifies a list of headers, by name, to copy from the internal redirect into the subsequent
+	// request. If a header is specified here but not present in the redirect, it will be cleared in
+	// the subsequent request.
+	ResponseHeadersToCopy []string `protobuf:"bytes,5,rep,name=response_headers_to_copy,json=responseHeadersToCopy,proto3" json:"response_headers_to_copy,omitempty"`
 }
 
 func (x *InternalRedirectPolicy) Reset() {
@@ -3810,13 +3835,19 @@ func (x *InternalRedirectPolicy) GetAllowCrossSchemeRedirect() bool {
 	return false
 }
 
+func (x *InternalRedirectPolicy) GetResponseHeadersToCopy() []string {
+	if x != nil {
+		return x.ResponseHeadersToCopy
+	}
+	return nil
+}
+
 // A simple wrapper for an HTTP filter config. This is intended to be used as a wrapper for the
 // map value in
 // :ref:`VirtualHost.typed_per_filter_config<envoy_v3_api_field_config.route.v3.VirtualHost.typed_per_filter_config>`,
 // :ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>`,
 // or :ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
 // to add additional flags to the filter.
-// [#not-implemented-hide:]
 type FilterConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3828,18 +3859,20 @@ type FilterConfig struct {
 	// not support the specified filter, it may ignore the map entry rather
 	// than rejecting the config.
 	IsOptional bool `protobuf:"varint,2,opt,name=is_optional,json=isOptional,proto3" json:"is_optional,omitempty"`
-	// If true, the filter is disabled in the route or virtual host and the ``config`` field is ignored.
+	// If true, the filter is disabled in the route or virtual host and the “config“ field is ignored.
+	// See :ref:`route based filter chain <arch_overview_http_filters_route_based_filter_chain>`
+	// for more details.
 	//
 	// .. note::
 	//
-	//   This field will take effect when the request arrive and filter chain is created for the request.
-	//   If initial route is selected for the request and a filter is disabled in the initial route, then
-	//   the filter will not be added to the filter chain.
-	//   And if the request is mutated later and re-match to another route, the disabled filter by the
-	//   initial route will not be added back to the filter chain because the filter chain is already
-	//   created and it is too late to change the chain.
+	//	This field will take effect when the request arrive and filter chain is created for the request.
+	//	If initial route is selected for the request and a filter is disabled in the initial route, then
+	//	the filter will not be added to the filter chain.
+	//	And if the request is mutated later and re-match to another route, the disabled filter by the
+	//	initial route will not be added back to the filter chain because the filter chain is already
+	//	created and it is too late to change the chain.
 	//
-	//   This field only make sense for the downstream HTTP filters for now.
+	//	This field only make sense for the downstream HTTP filters for now.
 	Disabled bool `protobuf:"varint,3,opt,name=disabled,proto3" json:"disabled,omitempty"`
 }
 
@@ -3902,12 +3935,12 @@ type WeightedCluster_ClusterWeight struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Only one of ``name`` and ``cluster_header`` may be specified.
+	// Only one of “name“ and “cluster_header“ may be specified.
 	// [#next-major-version: Need to add back the validation rule: (validate.rules).string = {min_len: 1}]
 	// Name of the upstream cluster. The cluster must exist in the
 	// :ref:`cluster manager configuration <config_cluster_manager>`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Only one of ``name`` and ``cluster_header`` may be specified.
+	// Only one of “name“ and “cluster_header“ may be specified.
 	// [#next-major-version: Need to add back the validation rule: (validate.rules).string = {min_len: 1 }]
 	// Envoy will determine the cluster to route to by reading the value of the
 	// HTTP header named by cluster_header from the request headers. If the
@@ -3916,12 +3949,12 @@ type WeightedCluster_ClusterWeight struct {
 	//
 	// .. attention::
 	//
-	//   Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
-	//   ``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
+	//	Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
+	//	``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	ClusterHeader string `protobuf:"bytes,12,opt,name=cluster_header,json=clusterHeader,proto3" json:"cluster_header,omitempty"`
 	// The weight of the cluster. This value is relative to the other clusters'
 	// weights. When a request matches the route, the choice of an upstream cluster
@@ -3933,7 +3966,7 @@ type WeightedCluster_ClusterWeight struct {
 	// the upstream cluster with metadata matching what is set in this field will be considered for
 	// load balancing. Note that this will be merged with what's provided in
 	// :ref:`RouteAction.metadata_match <envoy_v3_api_field_config.route.v3.RouteAction.metadata_match>`, with
-	// values here taking precedence. The filter name should be specified as ``envoy.lb``.
+	// values here taking precedence. The filter name should be specified as “envoy.lb“.
 	MetadataMatch *v31.Metadata `protobuf:"bytes,3,opt,name=metadata_match,json=metadataMatch,proto3" json:"metadata_match,omitempty"`
 	// Specifies a list of headers to be added to requests when this cluster is selected
 	// through the enclosing :ref:`envoy_v3_api_msg_config.route.v3.RouteAction`.
@@ -3957,21 +3990,17 @@ type WeightedCluster_ClusterWeight struct {
 	// Specifies a list of headers to be removed from responses when this cluster is selected
 	// through the enclosing :ref:`envoy_v3_api_msg_config.route.v3.RouteAction`.
 	ResponseHeadersToRemove []string `protobuf:"bytes,6,rep,name=response_headers_to_remove,json=responseHeadersToRemove,proto3" json:"response_headers_to_remove,omitempty"`
-	// The per_filter_config field can be used to provide weighted cluster-specific configurations
-	// for filters.
-	// The key should match the :ref:`filter config name
+	// This field can be used to provide weighted cluster specific per filter config. The key should match the
+	// :ref:`filter config name
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpFilter.name>`.
-	// The canonical filter name (e.g., ``envoy.filters.http.buffer`` for the HTTP buffer filter) can also
-	// be used for the backwards compatibility. If there is no entry referred by the filter config name, the
-	// entry referred by the canonical filter name will be provided to the filters as fallback.
-	//
-	// Use of this field is filter specific;
-	// see the :ref:`HTTP filter documentation <config_http_filters>` for if and how it is utilized.
+	// See :ref:`Http filter route specific config <arch_overview_http_filters_per_filter_config>`
+	// for details.
 	// [#comment: An entry's value may be wrapped in a
 	// :ref:`FilterConfig<envoy_v3_api_msg_config.route.v3.FilterConfig>`
 	// message to specify additional options.]
 	TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Types that are assignable to HostRewriteSpecifier:
+	//
 	//	*WeightedCluster_ClusterWeight_HostRewriteLiteral
 	HostRewriteSpecifier isWeightedCluster_ClusterWeight_HostRewriteSpecifier `protobuf_oneof:"host_rewrite_specifier"`
 }
@@ -4146,6 +4175,16 @@ type RouteMatch_TlsContextMatchOptions struct {
 	Presented *wrappers.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"`
 	// If specified, the route will match against whether or not a certificate is validated.
 	// If not specified, certificate validation status (true or false) will not be considered when route matching.
+	//
+	// .. warning::
+	//
+	//	Client certificate validation is not currently performed upon TLS session resumption. For
+	//	a resumed TLS session the route will match only when ``validated`` is false, regardless of
+	//	whether the client TLS certificate is valid.
+	//
+	//	The only known workaround for this issue is to disable TLS session resumption entirely, by
+	//	setting both :ref:`disable_stateless_session_resumption <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.disable_stateless_session_resumption>`
+	//	and :ref:`disable_stateful_session_resumption <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.disable_stateful_session_resumption>` on the DownstreamTlsContext.
 	Validated *wrappers.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"`
 }
 
@@ -4195,7 +4234,7 @@ func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue {
 	return nil
 }
 
-// An extensible message for matching CONNECT requests.
+// An extensible message for matching CONNECT or CONNECT-UDP requests.
 type RouteMatch_ConnectMatcher struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4239,28 +4278,29 @@ func (*RouteMatch_ConnectMatcher) Descriptor() ([]byte, []int) {
 // respond before returning the response from the primary cluster. All normal statistics are
 // collected for the shadow cluster making this feature useful for testing.
 //
-// During shadowing, the host/authority header is altered such that ``-shadow`` is appended. This is
-// useful for logging. For example, ``cluster1`` becomes ``cluster1-shadow``.
+// During shadowing, the host/authority header is altered such that “-shadow“ is appended. This is
+// useful for logging. For example, “cluster1“ becomes “cluster1-shadow“.
 //
 // .. note::
 //
-//   Shadowing will not be triggered if the primary cluster does not exist.
+//	Shadowing will not be triggered if the primary cluster does not exist.
 //
 // .. note::
 //
-//   Shadowing doesn't support Http CONNECT and upgrades.
+//	Shadowing doesn't support Http CONNECT and upgrades.
+//
 // [#next-free-field: 6]
 type RouteAction_RequestMirrorPolicy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Only one of ``cluster`` and ``cluster_header`` can be specified.
+	// Only one of “cluster“ and “cluster_header“ can be specified.
 	// [#next-major-version: Need to add back the validation rule: (validate.rules).string = {min_len: 1}]
 	// Specifies the cluster that requests will be mirrored to. The cluster must
 	// exist in the cluster manager configuration.
 	Cluster string `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	// Only one of ``cluster`` and ``cluster_header`` can be specified.
+	// Only one of “cluster“ and “cluster_header“ can be specified.
 	// Envoy will determine the cluster to route to by reading the value of the
 	// HTTP header named by cluster_header from the request headers. Only the first value in header is used,
 	// and no shadow request will happen if the value is not found in headers. Envoy will not wait for
@@ -4268,16 +4308,16 @@ type RouteAction_RequestMirrorPolicy struct {
 	//
 	// .. attention::
 	//
-	//   Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
-	//   ``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
+	//	Internally, Envoy always uses the HTTP/2 ``:authority`` header to represent the HTTP/1
+	//	``Host`` header. Thus, if attempting to match on ``Host``, match on ``:authority`` instead.
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	ClusterHeader string `protobuf:"bytes,5,opt,name=cluster_header,json=clusterHeader,proto3" json:"cluster_header,omitempty"`
 	// If not specified, all requests to the target cluster will be mirrored.
 	//
-	// If specified, this field takes precedence over the ``runtime_key`` field and requests must also
+	// If specified, this field takes precedence over the “runtime_key“ field and requests must also
 	// fall under the percentage of matches indicated by this field.
 	//
 	// For some fraction N/D, a random number in the range [0,D) is selected. If the
@@ -4357,6 +4397,7 @@ type RouteAction_HashPolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PolicySpecifier:
+	//
 	//	*RouteAction_HashPolicy_Header_
 	//	*RouteAction_HashPolicy_Cookie_
 	//	*RouteAction_HashPolicy_ConnectionProperties_
@@ -4372,13 +4413,13 @@ type RouteAction_HashPolicy struct {
 	// list of hash polices.
 	// For example, if the following hash methods are configured:
 	//
-	//  ========= ========
-	//  specifier terminal
-	//  ========= ========
-	//  Header A  true
-	//  Header B  false
-	//  Header C  false
-	//  ========= ========
+	//	========= ========
+	//	specifier terminal
+	//	========= ========
+	//	Header A  true
+	//	Header B  false
+	//	Header C  false
+	//	========= ========
 	//
 	// The generateHash process ends if policy "header A" generates a hash, as
 	// it's a terminal policy.
@@ -4598,10 +4639,10 @@ type RouteAction_MaxStreamDuration struct {
 	MaxStreamDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"`
 	// If present, and the request contains a `grpc-timeout header
 	// <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_, use that value as the
-	// ``max_stream_duration``, but limit the applied timeout to the maximum value specified here.
-	// If set to 0, the ``grpc-timeout`` header is used without modification.
+	// “max_stream_duration“, but limit the applied timeout to the maximum value specified here.
+	// If set to 0, the “grpc-timeout“ header is used without modification.
 	GrpcTimeoutHeaderMax *duration.Duration `protobuf:"bytes,2,opt,name=grpc_timeout_header_max,json=grpcTimeoutHeaderMax,proto3" json:"grpc_timeout_header_max,omitempty"`
-	// If present, Envoy will adjust the timeout provided by the ``grpc-timeout`` header by
+	// If present, Envoy will adjust the timeout provided by the “grpc-timeout“ header by
 	// subtracting the provided duration from the header. This is useful for allowing Envoy to set
 	// its global timeout to be less than that of the deadline imposed by the calling client, which
 	// makes it more likely that Envoy will handle the timeout instead of having the call canceled
@@ -4722,20 +4763,78 @@ func (x *RouteAction_HashPolicy_Header) GetRegexRewrite() *v32.RegexMatchAndSubs
 	return nil
 }
 
+// CookieAttribute defines an API for adding additional attributes for a HTTP cookie.
+type RouteAction_HashPolicy_CookieAttribute struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The name of the cookie attribute.
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	// The optional value of the cookie attribute.
+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+}
+
+func (x *RouteAction_HashPolicy_CookieAttribute) Reset() {
+	*x = RouteAction_HashPolicy_CookieAttribute{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RouteAction_HashPolicy_CookieAttribute) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RouteAction_HashPolicy_CookieAttribute) ProtoMessage() {}
+
+func (x *RouteAction_HashPolicy_CookieAttribute) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[34]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RouteAction_HashPolicy_CookieAttribute.ProtoReflect.Descriptor instead.
+func (*RouteAction_HashPolicy_CookieAttribute) Descriptor() ([]byte, []int) {
+	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 1}
+}
+
+func (x *RouteAction_HashPolicy_CookieAttribute) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *RouteAction_HashPolicy_CookieAttribute) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
 // Envoy supports two types of cookie affinity:
 //
-// 1. Passive. Envoy takes a cookie that's present in the cookies header and
-//    hashes on its value.
+//  1. Passive. Envoy takes a cookie that's present in the cookies header and
+//     hashes on its value.
 //
-// 2. Generated. Envoy generates and sets a cookie with an expiration (TTL)
-//    on the first request from the client in its response to the client,
-//    based on the endpoint the request gets sent to. The client then
-//    presents this on the next and all subsequent requests. The hash of
-//    this is sufficient to ensure these requests get sent to the same
-//    endpoint. The cookie is generated by hashing the source and
-//    destination ports and addresses so that multiple independent HTTP2
-//    streams on the same connection will independently receive the same
-//    cookie, even if they arrive at the Envoy simultaneously.
+//  2. Generated. Envoy generates and sets a cookie with an expiration (TTL)
+//     on the first request from the client in its response to the client,
+//     based on the endpoint the request gets sent to. The client then
+//     presents this on the next and all subsequent requests. The hash of
+//     this is sufficient to ensure these requests get sent to the same
+//     endpoint. The cookie is generated by hashing the source and
+//     destination ports and addresses so that multiple independent HTTP2
+//     streams on the same connection will independently receive the same
+//     cookie, even if they arrive at the Envoy simultaneously.
 type RouteAction_HashPolicy_Cookie struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4752,12 +4851,14 @@ type RouteAction_HashPolicy_Cookie struct {
 	// The name of the path for the cookie. If no path is specified here, no path
 	// will be set for the cookie.
 	Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
+	// Additional attributes for the cookie. They will be used when generating a new cookie.
+	Attributes []*RouteAction_HashPolicy_CookieAttribute `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"`
 }
 
 func (x *RouteAction_HashPolicy_Cookie) Reset() {
 	*x = RouteAction_HashPolicy_Cookie{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[34]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4770,7 +4871,7 @@ func (x *RouteAction_HashPolicy_Cookie) String() string {
 func (*RouteAction_HashPolicy_Cookie) ProtoMessage() {}
 
 func (x *RouteAction_HashPolicy_Cookie) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[34]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4783,7 +4884,7 @@ func (x *RouteAction_HashPolicy_Cookie) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RouteAction_HashPolicy_Cookie.ProtoReflect.Descriptor instead.
 func (*RouteAction_HashPolicy_Cookie) Descriptor() ([]byte, []int) {
-	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 1}
+	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 2}
 }
 
 func (x *RouteAction_HashPolicy_Cookie) GetName() string {
@@ -4807,6 +4908,13 @@ func (x *RouteAction_HashPolicy_Cookie) GetPath() string {
 	return ""
 }
 
+func (x *RouteAction_HashPolicy_Cookie) GetAttributes() []*RouteAction_HashPolicy_CookieAttribute {
+	if x != nil {
+		return x.Attributes
+	}
+	return nil
+}
+
 type RouteAction_HashPolicy_ConnectionProperties struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4819,7 +4927,7 @@ type RouteAction_HashPolicy_ConnectionProperties struct {
 func (x *RouteAction_HashPolicy_ConnectionProperties) Reset() {
 	*x = RouteAction_HashPolicy_ConnectionProperties{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[35]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4832,7 +4940,7 @@ func (x *RouteAction_HashPolicy_ConnectionProperties) String() string {
 func (*RouteAction_HashPolicy_ConnectionProperties) ProtoMessage() {}
 
 func (x *RouteAction_HashPolicy_ConnectionProperties) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[35]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4845,7 +4953,7 @@ func (x *RouteAction_HashPolicy_ConnectionProperties) ProtoReflect() protoreflec
 
 // Deprecated: Use RouteAction_HashPolicy_ConnectionProperties.ProtoReflect.Descriptor instead.
 func (*RouteAction_HashPolicy_ConnectionProperties) Descriptor() ([]byte, []int) {
-	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 2}
+	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 3}
 }
 
 func (x *RouteAction_HashPolicy_ConnectionProperties) GetSourceIp() bool {
@@ -4862,14 +4970,15 @@ type RouteAction_HashPolicy_QueryParameter struct {
 
 	// The name of the URL query parameter that will be used to obtain the hash
 	// key. If the parameter is not present, no hash will be produced. Query
-	// parameter names are case-sensitive.
+	// parameter names are case-sensitive. If query parameters are repeated, only
+	// the first value will be considered.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 }
 
 func (x *RouteAction_HashPolicy_QueryParameter) Reset() {
 	*x = RouteAction_HashPolicy_QueryParameter{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[36]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4882,7 +4991,7 @@ func (x *RouteAction_HashPolicy_QueryParameter) String() string {
 func (*RouteAction_HashPolicy_QueryParameter) ProtoMessage() {}
 
 func (x *RouteAction_HashPolicy_QueryParameter) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[36]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4895,7 +5004,7 @@ func (x *RouteAction_HashPolicy_QueryParameter) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use RouteAction_HashPolicy_QueryParameter.ProtoReflect.Descriptor instead.
 func (*RouteAction_HashPolicy_QueryParameter) Descriptor() ([]byte, []int) {
-	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 3}
+	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 4}
 }
 
 func (x *RouteAction_HashPolicy_QueryParameter) GetName() string {
@@ -4919,7 +5028,7 @@ type RouteAction_HashPolicy_FilterState struct {
 func (x *RouteAction_HashPolicy_FilterState) Reset() {
 	*x = RouteAction_HashPolicy_FilterState{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[37]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4932,7 +5041,7 @@ func (x *RouteAction_HashPolicy_FilterState) String() string {
 func (*RouteAction_HashPolicy_FilterState) ProtoMessage() {}
 
 func (x *RouteAction_HashPolicy_FilterState) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[37]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4945,7 +5054,7 @@ func (x *RouteAction_HashPolicy_FilterState) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use RouteAction_HashPolicy_FilterState.ProtoReflect.Descriptor instead.
 func (*RouteAction_HashPolicy_FilterState) Descriptor() ([]byte, []int) {
-	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 4}
+	return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 1, 5}
 }
 
 func (x *RouteAction_HashPolicy_FilterState) GetKey() string {
@@ -4971,7 +5080,7 @@ type RouteAction_UpgradeConfig_ConnectConfig struct {
 func (x *RouteAction_UpgradeConfig_ConnectConfig) Reset() {
 	*x = RouteAction_UpgradeConfig_ConnectConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[38]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4984,7 +5093,7 @@ func (x *RouteAction_UpgradeConfig_ConnectConfig) String() string {
 func (*RouteAction_UpgradeConfig_ConnectConfig) ProtoMessage() {}
 
 func (x *RouteAction_UpgradeConfig_ConnectConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[38]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5023,6 +5132,7 @@ type RetryPolicy_RetryPriority struct {
 	// [#extension-category: envoy.retry_priorities]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*RetryPolicy_RetryPriority_TypedConfig
 	ConfigType isRetryPolicy_RetryPriority_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -5030,7 +5140,7 @@ type RetryPolicy_RetryPriority struct {
 func (x *RetryPolicy_RetryPriority) Reset() {
 	*x = RetryPolicy_RetryPriority{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[39]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5043,7 +5153,7 @@ func (x *RetryPolicy_RetryPriority) String() string {
 func (*RetryPolicy_RetryPriority) ProtoMessage() {}
 
 func (x *RetryPolicy_RetryPriority) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[39]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5099,6 +5209,7 @@ type RetryPolicy_RetryHostPredicate struct {
 	// [#extension-category: envoy.retry_host_predicates]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*RetryPolicy_RetryHostPredicate_TypedConfig
 	ConfigType isRetryPolicy_RetryHostPredicate_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -5106,7 +5217,7 @@ type RetryPolicy_RetryHostPredicate struct {
 func (x *RetryPolicy_RetryHostPredicate) Reset() {
 	*x = RetryPolicy_RetryHostPredicate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[40]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5119,7 +5230,7 @@ func (x *RetryPolicy_RetryHostPredicate) String() string {
 func (*RetryPolicy_RetryHostPredicate) ProtoMessage() {}
 
 func (x *RetryPolicy_RetryHostPredicate) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[40]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5177,8 +5288,8 @@ type RetryPolicy_RetryBackOff struct {
 	// back-off algorithm.
 	BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"`
 	// Specifies the maximum interval between retries. This parameter is optional, but must be
-	// greater than or equal to the ``base_interval`` if set. The default is 10 times the
-	// ``base_interval``. See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion
+	// greater than or equal to the “base_interval“ if set. The default is 10 times the
+	// “base_interval“. See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion
 	// of Envoy's back-off algorithm.
 	MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"`
 }
@@ -5186,7 +5297,7 @@ type RetryPolicy_RetryBackOff struct {
 func (x *RetryPolicy_RetryBackOff) Reset() {
 	*x = RetryPolicy_RetryBackOff{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[41]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5199,7 +5310,7 @@ func (x *RetryPolicy_RetryBackOff) String() string {
 func (*RetryPolicy_RetryBackOff) ProtoMessage() {}
 
 func (x *RetryPolicy_RetryBackOff) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[41]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5238,7 +5349,7 @@ type RetryPolicy_ResetHeader struct {
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The format of the reset header.
 	Format RetryPolicy_ResetHeaderFormat `protobuf:"varint,2,opt,name=format,proto3,enum=envoy.config.route.v3.RetryPolicy_ResetHeaderFormat" json:"format,omitempty"`
@@ -5247,7 +5358,7 @@ type RetryPolicy_ResetHeader struct {
 func (x *RetryPolicy_ResetHeader) Reset() {
 	*x = RetryPolicy_ResetHeader{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[42]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5260,7 +5371,7 @@ func (x *RetryPolicy_ResetHeader) String() string {
 func (*RetryPolicy_ResetHeader) ProtoMessage() {}
 
 func (x *RetryPolicy_ResetHeader) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[42]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5297,21 +5408,21 @@ func (x *RetryPolicy_ResetHeader) GetFormat() RetryPolicy_ResetHeaderFormat {
 //
 // .. code-block:: yaml
 //
-//   rate_limited_retry_back_off:
-//     reset_headers:
-//     - name: Retry-After
-//       format: SECONDS
-//     - name: X-RateLimit-Reset
-//       format: UNIX_TIMESTAMP
-//     max_interval: "300s"
+//	rate_limited_retry_back_off:
+//	  reset_headers:
+//	  - name: Retry-After
+//	    format: SECONDS
+//	  - name: X-RateLimit-Reset
+//	    format: UNIX_TIMESTAMP
+//	  max_interval: "300s"
 //
 // The following algorithm will apply:
 //
-//  1. If the response contains the header ``Retry-After`` its value must be on
-//     the form ``120`` (an integer that represents the number of seconds to
+//  1. If the response contains the header “Retry-After“ its value must be on
+//     the form “120“ (an integer that represents the number of seconds to
 //     wait before retrying). If so, this value is used as the back-off interval.
-//  2. Otherwise, if the response contains the header ``X-RateLimit-Reset`` its
-//     value must be on the form ``1595320702`` (an integer that represents the
+//  2. Otherwise, if the response contains the header “X-RateLimit-Reset“ its
+//     value must be on the form “1595320702“ (an integer that represents the
 //     point in time at which to retry, as a Unix timestamp in seconds). If so,
 //     the current time is subtracted from this value and the result is used as
 //     the back-off interval.
@@ -5320,25 +5431,25 @@ func (x *RetryPolicy_ResetHeader) GetFormat() RetryPolicy_ResetHeaderFormat {
 //     strategy.
 //
 // No matter which format is used, if the resulting back-off interval exceeds
-// ``max_interval`` it is discarded and the next header in ``reset_headers``
+// “max_interval“ it is discarded and the next header in “reset_headers“
 // is tried. If a request timeout is configured for the route it will further
 // limit how long the request will be allowed to run.
 //
 // To prevent many clients retrying at the same point in time jitter is added
 // to the back-off interval, so the resulting interval is decided by taking:
-// ``random(interval, interval * 1.5)``.
+// “random(interval, interval * 1.5)“.
 //
 // .. attention::
 //
-//   Configuring ``rate_limited_retry_back_off`` will not by itself cause a request
-//   to be retried. You will still need to configure the right retry policy to match
-//   the responses from the upstream server.
+//	Configuring ``rate_limited_retry_back_off`` will not by itself cause a request
+//	to be retried. You will still need to configure the right retry policy to match
+//	the responses from the upstream server.
 type RetryPolicy_RateLimitedRetryBackOff struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Specifies the reset headers (like ``Retry-After`` or ``X-RateLimit-Reset``)
+	// Specifies the reset headers (like “Retry-After“ or “X-RateLimit-Reset“)
 	// to match against the response. Headers are tried in order, and matched case
 	// insensitive. The first header to be parsed successfully is used. If no headers
 	// match the default exponential back-off is used instead.
@@ -5352,7 +5463,7 @@ type RetryPolicy_RateLimitedRetryBackOff struct {
 func (x *RetryPolicy_RateLimitedRetryBackOff) Reset() {
 	*x = RetryPolicy_RateLimitedRetryBackOff{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[43]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5365,7 +5476,7 @@ func (x *RetryPolicy_RateLimitedRetryBackOff) String() string {
 func (*RetryPolicy_RateLimitedRetryBackOff) ProtoMessage() {}
 
 func (x *RetryPolicy_RateLimitedRetryBackOff) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[43]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5402,6 +5513,7 @@ type RateLimit_Action struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ActionSpecifier:
+	//
 	//	*RateLimit_Action_SourceCluster_
 	//	*RateLimit_Action_DestinationCluster_
 	//	*RateLimit_Action_RequestHeaders_
@@ -5419,7 +5531,7 @@ type RateLimit_Action struct {
 func (x *RateLimit_Action) Reset() {
 	*x = RateLimit_Action{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[44]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5432,7 +5544,7 @@ func (x *RateLimit_Action) String() string {
 func (*RateLimit_Action) ProtoMessage() {}
 
 func (x *RateLimit_Action) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[44]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5497,7 +5609,7 @@ func (x *RateLimit_Action) GetHeaderValueMatch() *RateLimit_Action_HeaderValueMa
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 func (x *RateLimit_Action) GetDynamicMetadata() *RateLimit_Action_DynamicMetaData {
 	if x, ok := x.GetActionSpecifier().(*RateLimit_Action_DynamicMetadata); ok {
 		return x.DynamicMetadata
@@ -5571,9 +5683,10 @@ type RateLimit_Action_DynamicMetadata struct {
 	// Rate limit on dynamic metadata.
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of the :ref:`metadata <envoy_v3_api_field_config.route.v3.RateLimit.Action.metadata>` field
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of the :ref:`metadata <envoy_v3_api_field_config.route.v3.RateLimit.Action.metadata>` field
+	//
+	// Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto.
 	DynamicMetadata *RateLimit_Action_DynamicMetaData `protobuf:"bytes,7,opt,name=dynamic_metadata,json=dynamicMetadata,proto3,oneof"`
 }
 
@@ -5632,6 +5745,7 @@ type RateLimit_Override struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to OverrideSpecifier:
+	//
 	//	*RateLimit_Override_DynamicMetadata_
 	OverrideSpecifier isRateLimit_Override_OverrideSpecifier `protobuf_oneof:"override_specifier"`
 }
@@ -5639,7 +5753,7 @@ type RateLimit_Override struct {
 func (x *RateLimit_Override) Reset() {
 	*x = RateLimit_Override{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[45]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5652,7 +5766,7 @@ func (x *RateLimit_Override) String() string {
 func (*RateLimit_Override) ProtoMessage() {}
 
 func (x *RateLimit_Override) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[45]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5697,7 +5811,7 @@ func (*RateLimit_Override_DynamicMetadata_) isRateLimit_Override_OverrideSpecifi
 //
 // .. code-block:: cpp
 //
-//   ("source_cluster", "<local service cluster>")
+//	("source_cluster", "<local service cluster>")
 //
 // <local service cluster> is derived from the :option:`--service-cluster` option.
 type RateLimit_Action_SourceCluster struct {
@@ -5709,7 +5823,7 @@ type RateLimit_Action_SourceCluster struct {
 func (x *RateLimit_Action_SourceCluster) Reset() {
 	*x = RateLimit_Action_SourceCluster{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[46]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5722,7 +5836,7 @@ func (x *RateLimit_Action_SourceCluster) String() string {
 func (*RateLimit_Action_SourceCluster) ProtoMessage() {}
 
 func (x *RateLimit_Action_SourceCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[46]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5742,18 +5856,18 @@ func (*RateLimit_Action_SourceCluster) Descriptor() ([]byte, []int) {
 //
 // .. code-block:: cpp
 //
-//   ("destination_cluster", "<routed target cluster>")
+//	("destination_cluster", "<routed target cluster>")
 //
 // Once a request matches against a route table rule, a routed cluster is determined by one of
 // the following :ref:`route table configuration <envoy_v3_api_msg_config.route.v3.RouteConfiguration>`
 // settings:
 //
-// * :ref:`cluster <envoy_v3_api_field_config.route.v3.RouteAction.cluster>` indicates the upstream cluster
-//   to route to.
-// * :ref:`weighted_clusters <envoy_v3_api_field_config.route.v3.RouteAction.weighted_clusters>`
-//   chooses a cluster randomly from a set of clusters with attributed weight.
-// * :ref:`cluster_header <envoy_v3_api_field_config.route.v3.RouteAction.cluster_header>` indicates which
-//   header in the request contains the target cluster.
+//   - :ref:`cluster <envoy_v3_api_field_config.route.v3.RouteAction.cluster>` indicates the upstream cluster
+//     to route to.
+//   - :ref:`weighted_clusters <envoy_v3_api_field_config.route.v3.RouteAction.weighted_clusters>`
+//     chooses a cluster randomly from a set of clusters with attributed weight.
+//   - :ref:`cluster_header <envoy_v3_api_field_config.route.v3.RouteAction.cluster_header>` indicates which
+//     header in the request contains the target cluster.
 type RateLimit_Action_DestinationCluster struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5763,7 +5877,7 @@ type RateLimit_Action_DestinationCluster struct {
 func (x *RateLimit_Action_DestinationCluster) Reset() {
 	*x = RateLimit_Action_DestinationCluster{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[47]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5776,7 +5890,7 @@ func (x *RateLimit_Action_DestinationCluster) String() string {
 func (*RateLimit_Action_DestinationCluster) ProtoMessage() {}
 
 func (x *RateLimit_Action_DestinationCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[47]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5793,11 +5907,11 @@ func (*RateLimit_Action_DestinationCluster) Descriptor() ([]byte, []int) {
 }
 
 // The following descriptor entry is appended when a header contains a key that matches the
-// ``header_name``:
+// “header_name“:
 //
 // .. code-block:: cpp
 //
-//   ("<descriptor_key>", "<header_value_queried_from_header>")
+//	("<descriptor_key>", "<header_value_queried_from_header>")
 type RateLimit_Action_RequestHeaders struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5818,7 +5932,7 @@ type RateLimit_Action_RequestHeaders struct {
 func (x *RateLimit_Action_RequestHeaders) Reset() {
 	*x = RateLimit_Action_RequestHeaders{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[48]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5831,7 +5945,7 @@ func (x *RateLimit_Action_RequestHeaders) String() string {
 func (*RateLimit_Action_RequestHeaders) ProtoMessage() {}
 
 func (x *RateLimit_Action_RequestHeaders) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[48]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5873,7 +5987,7 @@ func (x *RateLimit_Action_RequestHeaders) GetSkipIfAbsent() bool {
 //
 // .. code-block:: cpp
 //
-//   ("remote_address", "<trusted address from x-forwarded-for>")
+//	("remote_address", "<trusted address from x-forwarded-for>")
 type RateLimit_Action_RemoteAddress struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5883,7 +5997,7 @@ type RateLimit_Action_RemoteAddress struct {
 func (x *RateLimit_Action_RemoteAddress) Reset() {
 	*x = RateLimit_Action_RemoteAddress{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[49]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5896,7 +6010,7 @@ func (x *RateLimit_Action_RemoteAddress) String() string {
 func (*RateLimit_Action_RemoteAddress) ProtoMessage() {}
 
 func (x *RateLimit_Action_RemoteAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[49]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5917,7 +6031,7 @@ func (*RateLimit_Action_RemoteAddress) Descriptor() ([]byte, []int) {
 //
 // .. code-block:: cpp
 //
-//   ("masked_remote_address", "<masked address from x-forwarded-for>")
+//	("masked_remote_address", "<masked address from x-forwarded-for>")
 type RateLimit_Action_MaskedRemoteAddress struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5925,13 +6039,13 @@ type RateLimit_Action_MaskedRemoteAddress struct {
 
 	// Length of prefix mask len for IPv4 (e.g. 0, 32).
 	// Defaults to 32 when unset.
-	// For example, trusted address from x-forwarded-for is ``192.168.1.1``,
+	// For example, trusted address from x-forwarded-for is “192.168.1.1“,
 	// the descriptor entry is ("masked_remote_address", "192.168.1.1/32");
 	// if mask len is 24, the descriptor entry is ("masked_remote_address", "192.168.1.0/24").
 	V4PrefixMaskLen *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=v4_prefix_mask_len,json=v4PrefixMaskLen,proto3" json:"v4_prefix_mask_len,omitempty"`
 	// Length of prefix mask len for IPv6 (e.g. 0, 128).
 	// Defaults to 128 when unset.
-	// For example, trusted address from x-forwarded-for is ``2001:abcd:ef01:2345:6789:abcd:ef01:234``,
+	// For example, trusted address from x-forwarded-for is “2001:abcd:ef01:2345:6789:abcd:ef01:234“,
 	// the descriptor entry is ("masked_remote_address", "2001:abcd:ef01:2345:6789:abcd:ef01:234/128");
 	// if mask len is 64, the descriptor entry is ("masked_remote_address", "2001:abcd:ef01:2345::/64").
 	V6PrefixMaskLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=v6_prefix_mask_len,json=v6PrefixMaskLen,proto3" json:"v6_prefix_mask_len,omitempty"`
@@ -5940,7 +6054,7 @@ type RateLimit_Action_MaskedRemoteAddress struct {
 func (x *RateLimit_Action_MaskedRemoteAddress) Reset() {
 	*x = RateLimit_Action_MaskedRemoteAddress{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[50]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[51]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5953,7 +6067,7 @@ func (x *RateLimit_Action_MaskedRemoteAddress) String() string {
 func (*RateLimit_Action_MaskedRemoteAddress) ProtoMessage() {}
 
 func (x *RateLimit_Action_MaskedRemoteAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[50]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[51]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5987,7 +6101,7 @@ func (x *RateLimit_Action_MaskedRemoteAddress) GetV6PrefixMaskLen() *wrappers.UI
 //
 // .. code-block:: cpp
 //
-//   ("generic_key", "<descriptor_value>")
+//	("generic_key", "<descriptor_value>")
 type RateLimit_Action_GenericKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6003,7 +6117,7 @@ type RateLimit_Action_GenericKey struct {
 func (x *RateLimit_Action_GenericKey) Reset() {
 	*x = RateLimit_Action_GenericKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[51]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[52]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6016,7 +6130,7 @@ func (x *RateLimit_Action_GenericKey) String() string {
 func (*RateLimit_Action_GenericKey) ProtoMessage() {}
 
 func (x *RateLimit_Action_GenericKey) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[51]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[52]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6050,13 +6164,13 @@ func (x *RateLimit_Action_GenericKey) GetDescriptorKey() string {
 //
 // .. code-block:: cpp
 //
-//   ("header_match", "<descriptor_value>")
+//	("header_match", "<descriptor_value>")
 type RateLimit_Action_HeaderValueMatch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// The key to use in the descriptor entry. Defaults to ``header_match``.
+	// The key to use in the descriptor entry. Defaults to “header_match“.
 	DescriptorKey string `protobuf:"bytes,4,opt,name=descriptor_key,json=descriptorKey,proto3" json:"descriptor_key,omitempty"`
 	// The value to use in the descriptor entry.
 	DescriptorValue string `protobuf:"bytes,1,opt,name=descriptor_value,json=descriptorValue,proto3" json:"descriptor_value,omitempty"`
@@ -6076,7 +6190,7 @@ type RateLimit_Action_HeaderValueMatch struct {
 func (x *RateLimit_Action_HeaderValueMatch) Reset() {
 	*x = RateLimit_Action_HeaderValueMatch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[52]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6089,7 +6203,7 @@ func (x *RateLimit_Action_HeaderValueMatch) String() string {
 func (*RateLimit_Action_HeaderValueMatch) ProtoMessage() {}
 
 func (x *RateLimit_Action_HeaderValueMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[52]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6138,10 +6252,11 @@ func (x *RateLimit_Action_HeaderValueMatch) GetHeaders() []*HeaderMatcher {
 //
 // .. code-block:: cpp
 //
-//   ("<descriptor_key>", "<value_queried_from_dynamic_metadata>")
+//	("<descriptor_key>", "<value_queried_from_dynamic_metadata>")
 //
 // .. attention::
-//   This action has been deprecated in favor of the :ref:`metadata <envoy_v3_api_msg_config.route.v3.RateLimit.Action.MetaData>` action
+//
+//	This action has been deprecated in favor of the :ref:`metadata <envoy_v3_api_msg_config.route.v3.RateLimit.Action.MetaData>` action
 type RateLimit_Action_DynamicMetaData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6152,7 +6267,7 @@ type RateLimit_Action_DynamicMetaData struct {
 	// Metadata struct that defines the key and path to retrieve the string value. A match will
 	// only happen if the value in the dynamic metadata is of type string.
 	MetadataKey *v35.MetadataKey `protobuf:"bytes,2,opt,name=metadata_key,json=metadataKey,proto3" json:"metadata_key,omitempty"`
-	// An optional value to use if ``metadata_key`` is empty. If not set and
+	// An optional value to use if “metadata_key“ is empty. If not set and
 	// no value is present under the metadata_key then no descriptor is generated.
 	DefaultValue string `protobuf:"bytes,3,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 }
@@ -6160,7 +6275,7 @@ type RateLimit_Action_DynamicMetaData struct {
 func (x *RateLimit_Action_DynamicMetaData) Reset() {
 	*x = RateLimit_Action_DynamicMetaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[53]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6173,7 +6288,7 @@ func (x *RateLimit_Action_DynamicMetaData) String() string {
 func (*RateLimit_Action_DynamicMetaData) ProtoMessage() {}
 
 func (x *RateLimit_Action_DynamicMetaData) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[53]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6214,7 +6329,8 @@ func (x *RateLimit_Action_DynamicMetaData) GetDefaultValue() string {
 //
 // .. code-block:: cpp
 //
-//   ("<descriptor_key>", "<value_queried_from_metadata>")
+//	("<descriptor_key>", "<value_queried_from_metadata>")
+//
 // [#next-free-field: 6]
 type RateLimit_Action_MetaData struct {
 	state         protoimpl.MessageState
@@ -6226,14 +6342,14 @@ type RateLimit_Action_MetaData struct {
 	// Metadata struct that defines the key and path to retrieve the string value. A match will
 	// only happen if the value in the metadata is of type string.
 	MetadataKey *v35.MetadataKey `protobuf:"bytes,2,opt,name=metadata_key,json=metadataKey,proto3" json:"metadata_key,omitempty"`
-	// An optional value to use if ``metadata_key`` is empty. If not set and
-	// no value is present under the metadata_key then ``skip_if_absent`` is followed to
+	// An optional value to use if “metadata_key“ is empty. If not set and
+	// no value is present under the metadata_key then “skip_if_absent“ is followed to
 	// skip calling the rate limiting service or skip the descriptor.
 	DefaultValue string `protobuf:"bytes,3,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 	// Source of metadata
 	Source RateLimit_Action_MetaData_Source `protobuf:"varint,4,opt,name=source,proto3,enum=envoy.config.route.v3.RateLimit_Action_MetaData_Source" json:"source,omitempty"`
 	// If set to true, Envoy skips the descriptor while calling rate limiting service
-	// when ``metadata_key`` is empty and ``default_value`` is not set. By default it skips calling the
+	// when “metadata_key“ is empty and “default_value“ is not set. By default it skips calling the
 	// rate limiting service in that case.
 	SkipIfAbsent bool `protobuf:"varint,5,opt,name=skip_if_absent,json=skipIfAbsent,proto3" json:"skip_if_absent,omitempty"`
 }
@@ -6241,7 +6357,7 @@ type RateLimit_Action_MetaData struct {
 func (x *RateLimit_Action_MetaData) Reset() {
 	*x = RateLimit_Action_MetaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[54]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[55]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6254,7 +6370,7 @@ func (x *RateLimit_Action_MetaData) String() string {
 func (*RateLimit_Action_MetaData) ProtoMessage() {}
 
 func (x *RateLimit_Action_MetaData) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[54]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[55]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6309,13 +6425,13 @@ func (x *RateLimit_Action_MetaData) GetSkipIfAbsent() bool {
 //
 // .. code-block:: cpp
 //
-//   ("query_match", "<descriptor_value>")
+//	("query_match", "<descriptor_value>")
 type RateLimit_Action_QueryParameterValueMatch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// The key to use in the descriptor entry. Defaults to ``query_match``.
+	// The key to use in the descriptor entry. Defaults to “query_match“.
 	DescriptorKey string `protobuf:"bytes,4,opt,name=descriptor_key,json=descriptorKey,proto3" json:"descriptor_key,omitempty"`
 	// The value to use in the descriptor entry.
 	DescriptorValue string `protobuf:"bytes,1,opt,name=descriptor_value,json=descriptorValue,proto3" json:"descriptor_value,omitempty"`
@@ -6335,7 +6451,7 @@ type RateLimit_Action_QueryParameterValueMatch struct {
 func (x *RateLimit_Action_QueryParameterValueMatch) Reset() {
 	*x = RateLimit_Action_QueryParameterValueMatch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[55]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[56]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6348,7 +6464,7 @@ func (x *RateLimit_Action_QueryParameterValueMatch) String() string {
 func (*RateLimit_Action_QueryParameterValueMatch) ProtoMessage() {}
 
 func (x *RateLimit_Action_QueryParameterValueMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[55]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[56]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6408,7 +6524,7 @@ type RateLimit_Override_DynamicMetadata struct {
 func (x *RateLimit_Override_DynamicMetadata) Reset() {
 	*x = RateLimit_Override_DynamicMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[56]
+		mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[57]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6421,7 +6537,7 @@ func (x *RateLimit_Override_DynamicMetadata) String() string {
 func (*RateLimit_Override_DynamicMetadata) ProtoMessage() {}
 
 func (x *RateLimit_Override_DynamicMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[56]
+	mi := &file_envoy_config_route_v3_route_components_proto_msgTypes[57]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6493,12 +6609,12 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{
 	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
 	0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd9, 0x0e, 0x0a, 0x0b, 0x56,
+	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x0f, 0x0a, 0x0b, 0x56,
 	0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
 	0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69,
 	0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01, 0x0c,
-	0x08, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x07, 0x64, 0x6f,
+	0x08, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x07, 0x64, 0x6f,
 	0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x34, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18,
 	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f,
@@ -6531,8 +6647,8 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{
 	0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a,
 	0x19, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
 	0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09,
-	0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01,
-	0x01, 0xc8, 0x01, 0x00, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61,
+	0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x01, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61,
 	0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x69, 0x0a, 0x17,
 	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
 	0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e,
@@ -6543,13 +6659,13 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{
 	0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4f, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72,
 	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f,
-	0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52,
+	0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52,
 	0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
 	0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x42, 0x0a, 0x04, 0x63, 0x6f, 0x72, 0x73,
 	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43,
-	0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86,
-	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x73, 0x0a, 0x17,
+	0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04,
+	0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x73, 0x0a, 0x17,
 	0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
 	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75,
@@ -6597,1100 +6713,1127 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{
 	0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x15,
 	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65,
-	0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x3a, 0x0a, 0x12, 0x54, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f,
-	0x4e, 0x45, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x45, 0x58, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c,
-	0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02,
-	0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74,
-	0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x4a, 0x04, 0x08,
-	0x0c, 0x10, 0x0d, 0x52, 0x11, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x64, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x09,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x06, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x22,
-	0xaf, 0x0b, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a,
-	0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x3a, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x43, 0x0a, 0x08,
-	0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x08, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x12, 0x56, 0x0a, 0x0f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76,
+	0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x1a, 0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0x3a, 0x0a, 0x12, 0x54, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00,
+	0x12, 0x11, 0x0a, 0x0d, 0x45, 0x58, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x4f, 0x4e, 0x4c,
+	0x59, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x02, 0x3a, 0x25, 0x9a, 0xc5,
+	0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48,
+	0x6f, 0x73, 0x74, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x52,
+	0x11, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x22, 0x64, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x09, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x22, 0xaf, 0x0b, 0x0a, 0x05,
+	0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x05, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3a, 0x0a, 0x05,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48,
+	0x00, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x43, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x69,
+	0x72, 0x65, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x0d, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x60, 0x0a, 0x15, 0x6e, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72,
-	0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4e, 0x6f, 0x6e,
-	0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x48, 0x00, 0x52, 0x13, 0x6e, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e,
-	0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x12, 0x3e, 0x0a, 0x09, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x76, 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x48, 0x00, 0x52, 0x08, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x56, 0x0a,
+	0x0f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44,
-	0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x09, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61,
-	0x74, 0x6f, 0x72, 0x12, 0x6d, 0x0a, 0x17, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x72,
-	0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75,
-	0x74, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x74, 0x79,
-	0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x67, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x09, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06,
-	0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x13, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a, 0x19, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74,
-	0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12,
-	0xfa, 0x42, 0x0f, 0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8,
-	0x01, 0x00, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x0d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x60, 0x0a, 0x15, 0x6e, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
+	0x69, 0x6e, 0x67, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4e, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77,
+	0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x13,
+	0x6e, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12,
+	0x3e, 0x0a, 0x09, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x63, 0x6f, 0x72,
+	0x61, 0x74, 0x6f, 0x72, 0x52, 0x09, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12,
+	0x6d, 0x0a, 0x17, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x54,
+	0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x74, 0x79, 0x70, 0x65, 0x64, 0x50,
+	0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x67,
+	0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10,
+	0xe8, 0x07, 0x52, 0x13, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a, 0x19, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92,
+	0x01, 0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x16,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f,
+	0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x69, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64,
+	0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x14, 0x72, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64,
+	0x64, 0x12, 0x4f, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18,
+	0x0b, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01, 0x0c, 0x22, 0x0a, 0x72,
+	0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f,
+	0x76, 0x65, 0x12, 0x38, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x18, 0x0f, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x72, 0x61, 0x63,
+	0x69, 0x6e, 0x67, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x12, 0x60, 0x0a, 0x1e,
+	0x70, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x62, 0x75, 0x66, 0x66,
+	0x65, 0x72, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x10,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x52, 0x1a, 0x70, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x75,
+	0x66, 0x66, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f,
+	0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x13, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x1a,
+	0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x1f,
+	0x9a, 0xc5, 0x88, 0x1e, 0x1a, 0x0a, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x42,
+	0x0d, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x4a, 0x04,
+	0x08, 0x06, 0x10, 0x07, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x52, 0x11, 0x70, 0x65, 0x72, 0x5f,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xf3, 0x0a,
+	0x0a, 0x0f, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x12, 0x5a, 0x0a, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01,
+	0x02, 0x08, 0x01, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4c, 0x0a,
+	0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0b,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69,
+	0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x4b, 0x65, 0x79, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
+	0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x92, 0x08, 0x0a, 0x0d, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x2d, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x24, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0xf2,
+	0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x34, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x45, 0x0a,
+	0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x67, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa,
+	0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x13, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4b, 0x0a,
+	0x19, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09,
+	0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0,
+	0x01, 0x01, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x69, 0x0a, 0x17, 0x72, 0x65,
 	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74,
-	0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e,
+	0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
 	0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70,
 	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52,
 	0x14, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4f, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a, 0x1a, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d,
-	0x6f, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01,
-	0x0c, 0x22, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x17, 0x72,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f,
-	0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x38, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e,
-	0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
-	0x12, 0x60, 0x0a, 0x1e, 0x70, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
-	0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x62, 0x79, 0x74,
-	0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1a, 0x70, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x79, 0x74,
-	0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69,
-	0x78, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x1a, 0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x3a, 0x1f, 0x9a, 0xc5, 0x88, 0x1e, 0x1a, 0x0a, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x42, 0x0d, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x03, 0xf8,
-	0x42, 0x01, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x52, 0x11,
-	0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x22, 0xf3, 0x0a, 0x0a, 0x0f, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x5a, 0x0a, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x4c, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
-	0x2e, 0x30, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12,
-	0x2c, 0x0a, 0x12, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70,
-	0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x2e, 0x0a,
-	0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x48,
-	0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x92, 0x08,
-	0x0a, 0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12,
-	0x2d, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, 0xf2,
-	0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4b,
-	0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x24, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01,
-	0xc8, 0x01, 0x00, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0d, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x34, 0x0a, 0x06, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x12, 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x67, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61,
-	0x64, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x13, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64,
-	0x64, 0x12, 0x4b, 0x0a, 0x19, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x09,
-	0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06,
-	0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x69,
-	0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03,
-	0x10, 0xe8, 0x07, 0x52, 0x14, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x4d, 0x0a, 0x1a, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f,
-	0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa,
-	0x42, 0x0d, 0x92, 0x01, 0x0a, 0x22, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52,
-	0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x85, 0x01, 0x0a, 0x17, 0x74, 0x79, 0x70,
-	0x65, 0x64, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4e, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x74, 0x79, 0x70, 0x65,
-	0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x3f, 0x0a, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x5f, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
-	0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x48, 0x00, 0x52, 0x12, 0x68,
-	0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61,
-	0x6c, 0x1a, 0x5d, 0x0a, 0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x6f, 0x73,
-	0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x52,
-	0x11, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x57, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x18, 0x0a,
-	0x16, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73, 0x70,
-	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0x8d, 0x01, 0x0a, 0x16, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x12, 0x52, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, 0xc5, 0x0a, 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x12, 0x14, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
-	0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x4e, 0x0a, 0x0a, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72,
-	0x65, 0x67, 0x65, 0x78, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x09, 0x73, 0x61, 0x66,
-	0x65, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x48, 0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x15, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x65, 0x70, 0x61,
-	0x72, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x0e, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x15, 0xfa, 0x42, 0x12, 0x72, 0x10, 0x32, 0x0e, 0x5e, 0x5b, 0x5e, 0x3f, 0x23,
-	0x5d, 0x2b, 0x5b, 0x5e, 0x3f, 0x23, 0x2f, 0x5d, 0x24, 0x48, 0x00, 0x52, 0x13, 0x70, 0x61, 0x74,
-	0x68, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x12, 0x58, 0x0a, 0x11, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x61, 0x74, 0x68, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x41, 0x0a, 0x0e, 0x63, 0x61,
-	0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0d,
-	0x63, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x59, 0x0a,
-	0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
-	0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52,
-	0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x57, 0x0a, 0x10, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x52, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x4b, 0x0a, 0x04, 0x67, 0x72, 0x70, 0x63, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x76, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0x92, 0x01,
+	0x0a, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x17, 0x72, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x52, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x12, 0x85, 0x01, 0x0a, 0x17, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x70,
+	0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x54, 0x79, 0x70,
+	0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x74, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3f, 0x0a, 0x14,
+	0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74,
+	0x65, 0x72, 0x61, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72,
+	0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x00, 0x52, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x52,
+	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x1a, 0x5d, 0x0a,
+	0x19, 0x54, 0x79, 0x70, 0x65, 0x64, 0x50, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
+	0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x37, 0x9a, 0xc5,
+	0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x57,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65,
+	0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a,
+	0x04, 0x08, 0x07, 0x10, 0x08, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x52, 0x11, 0x70, 0x65, 0x72,
+	0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x29,
+	0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x18, 0x0a, 0x16, 0x72, 0x61, 0x6e,
+	0x64, 0x6f, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x22, 0x8d, 0x01, 0x0a, 0x16, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x52,
+	0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x22, 0xc5, 0x0a, 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x18, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x14, 0x0a, 0x04,
+	0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61,
+	0x74, 0x68, 0x12, 0x4e, 0x0a, 0x0a, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78,
+	0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x09, 0x73, 0x61, 0x66, 0x65, 0x52, 0x65, 0x67,
+	0x65, 0x78, 0x12, 0x5b, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52,
+	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12,
+	0x4b, 0x0a, 0x15, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65,
+	0x64, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x42, 0x15,
+	0xfa, 0x42, 0x12, 0x72, 0x10, 0x32, 0x0e, 0x5e, 0x5b, 0x5e, 0x3f, 0x23, 0x5d, 0x2b, 0x5b, 0x5e,
+	0x3f, 0x23, 0x2f, 0x5d, 0x24, 0x48, 0x00, 0x52, 0x13, 0x70, 0x61, 0x74, 0x68, 0x53, 0x65, 0x70,
+	0x61, 0x72, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x58, 0x0a, 0x11,
+	0x70, 0x61, 0x74, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54,
+	0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x41, 0x0a, 0x0e, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73,
+	0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0d, 0x63, 0x61, 0x73, 0x65,
+	0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x59, 0x0a, 0x10, 0x72, 0x75, 0x6e,
+	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x52, 0x0f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x12, 0x57, 0x0a, 0x10, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61,
+	0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x0f, 0x71, 0x75,
+	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4b, 0x0a,
+	0x04, 0x67, 0x72, 0x70, 0x63, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47,
+	0x72, 0x70, 0x63, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x04, 0x67, 0x72, 0x70, 0x63, 0x12, 0x59, 0x0a, 0x0b, 0x74, 0x6c,
+	0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
 	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x04, 0x67, 0x72, 0x70, 0x63, 0x12, 0x59,
-	0x0a, 0x0b, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0a, 0x74,
-	0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x51, 0x0a, 0x10, 0x64, 0x79, 0x6e,
-	0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0d, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
-	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x0f, 0x64, 0x79, 0x6e,
-	0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x53, 0x0a, 0x15,
-	0x47, 0x72, 0x70, 0x63, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x72, 0x70, 0x63,
+	0x63, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0a, 0x74, 0x6c, 0x73, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x51, 0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
+	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x53, 0x0a, 0x15, 0x47, 0x72, 0x70, 0x63,
 	0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x1a, 0xc9, 0x01, 0x0a, 0x16, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x38, 0x0a, 0x09,
-	0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x65,
-	0x73, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x38, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x64,
-	0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x10, 0x0a,
-	0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x3a,
-	0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x15, 0x0a, 0x0e, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x70,
-	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x4a, 0x04, 0x08, 0x05,
-	0x10, 0x06, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22,
-	0xc5, 0x05, 0x0a, 0x0a, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5f,
-	0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x73,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x72,
-	0x69, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x70,
-	0x6f, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x12, 0x17, 0x0a, 0x07, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x6d, 0x61, 0x78, 0x41, 0x67, 0x65, 0x12, 0x47, 0x0a, 0x11, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x06,
+	0x73, 0x3a, 0x3a, 0x9a, 0xc5, 0x88, 0x1e, 0x35, 0x0a, 0x33, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0xc9, 0x01,
+	0x0a, 0x16, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x73,
+	0x65, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
+	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
+	0x65, 0x64, 0x12, 0x38, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x64, 0x3a, 0x3b, 0x9a, 0xc5,
+	0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x10, 0x0a, 0x0e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x3a, 0x24, 0x9a, 0xc5, 0x88,
+	0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x42, 0x15, 0x0a, 0x0e, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
+	0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04,
+	0x08, 0x03, 0x10, 0x04, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0xc5, 0x05, 0x0a, 0x0a,
+	0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5f, 0x0a, 0x19, 0x61, 0x6c,
+	0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x52, 0x16, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e,
+	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x23, 0x0a, 0x0d, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73,
+	0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x5f,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65,
+	0x78, 0x70, 0x6f, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x17, 0x0a, 0x07,
+	0x6d, 0x61, 0x78, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d,
+	0x61, 0x78, 0x41, 0x67, 0x65, 0x12, 0x47, 0x0a, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63,
+	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x10, 0x61, 0x6c,
+	0x6c, 0x6f, 0x77, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x12, 0x57,
+	0x0a, 0x0e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x55, 0x0a, 0x0e, 0x73, 0x68, 0x61, 0x64, 0x6f,
+	0x77, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52,
+	0x0d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x5b,
+	0x0a, 0x1c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f,
+	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x0c,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x10, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x73, 0x12, 0x57, 0x0a, 0x0e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x55, 0x0a, 0x0e, 0x73,
-	0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63,
-	0x65, 0x6e, 0x74, 0x52, 0x0d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x45, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x64, 0x12, 0x5b, 0x0a, 0x1c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3a,
-	0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02,
-	0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x52, 0x0c, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f,
-	0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x07,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0x9c, 0x2b, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x0e,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01,
-	0xc8, 0x01, 0x00, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
-	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x18, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x16, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x76, 0x0a, 0x1f, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x48,
-	0x00, 0x52, 0x1c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12,
-	0x8e, 0x01, 0x0a, 0x1f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x74, 0x5f,
-	0x66, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x1b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46,
-	0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65,
-	0x12, 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x32, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69,
-	0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0d, 0x70, 0x72,
-	0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72,
-	0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x20, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75,
-	0x74, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x12, 0x5a, 0x0a, 0x13, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x70, 0x61, 0x74, 0x68, 0x52,
-	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3f, 0x0a, 0x14,
-	0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74,
-	0x65, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72,
-	0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x48, 0x01, 0x52, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x52,
-	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x48, 0x0a,
-	0x11, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69,
-	0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x48, 0x01, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74,
-	0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f,
-	0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x1d,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01,
-	0x00, 0x48, 0x01, 0x52, 0x11, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x17, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72,
-	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65,
-	0x78, 0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62,
-	0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x52,
-	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12,
-	0x35, 0x0a, 0x17, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x78, 0x5f, 0x66, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x26, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x14, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
-	0x65, 0x64, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x69,
-	0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64,
-	0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x65, 0x61, 0x72,
-	0x6c, 0x79, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x28,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0f, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x12, 0x45, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74,
-	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72,
-	0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
-	0x79, 0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79,
-	0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x17, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f,
-	0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x08, 0x70, 0x72, 0x69,
-	0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69,
-	0x74, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72,
-	0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x41, 0x0a, 0x0b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e,
+	0x52, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3a, 0x24, 0x9a, 0xc5, 0x88,
+	0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x42, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x5f, 0x73, 0x70, 0x65,
+	0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x08,
+	0x10, 0x09, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72,
+	0x69, 0x67, 0x69, 0x6e, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x22, 0xdc, 0x2c, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52,
+	0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x48,
+	0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x12, 0x55, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x72,
-	0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x16, 0x69, 0x6e, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x5f, 0x76, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d,
-	0x69, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
-	0x2e, 0x30, 0x52, 0x13, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x68, 0x52, 0x61, 0x74,
-	0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x4e, 0x0a, 0x0b, 0x68, 0x61, 0x73, 0x68, 0x5f,
-	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x18, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x70, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x16, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x12, 0x76, 0x0a, 0x1f, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f,
+	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0a, 0x68, 0x61, 0x73,
-	0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x18,
-	0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
-	0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8,
-	0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d,
-	0x61, 0x78, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18,
-	0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x0e, 0x6d,
-	0x61, 0x78, 0x47, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a,
-	0x13, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x66,
-	0x66, 0x73, 0x65, 0x74, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
-	0x2e, 0x30, 0x52, 0x11, 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4f,
-	0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x59, 0x0a, 0x0f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0e, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73,
-	0x12, 0x67, 0x0a, 0x18, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x22, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x18, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04,
-	0x03, 0x33, 0x2e, 0x30, 0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x16,
-	0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7,
-	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x45, 0x0a,
-	0x0c, 0x68, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x1b, 0x20,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x1c, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x8e, 0x01, 0x0a, 0x1f,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x66, 0x6f, 0x75, 0x6e,
+	0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18,
+	0x14, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x1b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x45, 0x0a, 0x0e,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x32, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x72, 0x65,
+	0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08,
+	0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
+	0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78,
+	0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52, 0x0c,
+	0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x5a, 0x0a, 0x13,
+	0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x70, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3f, 0x0a, 0x14, 0x68, 0x6f, 0x73, 0x74,
+	0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00,
+	0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x48, 0x0a, 0x11, 0x61, 0x75, 0x74,
+	0x6f, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x48, 0x01, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72,
+	0x69, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72,
+	0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x48, 0x01, 0x52,
+	0x11, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x12, 0x67, 0x0a, 0x17, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x23, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65,
+	0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74,
+	0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x35, 0x0a, 0x17, 0x61,
+	0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x78, 0x5f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65,
+	0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x26, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x48, 0x6f,
+	0x73, 0x74, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07,
+	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x69, 0x64, 0x6c, 0x65, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x5f, 0x64,
+	0x61, 0x74, 0x61, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x65, 0x61,
+	0x72, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x45, 0x0a,
+	0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x09, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x64, 0x67,
-	0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x68, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x12, 0x64, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x81, 0x03, 0x0a, 0x13, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x12, 0x33, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x19, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x07,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x24, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0xf2, 0x98, 0xfe, 0x8f,
-	0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x12, 0x59, 0x0a, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f,
-	0x66, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x3f, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64,
-	0x3a, 0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d,
-	0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10,
-	0x03, 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x1a, 0x96,
-	0x0a, 0x0a, 0x0a, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e, 0x0a,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72,
+	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x16, 0x72,
+	0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x64, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x17, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
+	0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x15,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
+	0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x08,
+	0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69,
+	0x74, 0x79, 0x12, 0x41, 0x0a, 0x0b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74,
+	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x72, 0x61, 0x74, 0x65, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x16, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
+	0x5f, 0x76, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x13,
+	0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x68, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
+	0x69, 0x74, 0x73, 0x12, 0x4e, 0x0a, 0x0b, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73,
+	0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0a, 0x68, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x67,
+	0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x47, 0x72,
+	0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x13, 0x67, 0x72, 0x70,
+	0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x11,
+	0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x12, 0x59, 0x0a, 0x0f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55,
+	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x75, 0x70,
+	0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x67, 0x0a, 0x18,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52,
+	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x16, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x18, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
+	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
+	0x30, 0x18, 0x01, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x0c, 0x68, 0x65, 0x64,
+	0x67, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x52, 0x0b, 0x68, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x12, 0x64, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x64,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75,
 	0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a,
-	0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x6e, 0x2e, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x81, 0x03, 0x0a, 0x13, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x33,
+	0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x19, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x24, 0xfa, 0x42, 0x08,
+	0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x12, 0x59, 0x0a, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x0d, 0x74,
+	0x72, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0c,
+	0x74, 0x72, 0x61, 0x63, 0x65, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x3a, 0x39, 0x9a, 0xc5,
+	0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f,
+	0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x0b, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x1a, 0xd6, 0x0b, 0x0a, 0x0a, 0x48,
+	0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e, 0x0a, 0x06, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61,
+	0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48,
+	0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x06, 0x63, 0x6f, 0x6f,
+	0x6b, 0x69, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61,
+	0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x48,
+	0x00, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x79, 0x0a, 0x15, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73,
+	0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x14,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x69, 0x65, 0x73, 0x12, 0x67, 0x0a, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75,
 	0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6f,
-	0x6b, 0x69, 0x65, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x79, 0x0a,
-	0x15, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0e, 0x71,
+	0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x5e, 0x0a,
+	0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x48, 0x00,
+	0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x1a, 0xc6, 0x01, 0x0a, 0x06, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08,
+	0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65,
+	0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e,
+	0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x67,
+	0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32,
+	0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x1a, 0x5f, 0x0a, 0x0f, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, 0x74, 0x74, 0x72,
+	0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01,
+	0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0xfa, 0x42, 0x0c,
+	0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x1a, 0xfe, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x1b,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x74,
+	0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x5d, 0x0a, 0x0a,
+	0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
+	0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52,
+	0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3a, 0x37, 0x9a, 0xc5, 0x88,
+	0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f,
+	0x6f, 0x6b, 0x69, 0x65, 0x1a, 0x7a, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70, 0x3a, 0x45, 0x9a, 0xc5, 0x88, 0x1e, 0x40,
+	0x0a, 0x3e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
 	0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
 	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
-	0x48, 0x00, 0x52, 0x14, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x67, 0x0a, 0x0f, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x48,
-	0x00, 0x52, 0x0e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-	0x72, 0x12, 0x5e, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x1a, 0xc6, 0x01,
-	0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa,
-	0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65,
-	0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52,
-	0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x37, 0x9a,
-	0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x1a, 0x9f, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69,
-	0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b,
-	0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70,
-	0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x3a,
-	0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x1a, 0x6e, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+	0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a,
+	0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a, 0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
 	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65,
 	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x1a, 0x7a, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
-	0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70, 0x3a, 0x45, 0x9a,
-	0xc5, 0x88, 0x1e, 0x40, 0x0a, 0x3e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x69, 0x65, 0x73, 0x1a, 0x6e, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x3a, 0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a, 0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x1a, 0x66, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x3c,
-	0x9a, 0xc5, 0x88, 0x1e, 0x37, 0x0a, 0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x30, 0x9a, 0xc5,
-	0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x17,
-	0x0a, 0x10, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69,
-	0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa3, 0x03, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72,
-	0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x0c, 0x75, 0x70, 0x67,
-	0x72, 0x61, 0x64, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0b,
-	0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x34, 0x0a, 0x07, 0x65,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
-	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x64, 0x12, 0x65, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70,
-	0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x8d, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x15, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61,
-	0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x73, 0x74, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a,
-	0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f,
+	0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+	0x1a, 0x66, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x3c, 0x9a, 0xc5, 0x88, 0x1e,
+	0x37, 0x0a, 0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a,
+	0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f,
 	0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x88, 0x02,
-	0x0a, 0x11, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x49, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x17, 0x0a, 0x10, 0x70, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03,
+	0xf8, 0x42, 0x01, 0x1a, 0xa3, 0x03, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a,
+	0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72,
+	0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x65, 0x0a,
+	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64,
+	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x1a, 0x8d, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x15, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70,
+	0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
+	0x50, 0x6f, 0x73, 0x74, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
+	0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72,
+	0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x88, 0x02, 0x0a, 0x11, 0x4d, 0x61,
+	0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x49, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x64, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x17, 0x67, 0x72,
+	0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x14, 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x12, 0x56, 0x0a, 0x1a,
+	0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50,
-	0x0a, 0x17, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x14, 0x67, 0x72, 0x70, 0x63,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78,
-	0x12, 0x56, 0x0a, 0x1a, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x17, 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x60, 0x0a, 0x1b, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x45, 0x52, 0x56, 0x49,
-	0x43, 0x45, 0x5f, 0x55, 0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x00,
-	0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12,
-	0x19, 0x0a, 0x15, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56,
-	0x45, 0x52, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x22, 0x5e, 0x0a, 0x16, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52,
-	0x4f, 0x55, 0x47, 0x48, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45,
-	0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x4e, 0x44,
-	0x4c, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49,
-	0x52, 0x45, 0x43, 0x54, 0x10, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e,
-	0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x42, 0x18, 0x0a, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65,
-	0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x18, 0x0a, 0x16, 0x68,
-	0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x12, 0x10,
-	0x13, 0x4a, 0x04, 0x08, 0x13, 0x10, 0x14, 0x4a, 0x04, 0x08, 0x10, 0x10, 0x11, 0x4a, 0x04, 0x08,
-	0x16, 0x10, 0x17, 0x4a, 0x04, 0x08, 0x15, 0x10, 0x16, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x52,
-	0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f,
-	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xbf, 0x10, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f,
-	0x6e, 0x12, 0x52, 0x0a, 0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61,
-	0x78, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65,
-	0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x41, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79,
-	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x70, 0x65, 0x72, 0x54, 0x72,
-	0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x70, 0x65, 0x72, 0x5f,
-	0x74, 0x72, 0x79, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x11, 0x70, 0x65, 0x72, 0x54, 0x72, 0x79, 0x49, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x12, 0x57, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x72,
-	0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65,
+	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, 0x67, 0x72, 0x70,
+	0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x22, 0x60, 0x0a, 0x1b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e,
+	0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43,
+	0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x55,
+	0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09,
+	0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x49,
+	0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x45,
+	0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x22, 0x5e, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x22, 0x0a, 0x1e, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52, 0x4f, 0x55, 0x47, 0x48,
+	0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45,
+	0x43, 0x54, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x4e, 0x44, 0x4c, 0x45, 0x5f, 0x49,
+	0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54,
+	0x10, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74,
+	0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x18, 0x0a,
+	0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69,
+	0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x6f, 0x73, 0x74, 0x5f,
+	0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x12, 0x10, 0x13, 0x4a, 0x04, 0x08,
+	0x13, 0x10, 0x14, 0x4a, 0x04, 0x08, 0x10, 0x10, 0x11, 0x4a, 0x04, 0x08, 0x16, 0x10, 0x17, 0x4a,
+	0x04, 0x08, 0x15, 0x10, 0x16, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x52, 0x15, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x22, 0xbf, 0x10, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x12, 0x52, 0x0a,
+	0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65,
+	0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65,
+	0x73, 0x12, 0x41, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x70, 0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f,
+	0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0d, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x70,
+	0x65, 0x72, 0x54, 0x72, 0x79, 0x49, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x12, 0x57, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69,
+	0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74,
+	0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x74, 0x72,
+	0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x67, 0x0a, 0x14, 0x72, 0x65, 0x74,
+	0x72, 0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72,
+	0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x12,
+	0x72, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x12, 0x64, 0x0a, 0x18, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0c,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
+	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72,
+	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x21, 0x68, 0x6f, 0x73, 0x74,
+	0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79,
+	0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x41, 0x74, 0x74, 0x65, 0x6d, 0x70,
+	0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03,
+	0x28, 0x0d, 0x52, 0x14, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x55, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72,
+	0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66,
+	0x66, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12,
+	0x78, 0x0a, 0x1b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x5f,
+	0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74,
+	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
+	0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66,
+	0x52, 0x17, 0x72, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74,
+	0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x51, 0x0a, 0x11, 0x72, 0x65, 0x74,
+	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x09,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x10, 0x72, 0x65, 0x74, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x60, 0x0a, 0x19,
+	0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x17, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0xb9,
+	0x01, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79,
+	0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a,
+	0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70,
+	0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a,
+	0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x0d, 0x0a,
+	0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02,
+	0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xc3, 0x01, 0x0a, 0x12, 0x52,
+	0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39,
+	0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79,
+	0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33,
+	0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x1a, 0xd6, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66,
+	0x66, 0x12, 0x4a, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76,
+	0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, 0x2a, 0x00, 0x52,
+	0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x46, 0x0a,
+	0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08,
+	0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, 0x2b, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74,
+	0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x1a, 0x88, 0x01, 0x0a, 0x0b, 0x52, 0x65,
+	0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01,
+	0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x06,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x34, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
 	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0d,
-	0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x67, 0x0a,
-	0x14, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
-	0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x52, 0x12, 0x72, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x64, 0x0a, 0x18, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x21,
-	0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72,
-	0x65, 0x74, 0x72, 0x79, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74,
-	0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x6c,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x41, 0x74,
-	0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61,
-	0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73,
-	0x18, 0x07, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x14, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x55, 0x0a, 0x0e,
-	0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74,
-	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61,
-	0x63, 0x6b, 0x4f, 0x66, 0x66, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b,
-	0x4f, 0x66, 0x66, 0x12, 0x78, 0x0a, 0x1b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f,
-	0x66, 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x61, 0x74,
-	0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63,
-	0x6b, 0x4f, 0x66, 0x66, 0x52, 0x17, 0x72, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65,
-	0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x51, 0x0a,
-	0x11, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x10,
-	0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x12, 0x60, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x17, 0x72, 0x65, 0x74, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x1a, 0xb9, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f,
-	0x72, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52,
-	0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x33, 0x9a, 0xc5,
-	0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
-	0x79, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xc3,
-	0x01, 0x0a, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00,
-	0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x38, 0x9a,
-	0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x2e, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x66, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x1a, 0xc0, 0x01, 0x0a, 0x17, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
+	0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66,
+	0x12, 0x5d, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x65,
+	0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08,
+	0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12,
+	0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x34, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x65, 0x74,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x0b, 0x0a, 0x07,
+	0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x53, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x55, 0x4e, 0x49,
+	0x58, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x01, 0x3a, 0x25, 0x9a,
+	0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x1a, 0xd6, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61,
-	0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x4a, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08,
-	0x01, 0x2a, 0x00, 0x52, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x12, 0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61,
-	0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d,
-	0x0a, 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x1a, 0x88, 0x01,
-	0x0a, 0x0b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a,
-	0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x56, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01,
-	0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x1a, 0xc0, 0x01, 0x0a, 0x17, 0x52, 0x61, 0x74,
-	0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63,
-	0x6b, 0x4f, 0x66, 0x66, 0x12, 0x5d, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e,
-	0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x12, 0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b,
-	0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x34, 0x0a, 0x11, 0x52,
-	0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x12, 0x0b, 0x0a, 0x07, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x53, 0x10, 0x00, 0x12, 0x12, 0x0a,
-	0x0e, 0x55, 0x4e, 0x49, 0x58, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10,
-	0x01, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74,
-	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x9c, 0x02, 0x0a, 0x0b, 0x48, 0x65, 0x64,
-	0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x50, 0x0a, 0x10, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x0f, 0x69, 0x6e, 0x69, 0x74, 0x69,
-	0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x19, 0x61, 0x64,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x5f, 0x63, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52,
-	0x17, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x18, 0x68, 0x65, 0x64, 0x67,
-	0x65, 0x5f, 0x6f, 0x6e, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x68, 0x65, 0x64, 0x67,
-	0x65, 0x4f, 0x6e, 0x50, 0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x64, 0x67,
-	0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xe1, 0x05, 0x0a, 0x0e, 0x52, 0x65, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0e, 0x68, 0x74,
-	0x74, 0x70, 0x73, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x68, 0x74, 0x74, 0x70, 0x73, 0x52, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x12, 0x29, 0x0a, 0x0f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x30,
-	0x0a, 0x0d, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8,
-	0x01, 0x00, 0x52, 0x0c, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
-	0x12, 0x23, 0x0a, 0x0d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x64,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x32, 0x0a, 0x0d, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42,
-	0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x48, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x74,
-	0x68, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x34, 0x0a, 0x0e, 0x70, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x48, 0x01,
-	0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12,
-	0x55, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
-	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52,
-	0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73,
-	0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52,
-	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x69, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64,
-	0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x70, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x22, 0x77, 0x0a, 0x14, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f,
-	0x56, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x4c, 0x59, 0x10,
-	0x00, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09,
-	0x53, 0x45, 0x45, 0x5f, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x54,
-	0x45, 0x4d, 0x50, 0x4f, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43,
-	0x54, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54,
-	0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x04, 0x3a, 0x28, 0x9a, 0xc5, 0x88,
-	0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f,
-	0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x42, 0x18, 0x0a, 0x16, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74,
-	0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0xa1, 0x01, 0x0a, 0x14,
-	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0d, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8,
-	0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44,
-	0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x3a,
-	0x2e, 0x9a, 0xc5, 0x88, 0x1e, 0x29, 0x0a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22,
-	0x15, 0x0a, 0x13, 0x4e, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x91, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x63, 0x6f, 0x72,
-	0x61, 0x74, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01,
-	0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x70,
-	0x72, 0x6f, 0x70, 0x61, 0x67, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x6c, 0x69, 0x63, 0x79, 0x22, 0x9c, 0x02, 0x0a, 0x0b, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x12, 0x50, 0x0a, 0x10, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x70,
-	0x61, 0x67, 0x61, 0x74, 0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x44, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0xd2, 0x02, 0x0a, 0x07, 0x54,
-	0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x12, 0x49, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e,
-	0x74, 0x52, 0x0e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e,
-	0x67, 0x12, 0x49, 0x0a, 0x0f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x73, 0x61, 0x6d, 0x70,
-	0x6c, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x61,
-	0x6e, 0x64, 0x6f, 0x6d, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x4b, 0x0a, 0x10,
-	0x6f, 0x76, 0x65, 0x72, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x0f, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x19, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61,
+	0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x17, 0x61, 0x64, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x68,
+	0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x18, 0x68, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6f, 0x6e,
+	0x5f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x68, 0x65, 0x64, 0x67, 0x65, 0x4f, 0x6e, 0x50,
+	0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3a, 0x25, 0x9a, 0xc5,
+	0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
+	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x22, 0xe1, 0x05, 0x0a, 0x0e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0e, 0x68, 0x74, 0x74, 0x70, 0x73, 0x5f,
+	0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00,
+	0x52, 0x0d, 0x68, 0x74, 0x74, 0x70, 0x73, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12,
+	0x29, 0x0a, 0x0f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x30, 0x0a, 0x0d, 0x68, 0x6f,
+	0x73, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0c,
+	0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x23, 0x0a, 0x0d,
+	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x12, 0x32, 0x0a, 0x0d, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x64,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x34, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f,
+	0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa,
+	0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0d, 0x70, 0x72,
+	0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x55, 0x0a, 0x0d, 0x72,
+	0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75,
+	0x74, 0x65, 0x48, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69,
+	0x74, 0x65, 0x12, 0x69, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63,
+	0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a,
+	0x0b, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x22, 0x77,
+	0x0a, 0x14, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x44, 0x5f,
+	0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x4c, 0x59, 0x10, 0x00, 0x12, 0x09, 0x0a,
+	0x05, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x45, 0x45, 0x5f,
+	0x4f, 0x54, 0x48, 0x45, 0x52, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x45, 0x4d, 0x50, 0x4f,
+	0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12,
+	0x16, 0x0a, 0x12, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x44,
+	0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x04, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x77, 0x72,
+	0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x18, 0x0a,
+	0x16, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70,
+	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x44, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x23, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x42, 0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8, 0x01, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x3a, 0x2e, 0x9a, 0xc5, 0x88,
+	0x1e, 0x29, 0x0a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x4e,
+	0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x22, 0x91, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72,
+	0x12, 0x25, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x09, 0x6f, 0x70,
+	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x61,
+	0x67, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f,
+	0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x61, 0x67, 0x61, 0x74,
+	0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x65, 0x63,
+	0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0xd2, 0x02, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x63, 0x69,
+	0x6e, 0x67, 0x12, 0x49, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x61, 0x6d,
+	0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x49, 0x0a,
+	0x0f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
 	0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x6c,
-	0x6c, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x41, 0x0a, 0x0b, 0x63, 0x75, 0x73,
-	0x74, 0x6f, 0x6d, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63,
-	0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67,
-	0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x73, 0x3a, 0x21, 0x9a, 0xc5,
-	0x88, 0x1e, 0x1c, 0x0a, 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22,
-	0xb4, 0x01, 0x0a, 0x0e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a,
-	0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75,
-	0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a,
-	0x04, 0x08, 0x03, 0x10, 0x04, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x52, 0x06,
-	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x22, 0xc9, 0x1c, 0x0a, 0x09, 0x52, 0x61, 0x74, 0x65, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x12, 0x3b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x0a, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67,
-	0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4b,
-	0x65, 0x79, 0x12, 0x4b, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x3f, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+	0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x4b, 0x0a, 0x10, 0x6f, 0x76, 0x65, 0x72,
+	0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72,
+	0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x6c, 0x6c, 0x53, 0x61, 0x6d,
+	0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x41, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f,
+	0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e,
+	0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x52, 0x0a, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x73, 0x3a, 0x21, 0x9a, 0xc5, 0x88, 0x1e, 0x1c, 0x0a,
+	0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0xb4, 0x01, 0x0a, 0x0e,
+	0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x3e,
+	0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x1b,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88,
+	0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x03, 0x10,
+	0x04, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68,
+	0x6f, 0x64, 0x22, 0xc9, 0x1c, 0x0a, 0x09, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
+	0x12, 0x3b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa,
+	0x42, 0x04, 0x2a, 0x02, 0x18, 0x0a, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x1f, 0x0a,
+	0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4b,
+	0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
+	0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
+	0x08, 0x01, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3f, 0x0a, 0x05, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x76, 0x65,
+	0x72, 0x72, 0x69, 0x64, 0x65, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0xb5, 0x18, 0x0a,
+	0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5e, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
+	0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74,
+	0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65,
+	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x48, 0x00, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
+	0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x5e, 0x0a, 0x0e, 0x72, 0x65, 0x6d,
+	0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69,
+	0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74,
+	0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f,
+	0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x55, 0x0a, 0x0b, 0x67, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
 	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
-	0x2e, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x1a, 0xb5, 0x18, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5e, 0x0a, 0x0e, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x13, 0x64,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x0f, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x0e, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x5e, 0x0a,
-	0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b,
+	0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79,
+	0x12, 0x68, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x10, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x77, 0x0a, 0x10, 0x64, 0x79,
+	0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74,
+	0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x79,
+	0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x42, 0x11, 0x92,
+	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01,
+	0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61,
-	0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52,
-	0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x0d,
-	0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x55, 0x0a,
-	0x0b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
-	0x63, 0x4b, 0x65, 0x79, 0x12, 0x68, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x10, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x77,
-	0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79,
+	0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x48, 0x00, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12,
+	0x71, 0x0a, 0x15, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
+	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65,
+	0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x13, 0x6d,
+	0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x1b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33,
 	0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74,
-	0x61, 0x42, 0x11, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0xb8, 0xee,
-	0xf2, 0xd2, 0x05, 0x01, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x08, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x71, 0x0a, 0x15, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x5f, 0x72, 0x65,
-	0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x73, 0x6b,
-	0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48,
-	0x00, 0x52, 0x13, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x1b, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
-	0x52, 0x18, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x49, 0x0a, 0x0d, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x38, 0x9a, 0xc5, 0x88,
+	0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x71, 0x75,
+	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x49, 0x0a, 0x0d, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x1a, 0x53, 0x0a, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38, 0x0a, 0x36,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0xd1, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d,
+	0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6b, 0x69,
+	0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x3a,
+	0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x49, 0x0a, 0x0d, 0x52, 0x65,
+	0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x38, 0x9a, 0xc5, 0x88,
 	0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
 	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
-	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x53, 0x0a, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3d, 0x9a, 0xc5, 0x88,
-	0x1e, 0x38, 0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
-	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0xd1, 0x01, 0x0a, 0x0e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a,
-	0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01,
-	0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a,
-	0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a,
-	0x0e, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73,
-	0x65, 0x6e, 0x74, 0x3a, 0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52,
-	0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x49,
-	0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a,
-	0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x6d, 0x6f,
-	0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0xbe, 0x01, 0x0a, 0x13, 0x4d, 0x61,
-	0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x12, 0x52, 0x0a, 0x12, 0x76, 0x34, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d,
-	0x61, 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0xbe, 0x01, 0x0a, 0x13, 0x4d, 0x61, 0x73, 0x6b, 0x65, 0x64,
+	0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x52, 0x0a,
+	0x12, 0x76, 0x34, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x5f,
+	0x6c, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
+	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x20,
+	0x52, 0x0f, 0x76, 0x34, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x73, 0x6b, 0x4c, 0x65,
+	0x6e, 0x12, 0x53, 0x0a, 0x12, 0x76, 0x36, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d,
+	0x61, 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04,
-	0x2a, 0x02, 0x18, 0x20, 0x52, 0x0f, 0x76, 0x34, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61,
-	0x73, 0x6b, 0x4c, 0x65, 0x6e, 0x12, 0x53, 0x0a, 0x12, 0x76, 0x36, 0x5f, 0x70, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x0f, 0x76, 0x36, 0x50, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x4d, 0x61, 0x73, 0x6b, 0x4c, 0x65, 0x6e, 0x1a, 0x9e, 0x01, 0x0a, 0x0a, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a,
-	0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x4b, 0x65, 0x79, 0x3a, 0x35, 0x9a, 0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0xb3, 0x02, 0x0a, 0x10,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b,
-	0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x65,
-	0x78, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0b, 0x65,
-	0x78, 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x48, 0x0a, 0x07, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x1a, 0xb8, 0x01, 0x0a, 0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74,
+	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x0f, 0x76, 0x36, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d,
+	0x61, 0x73, 0x6b, 0x4c, 0x65, 0x6e, 0x1a, 0x9e, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79,
+	0x3a, 0x35, 0x9a, 0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65,
+	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0xb3, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e,
+	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
+	0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
+	0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
+	0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x63,
+	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x65, 0x63,
+	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x48, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65,
+	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xb8, 0x01,
+	0x0a, 0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74,
+	0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65,
+	0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33,
+	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xda, 0x02, 0x0a, 0x08, 0x4d, 0x65, 0x74,
 	0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
 	0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
 	0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
@@ -7701,170 +7844,164 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{
 	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61,
 	0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75,
 	0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xda, 0x02, 0x0a,
-	0x08, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b,
-	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x59, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61,
-	0x74, 0x61, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x73,
-	0x6b, 0x69, 0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e,
-	0x74, 0x22, 0x26, 0x0a, 0x06, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x44,
-	0x59, 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x4f, 0x55, 0x54,
-	0x45, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x10, 0x01, 0x1a, 0x97, 0x02, 0x0a, 0x18, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a,
-	0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01,
-	0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x61, 0x0a, 0x10, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
-	0x08, 0x01, 0x52, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-	0x65, 0x72, 0x73, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52,
-	0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x17, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xf2, 0x01, 0x0a, 0x08, 0x4f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x66, 0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
-	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d,
-	0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79,
-	0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x63, 0x0a,
-	0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
-	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b,
-	0x65, 0x79, 0x42, 0x19, 0x0a, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x23, 0x9a,
-	0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x22, 0xe6, 0x05, 0x0a, 0x0d, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01,
-	0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x61,
-	0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x5c, 0x0a, 0x10, 0x73, 0x61, 0x66, 0x65, 0x5f,
-	0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
-	0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x61, 0x66, 0x65, 0x52, 0x65, 0x67, 0x65, 0x78,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3c, 0x0a, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72,
-	0x65, 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x70, 0x72,
-	0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x12, 0x18, 0x01, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04,
-	0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0x18, 0x01, 0xfa, 0x42, 0x04,
-	0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52,
-	0x0b, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a, 0x0e,
-	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0c,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0x18, 0x01, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92,
-	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74,
-	0x61, 0x69, 0x6e, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x49, 0x0a, 0x0c, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x65,
-	0x72, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x1d, 0x74, 0x72, 0x65, 0x61, 0x74,
-	0x5f, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
-	0x61, 0x73, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19,
-	0x74, 0x72, 0x65, 0x61, 0x74, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x41, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22,
-	0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x02,
-	0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x0b,
-	0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xa1, 0x02, 0x0a, 0x15,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x10, 0x01, 0x28, 0x80, 0x08, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
+	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x59, 0x0a, 0x06,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
+	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6b, 0x69, 0x70, 0x5f,
+	0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a,
+	0x06, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x59, 0x4e, 0x41, 0x4d,
+	0x49, 0x43, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x4f, 0x55, 0x54, 0x45, 0x5f, 0x45, 0x4e,
+	0x54, 0x52, 0x59, 0x10, 0x01, 0x1a, 0x97, 0x02, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50,
+	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
+	0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a,
+	0x0c, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
+	0x0b, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x61, 0x0a, 0x10,
+	0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x0f,
+	0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x3a,
+	0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x10, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12,
+	0x03, 0xf8, 0x42, 0x01, 0x1a, 0xf2, 0x01, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64,
+	0x65, 0x12, 0x66, 0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x76,
+	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69,
+	0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x63, 0x0a, 0x0f, 0x44, 0x79, 0x6e,
+	0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x50, 0x0a, 0x0c,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x19,
+	0x0a, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e,
+	0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0xe6,
+	0x05, 0x0a, 0x0d, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d,
+	0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x5c, 0x0a, 0x10, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x65,
+	0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48,
+	0x00, 0x52, 0x0e, 0x73, 0x61, 0x66, 0x65, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x12, 0x3c, 0x0a, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e,
+	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
+	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42,
+	0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x37, 0x0a, 0x0c, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x75, 0x66,
+	0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74,
+	0x61, 0x69, 0x6e, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
+	0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x49, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
 	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72,
-	0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x42, 0x21, 0x0a, 0x1f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61,
-	0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10,
-	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22,
-	0xb9, 0x02, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x52, 0x0a, 0x16, 0x6d, 0x61,
-	0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x40,
-	0x0a, 0x17, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x10, 0x05, 0x52, 0x15, 0x72, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73,
-	0x12, 0x4a, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0a, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x1b,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x68, 0x65,
-	0x6d, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x18, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x63, 0x68,
-	0x65, 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x22, 0x79, 0x0a, 0x0c, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x06, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
-	0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
-	0x69, 0x73, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x8b, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x14,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x1d, 0x74, 0x72, 0x65, 0x61, 0x74, 0x5f, 0x6d, 0x69, 0x73,
+	0x73, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x5f, 0x65,
+	0x6d, 0x70, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x74, 0x72, 0x65, 0x61,
+	0x74, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x73,
+	0x45, 0x6d, 0x70, 0x74, 0x79, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x18,
+	0x0a, 0x16, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04,
+	0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x0b, 0x72, 0x65, 0x67, 0x65,
+	0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xa1, 0x02, 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x10, 0x01, 0x28, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x53, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
+	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e,
+	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52,
+	0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x3a, 0x2f, 0x9a,
+	0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x21,
+	0x0a, 0x1f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+	0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0x86, 0x03, 0x0a, 0x16,
+	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x52, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x17, 0x72, 0x65,
+	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f,
+	0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x92, 0x01, 0x02, 0x10, 0x05, 0x52, 0x15, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x4a, 0x0a, 0x0a,
+	0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x70, 0x72,
+	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x61, 0x6c, 0x6c, 0x6f,
+	0x77, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72,
+	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x52,
+	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x4b, 0x0a, 0x18, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x63,
+	0x6f, 0x70, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01,
+	0x0c, 0x18, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x15, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f,
+	0x43, 0x6f, 0x70, 0x79, 0x22, 0x79, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42,
+	0x8b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42,
+	0x14, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -7880,7 +8017,7 @@ func file_envoy_config_route_v3_route_components_proto_rawDescGZIP() []byte {
 }
 
 var file_envoy_config_route_v3_route_components_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
-var file_envoy_config_route_v3_route_components_proto_msgTypes = make([]protoimpl.MessageInfo, 57)
+var file_envoy_config_route_v3_route_components_proto_msgTypes = make([]protoimpl.MessageInfo, 58)
 var file_envoy_config_route_v3_route_components_proto_goTypes = []interface{}{
 	(VirtualHost_TlsRequirementType)(0),                 // 0: envoy.config.route.v3.VirtualHost.TlsRequirementType
 	(RouteAction_ClusterNotFoundResponseCode)(0),        // 1: envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode
@@ -7922,215 +8059,218 @@ var file_envoy_config_route_v3_route_components_proto_goTypes = []interface{}{
 	(*RouteAction_UpgradeConfig)(nil),                   // 37: envoy.config.route.v3.RouteAction.UpgradeConfig
 	(*RouteAction_MaxStreamDuration)(nil),               // 38: envoy.config.route.v3.RouteAction.MaxStreamDuration
 	(*RouteAction_HashPolicy_Header)(nil),               // 39: envoy.config.route.v3.RouteAction.HashPolicy.Header
-	(*RouteAction_HashPolicy_Cookie)(nil),               // 40: envoy.config.route.v3.RouteAction.HashPolicy.Cookie
-	(*RouteAction_HashPolicy_ConnectionProperties)(nil), // 41: envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties
-	(*RouteAction_HashPolicy_QueryParameter)(nil),       // 42: envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter
-	(*RouteAction_HashPolicy_FilterState)(nil),          // 43: envoy.config.route.v3.RouteAction.HashPolicy.FilterState
-	(*RouteAction_UpgradeConfig_ConnectConfig)(nil),     // 44: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig
-	(*RetryPolicy_RetryPriority)(nil),                   // 45: envoy.config.route.v3.RetryPolicy.RetryPriority
-	(*RetryPolicy_RetryHostPredicate)(nil),              // 46: envoy.config.route.v3.RetryPolicy.RetryHostPredicate
-	(*RetryPolicy_RetryBackOff)(nil),                    // 47: envoy.config.route.v3.RetryPolicy.RetryBackOff
-	(*RetryPolicy_ResetHeader)(nil),                     // 48: envoy.config.route.v3.RetryPolicy.ResetHeader
-	(*RetryPolicy_RateLimitedRetryBackOff)(nil),         // 49: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff
-	(*RateLimit_Action)(nil),                            // 50: envoy.config.route.v3.RateLimit.Action
-	(*RateLimit_Override)(nil),                          // 51: envoy.config.route.v3.RateLimit.Override
-	(*RateLimit_Action_SourceCluster)(nil),              // 52: envoy.config.route.v3.RateLimit.Action.SourceCluster
-	(*RateLimit_Action_DestinationCluster)(nil),         // 53: envoy.config.route.v3.RateLimit.Action.DestinationCluster
-	(*RateLimit_Action_RequestHeaders)(nil),             // 54: envoy.config.route.v3.RateLimit.Action.RequestHeaders
-	(*RateLimit_Action_RemoteAddress)(nil),              // 55: envoy.config.route.v3.RateLimit.Action.RemoteAddress
-	(*RateLimit_Action_MaskedRemoteAddress)(nil),        // 56: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress
-	(*RateLimit_Action_GenericKey)(nil),                 // 57: envoy.config.route.v3.RateLimit.Action.GenericKey
-	(*RateLimit_Action_HeaderValueMatch)(nil),           // 58: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch
-	(*RateLimit_Action_DynamicMetaData)(nil),            // 59: envoy.config.route.v3.RateLimit.Action.DynamicMetaData
-	(*RateLimit_Action_MetaData)(nil),                   // 60: envoy.config.route.v3.RateLimit.Action.MetaData
-	(*RateLimit_Action_QueryParameterValueMatch)(nil),   // 61: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch
-	(*RateLimit_Override_DynamicMetadata)(nil),          // 62: envoy.config.route.v3.RateLimit.Override.DynamicMetadata
-	(*v3.Matcher)(nil),                                  // 63: xds.type.matcher.v3.Matcher
-	(*v31.HeaderValueOption)(nil),                       // 64: envoy.config.core.v3.HeaderValueOption
-	(*any1.Any)(nil),                                    // 65: google.protobuf.Any
-	(*wrappers.UInt32Value)(nil),                        // 66: google.protobuf.UInt32Value
-	(*v31.Metadata)(nil),                                // 67: envoy.config.core.v3.Metadata
-	(*v31.TypedExtensionConfig)(nil),                    // 68: envoy.config.core.v3.TypedExtensionConfig
-	(*v32.RegexMatcher)(nil),                            // 69: envoy.type.matcher.v3.RegexMatcher
-	(*wrappers.BoolValue)(nil),                          // 70: google.protobuf.BoolValue
-	(*v31.RuntimeFractionalPercent)(nil),                // 71: envoy.config.core.v3.RuntimeFractionalPercent
-	(*v32.MetadataMatcher)(nil),                         // 72: envoy.type.matcher.v3.MetadataMatcher
-	(*v32.StringMatcher)(nil),                           // 73: envoy.type.matcher.v3.StringMatcher
-	(*v32.RegexMatchAndSubstitute)(nil),                 // 74: envoy.type.matcher.v3.RegexMatchAndSubstitute
-	(*duration.Duration)(nil),                           // 75: google.protobuf.Duration
-	(v31.RoutingPriority)(0),                            // 76: envoy.config.core.v3.RoutingPriority
-	(*v33.FractionalPercent)(nil),                       // 77: envoy.type.v3.FractionalPercent
-	(*v31.DataSource)(nil),                              // 78: envoy.config.core.v3.DataSource
-	(*v34.CustomTag)(nil),                               // 79: envoy.type.tracing.v3.CustomTag
-	(*v33.Int64Range)(nil),                              // 80: envoy.type.v3.Int64Range
-	(*v31.ProxyProtocolConfig)(nil),                     // 81: envoy.config.core.v3.ProxyProtocolConfig
-	(*v35.MetadataKey)(nil),                             // 82: envoy.type.metadata.v3.MetadataKey
+	(*RouteAction_HashPolicy_CookieAttribute)(nil),      // 40: envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute
+	(*RouteAction_HashPolicy_Cookie)(nil),               // 41: envoy.config.route.v3.RouteAction.HashPolicy.Cookie
+	(*RouteAction_HashPolicy_ConnectionProperties)(nil), // 42: envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties
+	(*RouteAction_HashPolicy_QueryParameter)(nil),       // 43: envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter
+	(*RouteAction_HashPolicy_FilterState)(nil),          // 44: envoy.config.route.v3.RouteAction.HashPolicy.FilterState
+	(*RouteAction_UpgradeConfig_ConnectConfig)(nil),     // 45: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig
+	(*RetryPolicy_RetryPriority)(nil),                   // 46: envoy.config.route.v3.RetryPolicy.RetryPriority
+	(*RetryPolicy_RetryHostPredicate)(nil),              // 47: envoy.config.route.v3.RetryPolicy.RetryHostPredicate
+	(*RetryPolicy_RetryBackOff)(nil),                    // 48: envoy.config.route.v3.RetryPolicy.RetryBackOff
+	(*RetryPolicy_ResetHeader)(nil),                     // 49: envoy.config.route.v3.RetryPolicy.ResetHeader
+	(*RetryPolicy_RateLimitedRetryBackOff)(nil),         // 50: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff
+	(*RateLimit_Action)(nil),                            // 51: envoy.config.route.v3.RateLimit.Action
+	(*RateLimit_Override)(nil),                          // 52: envoy.config.route.v3.RateLimit.Override
+	(*RateLimit_Action_SourceCluster)(nil),              // 53: envoy.config.route.v3.RateLimit.Action.SourceCluster
+	(*RateLimit_Action_DestinationCluster)(nil),         // 54: envoy.config.route.v3.RateLimit.Action.DestinationCluster
+	(*RateLimit_Action_RequestHeaders)(nil),             // 55: envoy.config.route.v3.RateLimit.Action.RequestHeaders
+	(*RateLimit_Action_RemoteAddress)(nil),              // 56: envoy.config.route.v3.RateLimit.Action.RemoteAddress
+	(*RateLimit_Action_MaskedRemoteAddress)(nil),        // 57: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress
+	(*RateLimit_Action_GenericKey)(nil),                 // 58: envoy.config.route.v3.RateLimit.Action.GenericKey
+	(*RateLimit_Action_HeaderValueMatch)(nil),           // 59: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch
+	(*RateLimit_Action_DynamicMetaData)(nil),            // 60: envoy.config.route.v3.RateLimit.Action.DynamicMetaData
+	(*RateLimit_Action_MetaData)(nil),                   // 61: envoy.config.route.v3.RateLimit.Action.MetaData
+	(*RateLimit_Action_QueryParameterValueMatch)(nil),   // 62: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch
+	(*RateLimit_Override_DynamicMetadata)(nil),          // 63: envoy.config.route.v3.RateLimit.Override.DynamicMetadata
+	(*v3.Matcher)(nil),                                  // 64: xds.type.matcher.v3.Matcher
+	(*v31.HeaderValueOption)(nil),                       // 65: envoy.config.core.v3.HeaderValueOption
+	(*any1.Any)(nil),                                    // 66: google.protobuf.Any
+	(*wrappers.UInt32Value)(nil),                        // 67: google.protobuf.UInt32Value
+	(*v31.Metadata)(nil),                                // 68: envoy.config.core.v3.Metadata
+	(*v31.TypedExtensionConfig)(nil),                    // 69: envoy.config.core.v3.TypedExtensionConfig
+	(*v32.RegexMatcher)(nil),                            // 70: envoy.type.matcher.v3.RegexMatcher
+	(*wrappers.BoolValue)(nil),                          // 71: google.protobuf.BoolValue
+	(*v31.RuntimeFractionalPercent)(nil),                // 72: envoy.config.core.v3.RuntimeFractionalPercent
+	(*v32.MetadataMatcher)(nil),                         // 73: envoy.type.matcher.v3.MetadataMatcher
+	(*v32.StringMatcher)(nil),                           // 74: envoy.type.matcher.v3.StringMatcher
+	(*v32.RegexMatchAndSubstitute)(nil),                 // 75: envoy.type.matcher.v3.RegexMatchAndSubstitute
+	(*duration.Duration)(nil),                           // 76: google.protobuf.Duration
+	(v31.RoutingPriority)(0),                            // 77: envoy.config.core.v3.RoutingPriority
+	(*v33.FractionalPercent)(nil),                       // 78: envoy.type.v3.FractionalPercent
+	(*v31.DataSource)(nil),                              // 79: envoy.config.core.v3.DataSource
+	(*v34.CustomTag)(nil),                               // 80: envoy.type.tracing.v3.CustomTag
+	(*v33.Int64Range)(nil),                              // 81: envoy.type.v3.Int64Range
+	(*v31.ProxyProtocolConfig)(nil),                     // 82: envoy.config.core.v3.ProxyProtocolConfig
+	(*v35.MetadataKey)(nil),                             // 83: envoy.type.metadata.v3.MetadataKey
 }
 var file_envoy_config_route_v3_route_components_proto_depIdxs = []int32{
 	9,   // 0: envoy.config.route.v3.VirtualHost.routes:type_name -> envoy.config.route.v3.Route
-	63,  // 1: envoy.config.route.v3.VirtualHost.matcher:type_name -> xds.type.matcher.v3.Matcher
+	64,  // 1: envoy.config.route.v3.VirtualHost.matcher:type_name -> xds.type.matcher.v3.Matcher
 	0,   // 2: envoy.config.route.v3.VirtualHost.require_tls:type_name -> envoy.config.route.v3.VirtualHost.TlsRequirementType
 	22,  // 3: envoy.config.route.v3.VirtualHost.virtual_clusters:type_name -> envoy.config.route.v3.VirtualCluster
 	23,  // 4: envoy.config.route.v3.VirtualHost.rate_limits:type_name -> envoy.config.route.v3.RateLimit
-	64,  // 5: envoy.config.route.v3.VirtualHost.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
-	64,  // 6: envoy.config.route.v3.VirtualHost.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	65,  // 5: envoy.config.route.v3.VirtualHost.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	65,  // 6: envoy.config.route.v3.VirtualHost.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
 	13,  // 7: envoy.config.route.v3.VirtualHost.cors:type_name -> envoy.config.route.v3.CorsPolicy
 	28,  // 8: envoy.config.route.v3.VirtualHost.typed_per_filter_config:type_name -> envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry
 	15,  // 9: envoy.config.route.v3.VirtualHost.retry_policy:type_name -> envoy.config.route.v3.RetryPolicy
-	65,  // 10: envoy.config.route.v3.VirtualHost.retry_policy_typed_config:type_name -> google.protobuf.Any
+	66,  // 10: envoy.config.route.v3.VirtualHost.retry_policy_typed_config:type_name -> google.protobuf.Any
 	16,  // 11: envoy.config.route.v3.VirtualHost.hedge_policy:type_name -> envoy.config.route.v3.HedgePolicy
-	66,  // 12: envoy.config.route.v3.VirtualHost.per_request_buffer_limit_bytes:type_name -> google.protobuf.UInt32Value
+	67,  // 12: envoy.config.route.v3.VirtualHost.per_request_buffer_limit_bytes:type_name -> google.protobuf.UInt32Value
 	35,  // 13: envoy.config.route.v3.VirtualHost.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy
-	65,  // 14: envoy.config.route.v3.FilterAction.action:type_name -> google.protobuf.Any
-	9,   // 15: envoy.config.route.v3.RouteList.routes:type_name -> envoy.config.route.v3.Route
-	12,  // 16: envoy.config.route.v3.Route.match:type_name -> envoy.config.route.v3.RouteMatch
-	14,  // 17: envoy.config.route.v3.Route.route:type_name -> envoy.config.route.v3.RouteAction
-	17,  // 18: envoy.config.route.v3.Route.redirect:type_name -> envoy.config.route.v3.RedirectAction
-	18,  // 19: envoy.config.route.v3.Route.direct_response:type_name -> envoy.config.route.v3.DirectResponseAction
-	7,   // 20: envoy.config.route.v3.Route.filter_action:type_name -> envoy.config.route.v3.FilterAction
-	19,  // 21: envoy.config.route.v3.Route.non_forwarding_action:type_name -> envoy.config.route.v3.NonForwardingAction
-	67,  // 22: envoy.config.route.v3.Route.metadata:type_name -> envoy.config.core.v3.Metadata
-	20,  // 23: envoy.config.route.v3.Route.decorator:type_name -> envoy.config.route.v3.Decorator
-	29,  // 24: envoy.config.route.v3.Route.typed_per_filter_config:type_name -> envoy.config.route.v3.Route.TypedPerFilterConfigEntry
-	64,  // 25: envoy.config.route.v3.Route.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
-	64,  // 26: envoy.config.route.v3.Route.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
-	21,  // 27: envoy.config.route.v3.Route.tracing:type_name -> envoy.config.route.v3.Tracing
-	66,  // 28: envoy.config.route.v3.Route.per_request_buffer_limit_bytes:type_name -> google.protobuf.UInt32Value
-	30,  // 29: envoy.config.route.v3.WeightedCluster.clusters:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight
-	66,  // 30: envoy.config.route.v3.WeightedCluster.total_weight:type_name -> google.protobuf.UInt32Value
-	68,  // 31: envoy.config.route.v3.ClusterSpecifierPlugin.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	69,  // 32: envoy.config.route.v3.RouteMatch.safe_regex:type_name -> envoy.type.matcher.v3.RegexMatcher
-	34,  // 33: envoy.config.route.v3.RouteMatch.connect_matcher:type_name -> envoy.config.route.v3.RouteMatch.ConnectMatcher
-	68,  // 34: envoy.config.route.v3.RouteMatch.path_match_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	70,  // 35: envoy.config.route.v3.RouteMatch.case_sensitive:type_name -> google.protobuf.BoolValue
-	71,  // 36: envoy.config.route.v3.RouteMatch.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
-	24,  // 37: envoy.config.route.v3.RouteMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher
-	25,  // 38: envoy.config.route.v3.RouteMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher
-	32,  // 39: envoy.config.route.v3.RouteMatch.grpc:type_name -> envoy.config.route.v3.RouteMatch.GrpcRouteMatchOptions
-	33,  // 40: envoy.config.route.v3.RouteMatch.tls_context:type_name -> envoy.config.route.v3.RouteMatch.TlsContextMatchOptions
-	72,  // 41: envoy.config.route.v3.RouteMatch.dynamic_metadata:type_name -> envoy.type.matcher.v3.MetadataMatcher
-	73,  // 42: envoy.config.route.v3.CorsPolicy.allow_origin_string_match:type_name -> envoy.type.matcher.v3.StringMatcher
-	70,  // 43: envoy.config.route.v3.CorsPolicy.allow_credentials:type_name -> google.protobuf.BoolValue
-	71,  // 44: envoy.config.route.v3.CorsPolicy.filter_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
-	71,  // 45: envoy.config.route.v3.CorsPolicy.shadow_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
-	70,  // 46: envoy.config.route.v3.CorsPolicy.allow_private_network_access:type_name -> google.protobuf.BoolValue
-	10,  // 47: envoy.config.route.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster
-	11,  // 48: envoy.config.route.v3.RouteAction.inline_cluster_specifier_plugin:type_name -> envoy.config.route.v3.ClusterSpecifierPlugin
-	1,   // 49: envoy.config.route.v3.RouteAction.cluster_not_found_response_code:type_name -> envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode
-	67,  // 50: envoy.config.route.v3.RouteAction.metadata_match:type_name -> envoy.config.core.v3.Metadata
-	74,  // 51: envoy.config.route.v3.RouteAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
-	68,  // 52: envoy.config.route.v3.RouteAction.path_rewrite_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	70,  // 53: envoy.config.route.v3.RouteAction.auto_host_rewrite:type_name -> google.protobuf.BoolValue
-	74,  // 54: envoy.config.route.v3.RouteAction.host_rewrite_path_regex:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
-	75,  // 55: envoy.config.route.v3.RouteAction.timeout:type_name -> google.protobuf.Duration
-	75,  // 56: envoy.config.route.v3.RouteAction.idle_timeout:type_name -> google.protobuf.Duration
-	68,  // 57: envoy.config.route.v3.RouteAction.early_data_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	15,  // 58: envoy.config.route.v3.RouteAction.retry_policy:type_name -> envoy.config.route.v3.RetryPolicy
-	65,  // 59: envoy.config.route.v3.RouteAction.retry_policy_typed_config:type_name -> google.protobuf.Any
-	35,  // 60: envoy.config.route.v3.RouteAction.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy
-	76,  // 61: envoy.config.route.v3.RouteAction.priority:type_name -> envoy.config.core.v3.RoutingPriority
-	23,  // 62: envoy.config.route.v3.RouteAction.rate_limits:type_name -> envoy.config.route.v3.RateLimit
-	70,  // 63: envoy.config.route.v3.RouteAction.include_vh_rate_limits:type_name -> google.protobuf.BoolValue
-	36,  // 64: envoy.config.route.v3.RouteAction.hash_policy:type_name -> envoy.config.route.v3.RouteAction.HashPolicy
-	13,  // 65: envoy.config.route.v3.RouteAction.cors:type_name -> envoy.config.route.v3.CorsPolicy
-	75,  // 66: envoy.config.route.v3.RouteAction.max_grpc_timeout:type_name -> google.protobuf.Duration
-	75,  // 67: envoy.config.route.v3.RouteAction.grpc_timeout_offset:type_name -> google.protobuf.Duration
-	37,  // 68: envoy.config.route.v3.RouteAction.upgrade_configs:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig
-	26,  // 69: envoy.config.route.v3.RouteAction.internal_redirect_policy:type_name -> envoy.config.route.v3.InternalRedirectPolicy
-	2,   // 70: envoy.config.route.v3.RouteAction.internal_redirect_action:type_name -> envoy.config.route.v3.RouteAction.InternalRedirectAction
-	66,  // 71: envoy.config.route.v3.RouteAction.max_internal_redirects:type_name -> google.protobuf.UInt32Value
-	16,  // 72: envoy.config.route.v3.RouteAction.hedge_policy:type_name -> envoy.config.route.v3.HedgePolicy
-	38,  // 73: envoy.config.route.v3.RouteAction.max_stream_duration:type_name -> envoy.config.route.v3.RouteAction.MaxStreamDuration
-	66,  // 74: envoy.config.route.v3.RetryPolicy.num_retries:type_name -> google.protobuf.UInt32Value
-	75,  // 75: envoy.config.route.v3.RetryPolicy.per_try_timeout:type_name -> google.protobuf.Duration
-	75,  // 76: envoy.config.route.v3.RetryPolicy.per_try_idle_timeout:type_name -> google.protobuf.Duration
-	45,  // 77: envoy.config.route.v3.RetryPolicy.retry_priority:type_name -> envoy.config.route.v3.RetryPolicy.RetryPriority
-	46,  // 78: envoy.config.route.v3.RetryPolicy.retry_host_predicate:type_name -> envoy.config.route.v3.RetryPolicy.RetryHostPredicate
-	68,  // 79: envoy.config.route.v3.RetryPolicy.retry_options_predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	47,  // 80: envoy.config.route.v3.RetryPolicy.retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RetryBackOff
-	49,  // 81: envoy.config.route.v3.RetryPolicy.rate_limited_retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff
-	24,  // 82: envoy.config.route.v3.RetryPolicy.retriable_headers:type_name -> envoy.config.route.v3.HeaderMatcher
-	24,  // 83: envoy.config.route.v3.RetryPolicy.retriable_request_headers:type_name -> envoy.config.route.v3.HeaderMatcher
-	66,  // 84: envoy.config.route.v3.HedgePolicy.initial_requests:type_name -> google.protobuf.UInt32Value
-	77,  // 85: envoy.config.route.v3.HedgePolicy.additional_request_chance:type_name -> envoy.type.v3.FractionalPercent
-	74,  // 86: envoy.config.route.v3.RedirectAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
-	4,   // 87: envoy.config.route.v3.RedirectAction.response_code:type_name -> envoy.config.route.v3.RedirectAction.RedirectResponseCode
-	78,  // 88: envoy.config.route.v3.DirectResponseAction.body:type_name -> envoy.config.core.v3.DataSource
-	70,  // 89: envoy.config.route.v3.Decorator.propagate:type_name -> google.protobuf.BoolValue
-	77,  // 90: envoy.config.route.v3.Tracing.client_sampling:type_name -> envoy.type.v3.FractionalPercent
-	77,  // 91: envoy.config.route.v3.Tracing.random_sampling:type_name -> envoy.type.v3.FractionalPercent
-	77,  // 92: envoy.config.route.v3.Tracing.overall_sampling:type_name -> envoy.type.v3.FractionalPercent
-	79,  // 93: envoy.config.route.v3.Tracing.custom_tags:type_name -> envoy.type.tracing.v3.CustomTag
-	24,  // 94: envoy.config.route.v3.VirtualCluster.headers:type_name -> envoy.config.route.v3.HeaderMatcher
-	66,  // 95: envoy.config.route.v3.RateLimit.stage:type_name -> google.protobuf.UInt32Value
-	50,  // 96: envoy.config.route.v3.RateLimit.actions:type_name -> envoy.config.route.v3.RateLimit.Action
-	51,  // 97: envoy.config.route.v3.RateLimit.limit:type_name -> envoy.config.route.v3.RateLimit.Override
-	69,  // 98: envoy.config.route.v3.HeaderMatcher.safe_regex_match:type_name -> envoy.type.matcher.v3.RegexMatcher
-	80,  // 99: envoy.config.route.v3.HeaderMatcher.range_match:type_name -> envoy.type.v3.Int64Range
-	73,  // 100: envoy.config.route.v3.HeaderMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
-	73,  // 101: envoy.config.route.v3.QueryParameterMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
-	66,  // 102: envoy.config.route.v3.InternalRedirectPolicy.max_internal_redirects:type_name -> google.protobuf.UInt32Value
-	68,  // 103: envoy.config.route.v3.InternalRedirectPolicy.predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	65,  // 104: envoy.config.route.v3.FilterConfig.config:type_name -> google.protobuf.Any
-	65,  // 105: envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
-	65,  // 106: envoy.config.route.v3.Route.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
-	66,  // 107: envoy.config.route.v3.WeightedCluster.ClusterWeight.weight:type_name -> google.protobuf.UInt32Value
-	67,  // 108: envoy.config.route.v3.WeightedCluster.ClusterWeight.metadata_match:type_name -> envoy.config.core.v3.Metadata
-	64,  // 109: envoy.config.route.v3.WeightedCluster.ClusterWeight.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
-	64,  // 110: envoy.config.route.v3.WeightedCluster.ClusterWeight.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
-	31,  // 111: envoy.config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry
-	65,  // 112: envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
-	70,  // 113: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.presented:type_name -> google.protobuf.BoolValue
-	70,  // 114: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.validated:type_name -> google.protobuf.BoolValue
-	71,  // 115: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
-	70,  // 116: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.trace_sampled:type_name -> google.protobuf.BoolValue
-	39,  // 117: envoy.config.route.v3.RouteAction.HashPolicy.header:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Header
-	40,  // 118: envoy.config.route.v3.RouteAction.HashPolicy.cookie:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Cookie
-	41,  // 119: envoy.config.route.v3.RouteAction.HashPolicy.connection_properties:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties
-	42,  // 120: envoy.config.route.v3.RouteAction.HashPolicy.query_parameter:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter
-	43,  // 121: envoy.config.route.v3.RouteAction.HashPolicy.filter_state:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.FilterState
-	70,  // 122: envoy.config.route.v3.RouteAction.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue
-	44,  // 123: envoy.config.route.v3.RouteAction.UpgradeConfig.connect_config:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig
-	75,  // 124: envoy.config.route.v3.RouteAction.MaxStreamDuration.max_stream_duration:type_name -> google.protobuf.Duration
-	75,  // 125: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max:type_name -> google.protobuf.Duration
-	75,  // 126: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_offset:type_name -> google.protobuf.Duration
-	74,  // 127: envoy.config.route.v3.RouteAction.HashPolicy.Header.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
-	75,  // 128: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.ttl:type_name -> google.protobuf.Duration
-	81,  // 129: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig.proxy_protocol_config:type_name -> envoy.config.core.v3.ProxyProtocolConfig
-	65,  // 130: envoy.config.route.v3.RetryPolicy.RetryPriority.typed_config:type_name -> google.protobuf.Any
-	65,  // 131: envoy.config.route.v3.RetryPolicy.RetryHostPredicate.typed_config:type_name -> google.protobuf.Any
-	75,  // 132: envoy.config.route.v3.RetryPolicy.RetryBackOff.base_interval:type_name -> google.protobuf.Duration
-	75,  // 133: envoy.config.route.v3.RetryPolicy.RetryBackOff.max_interval:type_name -> google.protobuf.Duration
-	3,   // 134: envoy.config.route.v3.RetryPolicy.ResetHeader.format:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeaderFormat
-	48,  // 135: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.reset_headers:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeader
-	75,  // 136: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.max_interval:type_name -> google.protobuf.Duration
-	52,  // 137: envoy.config.route.v3.RateLimit.Action.source_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.SourceCluster
-	53,  // 138: envoy.config.route.v3.RateLimit.Action.destination_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.DestinationCluster
-	54,  // 139: envoy.config.route.v3.RateLimit.Action.request_headers:type_name -> envoy.config.route.v3.RateLimit.Action.RequestHeaders
-	55,  // 140: envoy.config.route.v3.RateLimit.Action.remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.RemoteAddress
-	57,  // 141: envoy.config.route.v3.RateLimit.Action.generic_key:type_name -> envoy.config.route.v3.RateLimit.Action.GenericKey
-	58,  // 142: envoy.config.route.v3.RateLimit.Action.header_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.HeaderValueMatch
-	59,  // 143: envoy.config.route.v3.RateLimit.Action.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Action.DynamicMetaData
-	60,  // 144: envoy.config.route.v3.RateLimit.Action.metadata:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData
-	68,  // 145: envoy.config.route.v3.RateLimit.Action.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	56,  // 146: envoy.config.route.v3.RateLimit.Action.masked_remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress
-	61,  // 147: envoy.config.route.v3.RateLimit.Action.query_parameter_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch
-	62,  // 148: envoy.config.route.v3.RateLimit.Override.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Override.DynamicMetadata
-	66,  // 149: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v4_prefix_mask_len:type_name -> google.protobuf.UInt32Value
-	66,  // 150: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v6_prefix_mask_len:type_name -> google.protobuf.UInt32Value
-	70,  // 151: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.expect_match:type_name -> google.protobuf.BoolValue
-	24,  // 152: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher
-	82,  // 153: envoy.config.route.v3.RateLimit.Action.DynamicMetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
-	82,  // 154: envoy.config.route.v3.RateLimit.Action.MetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
-	5,   // 155: envoy.config.route.v3.RateLimit.Action.MetaData.source:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData.Source
-	70,  // 156: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.expect_match:type_name -> google.protobuf.BoolValue
-	25,  // 157: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher
-	82,  // 158: envoy.config.route.v3.RateLimit.Override.DynamicMetadata.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
-	159, // [159:159] is the sub-list for method output_type
-	159, // [159:159] is the sub-list for method input_type
-	159, // [159:159] is the sub-list for extension type_name
-	159, // [159:159] is the sub-list for extension extendee
-	0,   // [0:159] is the sub-list for field type_name
+	68,  // 14: envoy.config.route.v3.VirtualHost.metadata:type_name -> envoy.config.core.v3.Metadata
+	66,  // 15: envoy.config.route.v3.FilterAction.action:type_name -> google.protobuf.Any
+	9,   // 16: envoy.config.route.v3.RouteList.routes:type_name -> envoy.config.route.v3.Route
+	12,  // 17: envoy.config.route.v3.Route.match:type_name -> envoy.config.route.v3.RouteMatch
+	14,  // 18: envoy.config.route.v3.Route.route:type_name -> envoy.config.route.v3.RouteAction
+	17,  // 19: envoy.config.route.v3.Route.redirect:type_name -> envoy.config.route.v3.RedirectAction
+	18,  // 20: envoy.config.route.v3.Route.direct_response:type_name -> envoy.config.route.v3.DirectResponseAction
+	7,   // 21: envoy.config.route.v3.Route.filter_action:type_name -> envoy.config.route.v3.FilterAction
+	19,  // 22: envoy.config.route.v3.Route.non_forwarding_action:type_name -> envoy.config.route.v3.NonForwardingAction
+	68,  // 23: envoy.config.route.v3.Route.metadata:type_name -> envoy.config.core.v3.Metadata
+	20,  // 24: envoy.config.route.v3.Route.decorator:type_name -> envoy.config.route.v3.Decorator
+	29,  // 25: envoy.config.route.v3.Route.typed_per_filter_config:type_name -> envoy.config.route.v3.Route.TypedPerFilterConfigEntry
+	65,  // 26: envoy.config.route.v3.Route.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	65,  // 27: envoy.config.route.v3.Route.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	21,  // 28: envoy.config.route.v3.Route.tracing:type_name -> envoy.config.route.v3.Tracing
+	67,  // 29: envoy.config.route.v3.Route.per_request_buffer_limit_bytes:type_name -> google.protobuf.UInt32Value
+	30,  // 30: envoy.config.route.v3.WeightedCluster.clusters:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight
+	67,  // 31: envoy.config.route.v3.WeightedCluster.total_weight:type_name -> google.protobuf.UInt32Value
+	69,  // 32: envoy.config.route.v3.ClusterSpecifierPlugin.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	70,  // 33: envoy.config.route.v3.RouteMatch.safe_regex:type_name -> envoy.type.matcher.v3.RegexMatcher
+	34,  // 34: envoy.config.route.v3.RouteMatch.connect_matcher:type_name -> envoy.config.route.v3.RouteMatch.ConnectMatcher
+	69,  // 35: envoy.config.route.v3.RouteMatch.path_match_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	71,  // 36: envoy.config.route.v3.RouteMatch.case_sensitive:type_name -> google.protobuf.BoolValue
+	72,  // 37: envoy.config.route.v3.RouteMatch.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
+	24,  // 38: envoy.config.route.v3.RouteMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher
+	25,  // 39: envoy.config.route.v3.RouteMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher
+	32,  // 40: envoy.config.route.v3.RouteMatch.grpc:type_name -> envoy.config.route.v3.RouteMatch.GrpcRouteMatchOptions
+	33,  // 41: envoy.config.route.v3.RouteMatch.tls_context:type_name -> envoy.config.route.v3.RouteMatch.TlsContextMatchOptions
+	73,  // 42: envoy.config.route.v3.RouteMatch.dynamic_metadata:type_name -> envoy.type.matcher.v3.MetadataMatcher
+	74,  // 43: envoy.config.route.v3.CorsPolicy.allow_origin_string_match:type_name -> envoy.type.matcher.v3.StringMatcher
+	71,  // 44: envoy.config.route.v3.CorsPolicy.allow_credentials:type_name -> google.protobuf.BoolValue
+	72,  // 45: envoy.config.route.v3.CorsPolicy.filter_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
+	72,  // 46: envoy.config.route.v3.CorsPolicy.shadow_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
+	71,  // 47: envoy.config.route.v3.CorsPolicy.allow_private_network_access:type_name -> google.protobuf.BoolValue
+	10,  // 48: envoy.config.route.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster
+	11,  // 49: envoy.config.route.v3.RouteAction.inline_cluster_specifier_plugin:type_name -> envoy.config.route.v3.ClusterSpecifierPlugin
+	1,   // 50: envoy.config.route.v3.RouteAction.cluster_not_found_response_code:type_name -> envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode
+	68,  // 51: envoy.config.route.v3.RouteAction.metadata_match:type_name -> envoy.config.core.v3.Metadata
+	75,  // 52: envoy.config.route.v3.RouteAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
+	69,  // 53: envoy.config.route.v3.RouteAction.path_rewrite_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	71,  // 54: envoy.config.route.v3.RouteAction.auto_host_rewrite:type_name -> google.protobuf.BoolValue
+	75,  // 55: envoy.config.route.v3.RouteAction.host_rewrite_path_regex:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
+	76,  // 56: envoy.config.route.v3.RouteAction.timeout:type_name -> google.protobuf.Duration
+	76,  // 57: envoy.config.route.v3.RouteAction.idle_timeout:type_name -> google.protobuf.Duration
+	69,  // 58: envoy.config.route.v3.RouteAction.early_data_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	15,  // 59: envoy.config.route.v3.RouteAction.retry_policy:type_name -> envoy.config.route.v3.RetryPolicy
+	66,  // 60: envoy.config.route.v3.RouteAction.retry_policy_typed_config:type_name -> google.protobuf.Any
+	35,  // 61: envoy.config.route.v3.RouteAction.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy
+	77,  // 62: envoy.config.route.v3.RouteAction.priority:type_name -> envoy.config.core.v3.RoutingPriority
+	23,  // 63: envoy.config.route.v3.RouteAction.rate_limits:type_name -> envoy.config.route.v3.RateLimit
+	71,  // 64: envoy.config.route.v3.RouteAction.include_vh_rate_limits:type_name -> google.protobuf.BoolValue
+	36,  // 65: envoy.config.route.v3.RouteAction.hash_policy:type_name -> envoy.config.route.v3.RouteAction.HashPolicy
+	13,  // 66: envoy.config.route.v3.RouteAction.cors:type_name -> envoy.config.route.v3.CorsPolicy
+	76,  // 67: envoy.config.route.v3.RouteAction.max_grpc_timeout:type_name -> google.protobuf.Duration
+	76,  // 68: envoy.config.route.v3.RouteAction.grpc_timeout_offset:type_name -> google.protobuf.Duration
+	37,  // 69: envoy.config.route.v3.RouteAction.upgrade_configs:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig
+	26,  // 70: envoy.config.route.v3.RouteAction.internal_redirect_policy:type_name -> envoy.config.route.v3.InternalRedirectPolicy
+	2,   // 71: envoy.config.route.v3.RouteAction.internal_redirect_action:type_name -> envoy.config.route.v3.RouteAction.InternalRedirectAction
+	67,  // 72: envoy.config.route.v3.RouteAction.max_internal_redirects:type_name -> google.protobuf.UInt32Value
+	16,  // 73: envoy.config.route.v3.RouteAction.hedge_policy:type_name -> envoy.config.route.v3.HedgePolicy
+	38,  // 74: envoy.config.route.v3.RouteAction.max_stream_duration:type_name -> envoy.config.route.v3.RouteAction.MaxStreamDuration
+	67,  // 75: envoy.config.route.v3.RetryPolicy.num_retries:type_name -> google.protobuf.UInt32Value
+	76,  // 76: envoy.config.route.v3.RetryPolicy.per_try_timeout:type_name -> google.protobuf.Duration
+	76,  // 77: envoy.config.route.v3.RetryPolicy.per_try_idle_timeout:type_name -> google.protobuf.Duration
+	46,  // 78: envoy.config.route.v3.RetryPolicy.retry_priority:type_name -> envoy.config.route.v3.RetryPolicy.RetryPriority
+	47,  // 79: envoy.config.route.v3.RetryPolicy.retry_host_predicate:type_name -> envoy.config.route.v3.RetryPolicy.RetryHostPredicate
+	69,  // 80: envoy.config.route.v3.RetryPolicy.retry_options_predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	48,  // 81: envoy.config.route.v3.RetryPolicy.retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RetryBackOff
+	50,  // 82: envoy.config.route.v3.RetryPolicy.rate_limited_retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff
+	24,  // 83: envoy.config.route.v3.RetryPolicy.retriable_headers:type_name -> envoy.config.route.v3.HeaderMatcher
+	24,  // 84: envoy.config.route.v3.RetryPolicy.retriable_request_headers:type_name -> envoy.config.route.v3.HeaderMatcher
+	67,  // 85: envoy.config.route.v3.HedgePolicy.initial_requests:type_name -> google.protobuf.UInt32Value
+	78,  // 86: envoy.config.route.v3.HedgePolicy.additional_request_chance:type_name -> envoy.type.v3.FractionalPercent
+	75,  // 87: envoy.config.route.v3.RedirectAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
+	4,   // 88: envoy.config.route.v3.RedirectAction.response_code:type_name -> envoy.config.route.v3.RedirectAction.RedirectResponseCode
+	79,  // 89: envoy.config.route.v3.DirectResponseAction.body:type_name -> envoy.config.core.v3.DataSource
+	71,  // 90: envoy.config.route.v3.Decorator.propagate:type_name -> google.protobuf.BoolValue
+	78,  // 91: envoy.config.route.v3.Tracing.client_sampling:type_name -> envoy.type.v3.FractionalPercent
+	78,  // 92: envoy.config.route.v3.Tracing.random_sampling:type_name -> envoy.type.v3.FractionalPercent
+	78,  // 93: envoy.config.route.v3.Tracing.overall_sampling:type_name -> envoy.type.v3.FractionalPercent
+	80,  // 94: envoy.config.route.v3.Tracing.custom_tags:type_name -> envoy.type.tracing.v3.CustomTag
+	24,  // 95: envoy.config.route.v3.VirtualCluster.headers:type_name -> envoy.config.route.v3.HeaderMatcher
+	67,  // 96: envoy.config.route.v3.RateLimit.stage:type_name -> google.protobuf.UInt32Value
+	51,  // 97: envoy.config.route.v3.RateLimit.actions:type_name -> envoy.config.route.v3.RateLimit.Action
+	52,  // 98: envoy.config.route.v3.RateLimit.limit:type_name -> envoy.config.route.v3.RateLimit.Override
+	70,  // 99: envoy.config.route.v3.HeaderMatcher.safe_regex_match:type_name -> envoy.type.matcher.v3.RegexMatcher
+	81,  // 100: envoy.config.route.v3.HeaderMatcher.range_match:type_name -> envoy.type.v3.Int64Range
+	74,  // 101: envoy.config.route.v3.HeaderMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
+	74,  // 102: envoy.config.route.v3.QueryParameterMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
+	67,  // 103: envoy.config.route.v3.InternalRedirectPolicy.max_internal_redirects:type_name -> google.protobuf.UInt32Value
+	69,  // 104: envoy.config.route.v3.InternalRedirectPolicy.predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	66,  // 105: envoy.config.route.v3.FilterConfig.config:type_name -> google.protobuf.Any
+	66,  // 106: envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
+	66,  // 107: envoy.config.route.v3.Route.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
+	67,  // 108: envoy.config.route.v3.WeightedCluster.ClusterWeight.weight:type_name -> google.protobuf.UInt32Value
+	68,  // 109: envoy.config.route.v3.WeightedCluster.ClusterWeight.metadata_match:type_name -> envoy.config.core.v3.Metadata
+	65,  // 110: envoy.config.route.v3.WeightedCluster.ClusterWeight.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	65,  // 111: envoy.config.route.v3.WeightedCluster.ClusterWeight.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption
+	31,  // 112: envoy.config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry
+	66,  // 113: envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any
+	71,  // 114: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.presented:type_name -> google.protobuf.BoolValue
+	71,  // 115: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.validated:type_name -> google.protobuf.BoolValue
+	72,  // 116: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent
+	71,  // 117: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.trace_sampled:type_name -> google.protobuf.BoolValue
+	39,  // 118: envoy.config.route.v3.RouteAction.HashPolicy.header:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Header
+	41,  // 119: envoy.config.route.v3.RouteAction.HashPolicy.cookie:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Cookie
+	42,  // 120: envoy.config.route.v3.RouteAction.HashPolicy.connection_properties:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties
+	43,  // 121: envoy.config.route.v3.RouteAction.HashPolicy.query_parameter:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter
+	44,  // 122: envoy.config.route.v3.RouteAction.HashPolicy.filter_state:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.FilterState
+	71,  // 123: envoy.config.route.v3.RouteAction.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue
+	45,  // 124: envoy.config.route.v3.RouteAction.UpgradeConfig.connect_config:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig
+	76,  // 125: envoy.config.route.v3.RouteAction.MaxStreamDuration.max_stream_duration:type_name -> google.protobuf.Duration
+	76,  // 126: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max:type_name -> google.protobuf.Duration
+	76,  // 127: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_offset:type_name -> google.protobuf.Duration
+	75,  // 128: envoy.config.route.v3.RouteAction.HashPolicy.Header.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute
+	76,  // 129: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.ttl:type_name -> google.protobuf.Duration
+	40,  // 130: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.attributes:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute
+	82,  // 131: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig.proxy_protocol_config:type_name -> envoy.config.core.v3.ProxyProtocolConfig
+	66,  // 132: envoy.config.route.v3.RetryPolicy.RetryPriority.typed_config:type_name -> google.protobuf.Any
+	66,  // 133: envoy.config.route.v3.RetryPolicy.RetryHostPredicate.typed_config:type_name -> google.protobuf.Any
+	76,  // 134: envoy.config.route.v3.RetryPolicy.RetryBackOff.base_interval:type_name -> google.protobuf.Duration
+	76,  // 135: envoy.config.route.v3.RetryPolicy.RetryBackOff.max_interval:type_name -> google.protobuf.Duration
+	3,   // 136: envoy.config.route.v3.RetryPolicy.ResetHeader.format:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeaderFormat
+	49,  // 137: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.reset_headers:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeader
+	76,  // 138: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.max_interval:type_name -> google.protobuf.Duration
+	53,  // 139: envoy.config.route.v3.RateLimit.Action.source_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.SourceCluster
+	54,  // 140: envoy.config.route.v3.RateLimit.Action.destination_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.DestinationCluster
+	55,  // 141: envoy.config.route.v3.RateLimit.Action.request_headers:type_name -> envoy.config.route.v3.RateLimit.Action.RequestHeaders
+	56,  // 142: envoy.config.route.v3.RateLimit.Action.remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.RemoteAddress
+	58,  // 143: envoy.config.route.v3.RateLimit.Action.generic_key:type_name -> envoy.config.route.v3.RateLimit.Action.GenericKey
+	59,  // 144: envoy.config.route.v3.RateLimit.Action.header_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.HeaderValueMatch
+	60,  // 145: envoy.config.route.v3.RateLimit.Action.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Action.DynamicMetaData
+	61,  // 146: envoy.config.route.v3.RateLimit.Action.metadata:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData
+	69,  // 147: envoy.config.route.v3.RateLimit.Action.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	57,  // 148: envoy.config.route.v3.RateLimit.Action.masked_remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress
+	62,  // 149: envoy.config.route.v3.RateLimit.Action.query_parameter_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch
+	63,  // 150: envoy.config.route.v3.RateLimit.Override.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Override.DynamicMetadata
+	67,  // 151: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v4_prefix_mask_len:type_name -> google.protobuf.UInt32Value
+	67,  // 152: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v6_prefix_mask_len:type_name -> google.protobuf.UInt32Value
+	71,  // 153: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.expect_match:type_name -> google.protobuf.BoolValue
+	24,  // 154: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher
+	83,  // 155: envoy.config.route.v3.RateLimit.Action.DynamicMetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
+	83,  // 156: envoy.config.route.v3.RateLimit.Action.MetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
+	5,   // 157: envoy.config.route.v3.RateLimit.Action.MetaData.source:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData.Source
+	71,  // 158: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.expect_match:type_name -> google.protobuf.BoolValue
+	25,  // 159: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher
+	83,  // 160: envoy.config.route.v3.RateLimit.Override.DynamicMetadata.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey
+	161, // [161:161] is the sub-list for method output_type
+	161, // [161:161] is the sub-list for method input_type
+	161, // [161:161] is the sub-list for extension type_name
+	161, // [161:161] is the sub-list for extension extendee
+	0,   // [0:161] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_route_v3_route_components_proto_init() }
@@ -8512,7 +8652,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteAction_HashPolicy_Cookie); i {
+			switch v := v.(*RouteAction_HashPolicy_CookieAttribute); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8524,7 +8664,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteAction_HashPolicy_ConnectionProperties); i {
+			switch v := v.(*RouteAction_HashPolicy_Cookie); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8536,7 +8676,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteAction_HashPolicy_QueryParameter); i {
+			switch v := v.(*RouteAction_HashPolicy_ConnectionProperties); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8548,7 +8688,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteAction_HashPolicy_FilterState); i {
+			switch v := v.(*RouteAction_HashPolicy_QueryParameter); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8560,7 +8700,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteAction_UpgradeConfig_ConnectConfig); i {
+			switch v := v.(*RouteAction_HashPolicy_FilterState); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8572,7 +8712,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy_RetryPriority); i {
+			switch v := v.(*RouteAction_UpgradeConfig_ConnectConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8584,7 +8724,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy_RetryHostPredicate); i {
+			switch v := v.(*RetryPolicy_RetryPriority); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8596,7 +8736,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy_RetryBackOff); i {
+			switch v := v.(*RetryPolicy_RetryHostPredicate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8608,7 +8748,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy_ResetHeader); i {
+			switch v := v.(*RetryPolicy_RetryBackOff); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8620,7 +8760,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy_RateLimitedRetryBackOff); i {
+			switch v := v.(*RetryPolicy_ResetHeader); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8632,7 +8772,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action); i {
+			switch v := v.(*RetryPolicy_RateLimitedRetryBackOff); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8644,7 +8784,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Override); i {
+			switch v := v.(*RateLimit_Action); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8656,7 +8796,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_SourceCluster); i {
+			switch v := v.(*RateLimit_Override); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8668,7 +8808,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_DestinationCluster); i {
+			switch v := v.(*RateLimit_Action_SourceCluster); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8680,7 +8820,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_RequestHeaders); i {
+			switch v := v.(*RateLimit_Action_DestinationCluster); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8692,7 +8832,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_RemoteAddress); i {
+			switch v := v.(*RateLimit_Action_RequestHeaders); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8704,7 +8844,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_MaskedRemoteAddress); i {
+			switch v := v.(*RateLimit_Action_RemoteAddress); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8716,7 +8856,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_GenericKey); i {
+			switch v := v.(*RateLimit_Action_MaskedRemoteAddress); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8728,7 +8868,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_HeaderValueMatch); i {
+			switch v := v.(*RateLimit_Action_GenericKey); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8740,7 +8880,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_DynamicMetaData); i {
+			switch v := v.(*RateLimit_Action_HeaderValueMatch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8752,7 +8892,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_MetaData); i {
+			switch v := v.(*RateLimit_Action_DynamicMetaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8764,7 +8904,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimit_Action_QueryParameterValueMatch); i {
+			switch v := v.(*RateLimit_Action_MetaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -8776,6 +8916,18 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			}
 		}
 		file_envoy_config_route_v3_route_components_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RateLimit_Action_QueryParameterValueMatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_config_route_v3_route_components_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RateLimit_Override_DynamicMetadata); i {
 			case 0:
 				return &v.state
@@ -8851,13 +9003,13 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 		(*RouteAction_HashPolicy_QueryParameter_)(nil),
 		(*RouteAction_HashPolicy_FilterState_)(nil),
 	}
-	file_envoy_config_route_v3_route_components_proto_msgTypes[39].OneofWrappers = []interface{}{
+	file_envoy_config_route_v3_route_components_proto_msgTypes[40].OneofWrappers = []interface{}{
 		(*RetryPolicy_RetryPriority_TypedConfig)(nil),
 	}
-	file_envoy_config_route_v3_route_components_proto_msgTypes[40].OneofWrappers = []interface{}{
+	file_envoy_config_route_v3_route_components_proto_msgTypes[41].OneofWrappers = []interface{}{
 		(*RetryPolicy_RetryHostPredicate_TypedConfig)(nil),
 	}
-	file_envoy_config_route_v3_route_components_proto_msgTypes[44].OneofWrappers = []interface{}{
+	file_envoy_config_route_v3_route_components_proto_msgTypes[45].OneofWrappers = []interface{}{
 		(*RateLimit_Action_SourceCluster_)(nil),
 		(*RateLimit_Action_DestinationCluster_)(nil),
 		(*RateLimit_Action_RequestHeaders_)(nil),
@@ -8870,7 +9022,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 		(*RateLimit_Action_MaskedRemoteAddress_)(nil),
 		(*RateLimit_Action_QueryParameterValueMatch_)(nil),
 	}
-	file_envoy_config_route_v3_route_components_proto_msgTypes[45].OneofWrappers = []interface{}{
+	file_envoy_config_route_v3_route_components_proto_msgTypes[46].OneofWrappers = []interface{}{
 		(*RateLimit_Override_DynamicMetadata_)(nil),
 	}
 	type x struct{}
@@ -8879,7 +9031,7 @@ func file_envoy_config_route_v3_route_components_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_config_route_v3_route_components_proto_rawDesc,
 			NumEnums:      6,
-			NumMessages:   57,
+			NumMessages:   58,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.validate.go
index 74d5e793a54..8e17d094d01 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/route_components.pb.validate.go
@@ -616,6 +616,35 @@ func (m *VirtualHost) validate(all bool) error {
 
 	}
 
+	if all {
+		switch v := interface{}(m.GetMetadata()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, VirtualHostValidationError{
+					field:  "Metadata",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, VirtualHostValidationError{
+					field:  "Metadata",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return VirtualHostValidationError{
+				field:  "Metadata",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return VirtualHostMultiError(errors)
 	}
@@ -6219,6 +6248,37 @@ func (m *InternalRedirectPolicy) validate(all bool) error {
 
 	// no validation rules for AllowCrossSchemeRedirect
 
+	_InternalRedirectPolicy_ResponseHeadersToCopy_Unique := make(map[string]struct{}, len(m.GetResponseHeadersToCopy()))
+
+	for idx, item := range m.GetResponseHeadersToCopy() {
+		_, _ = idx, item
+
+		if _, exists := _InternalRedirectPolicy_ResponseHeadersToCopy_Unique[item]; exists {
+			err := InternalRedirectPolicyValidationError{
+				field:  fmt.Sprintf("ResponseHeadersToCopy[%v]", idx),
+				reason: "repeated value must contain unique items",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		} else {
+			_InternalRedirectPolicy_ResponseHeadersToCopy_Unique[item] = struct{}{}
+		}
+
+		if !_InternalRedirectPolicy_ResponseHeadersToCopy_Pattern.MatchString(item) {
+			err := InternalRedirectPolicyValidationError{
+				field:  fmt.Sprintf("ResponseHeadersToCopy[%v]", idx),
+				reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+
+	}
+
 	if len(errors) > 0 {
 		return InternalRedirectPolicyMultiError(errors)
 	}
@@ -6299,6 +6359,8 @@ var _ interface {
 	ErrorName() string
 } = InternalRedirectPolicyValidationError{}
 
+var _InternalRedirectPolicy_ResponseHeadersToCopy_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
+
 // Validate checks the field values on FilterConfig with the rules defined in
 // the proto definition for this message. If any rules are violated, the first
 // error encountered is returned, or nil if there are no violations.
@@ -8215,6 +8277,171 @@ var _ interface {
 
 var _RouteAction_HashPolicy_Header_HeaderName_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
 
+// Validate checks the field values on RouteAction_HashPolicy_CookieAttribute
+// with the rules defined in the proto definition for this message. If any
+// rules are violated, the first error encountered is returned, or nil if
+// there are no violations.
+func (m *RouteAction_HashPolicy_CookieAttribute) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on
+// RouteAction_HashPolicy_CookieAttribute with the rules defined in the proto
+// definition for this message. If any rules are violated, the result is a
+// list of violation errors wrapped in
+// RouteAction_HashPolicy_CookieAttributeMultiError, or nil if none found.
+func (m *RouteAction_HashPolicy_CookieAttribute) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *RouteAction_HashPolicy_CookieAttribute) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if utf8.RuneCountInString(m.GetName()) < 1 {
+		err := RouteAction_HashPolicy_CookieAttributeValidationError{
+			field:  "Name",
+			reason: "value length must be at least 1 runes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if len(m.GetName()) > 16384 {
+		err := RouteAction_HashPolicy_CookieAttributeValidationError{
+			field:  "Name",
+			reason: "value length must be at most 16384 bytes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if !_RouteAction_HashPolicy_CookieAttribute_Name_Pattern.MatchString(m.GetName()) {
+		err := RouteAction_HashPolicy_CookieAttributeValidationError{
+			field:  "Name",
+			reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if len(m.GetValue()) > 16384 {
+		err := RouteAction_HashPolicy_CookieAttributeValidationError{
+			field:  "Value",
+			reason: "value length must be at most 16384 bytes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if !_RouteAction_HashPolicy_CookieAttribute_Value_Pattern.MatchString(m.GetValue()) {
+		err := RouteAction_HashPolicy_CookieAttributeValidationError{
+			field:  "Value",
+			reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	if len(errors) > 0 {
+		return RouteAction_HashPolicy_CookieAttributeMultiError(errors)
+	}
+
+	return nil
+}
+
+// RouteAction_HashPolicy_CookieAttributeMultiError is an error wrapping
+// multiple validation errors returned by
+// RouteAction_HashPolicy_CookieAttribute.ValidateAll() if the designated
+// constraints aren't met.
+type RouteAction_HashPolicy_CookieAttributeMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m RouteAction_HashPolicy_CookieAttributeMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m RouteAction_HashPolicy_CookieAttributeMultiError) AllErrors() []error { return m }
+
+// RouteAction_HashPolicy_CookieAttributeValidationError is the validation
+// error returned by RouteAction_HashPolicy_CookieAttribute.Validate if the
+// designated constraints aren't met.
+type RouteAction_HashPolicy_CookieAttributeValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) ErrorName() string {
+	return "RouteAction_HashPolicy_CookieAttributeValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e RouteAction_HashPolicy_CookieAttributeValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sRouteAction_HashPolicy_CookieAttribute.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = RouteAction_HashPolicy_CookieAttributeValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = RouteAction_HashPolicy_CookieAttributeValidationError{}
+
+var _RouteAction_HashPolicy_CookieAttribute_Name_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
+
+var _RouteAction_HashPolicy_CookieAttribute_Value_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
+
 // Validate checks the field values on RouteAction_HashPolicy_Cookie with the
 // rules defined in the proto definition for this message. If any rules are
 // violated, the first error encountered is returned, or nil if there are no violations.
@@ -8279,6 +8506,40 @@ func (m *RouteAction_HashPolicy_Cookie) validate(all bool) error {
 
 	// no validation rules for Path
 
+	for idx, item := range m.GetAttributes() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, RouteAction_HashPolicy_CookieValidationError{
+						field:  fmt.Sprintf("Attributes[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, RouteAction_HashPolicy_CookieValidationError{
+						field:  fmt.Sprintf("Attributes[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return RouteAction_HashPolicy_CookieValidationError{
+					field:  fmt.Sprintf("Attributes[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
 	if len(errors) > 0 {
 		return RouteAction_HashPolicy_CookieMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/scoped_route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/scoped_route.pb.go
index 829d7f162a6..bf823b0422e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/scoped_route.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/route/v3/scoped_route.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/route/v3/scoped_route.proto
 
 package routev3
@@ -41,17 +41,17 @@ const (
 //
 // .. code::
 //
-//   ...
-//   scoped_routes:
-//     name: foo-scoped-routes
-//     scope_key_builder:
-//       fragments:
-//         - header_value_extractor:
-//             name: X-Route-Selector
-//             element_separator: ,
-//             element:
-//               separator: =
-//               key: vip
+//	...
+//	scoped_routes:
+//	  name: foo-scoped-routes
+//	  scope_key_builder:
+//	    fragments:
+//	      - header_value_extractor:
+//	          name: X-Route-Selector
+//	          element_separator: ","
+//	          element:
+//	            separator: =
+//	            key: vip
 //
 // ScopedRouteConfiguration resources (specified statically via
 // :ref:`scoped_route_configurations_list<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.ScopedRoutes.scoped_route_configurations_list>`
@@ -59,29 +59,29 @@ const (
 //
 // .. code::
 //
-//  (1)
-//   name: route-scope1
-//   route_configuration_name: route-config1
-//   key:
-//      fragments:
-//        - string_key: 172.10.10.20
+//	(1)
+//	 name: route-scope1
+//	 route_configuration_name: route-config1
+//	 key:
+//	    fragments:
+//	      - string_key: 172.10.10.20
 //
-//  (2)
-//   name: route-scope2
-//   route_configuration_name: route-config2
-//   key:
-//     fragments:
-//       - string_key: 172.20.20.30
+//	(2)
+//	 name: route-scope2
+//	 route_configuration_name: route-config2
+//	 key:
+//	   fragments:
+//	     - string_key: 172.20.20.30
 //
 // A request from a client such as:
 //
 // .. code::
 //
-//     GET / HTTP/1.1
-//     Host: foo.com
-//     X-Route-Selector: vip=172.10.10.20
+//	GET / HTTP/1.1
+//	Host: foo.com
+//	X-Route-Selector: vip=172.10.10.20
 //
-// would result in the routing table defined by the ``route-config1``
+// would result in the routing table defined by the “route-config1“
 // RouteConfiguration being assigned to the HTTP request/stream.
 //
 // [#next-free-field: 6]
@@ -232,6 +232,7 @@ type ScopedRouteConfiguration_Key_Fragment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Type:
+	//
 	//	*ScopedRouteConfiguration_Key_Fragment_StringKey
 	Type isScopedRouteConfiguration_Key_Fragment_Type `protobuf_oneof:"type"`
 }
@@ -353,16 +354,16 @@ var file_envoy_config_route_v3_scoped_route_proto_rawDesc = []byte{
 	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4b, 0x65, 0x79, 0x3a, 0x2c,
 	0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
 	0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x87, 0x01, 0x0a,
-	0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x87, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x53, 0x63,
+	0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.go
index d65d0999ccc..8a8e6d13bc1 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/tap/v3/common.proto
 
 package tapv3
@@ -121,7 +121,7 @@ type TapConfig struct {
 	// :ref:`match_config <envoy_v3_api_field_config.tap.v3.TapConfig.match_config>` must be set. If both
 	// are set, the :ref:`match <envoy_v3_api_field_config.tap.v3.TapConfig.match>` will be used.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/tap/v3/common.proto.
 	MatchConfig *MatchPredicate `protobuf:"bytes,1,opt,name=match_config,json=matchConfig,proto3" json:"match_config,omitempty"`
 	// The match configuration. If the configuration matches the data source being tapped, a tap will
 	// occur, with the result written to the configured output.
@@ -138,8 +138,8 @@ type TapConfig struct {
 	//
 	// .. note::
 	//
-	//   This field defaults to 100/:ref:`HUNDRED
-	//   <envoy_v3_api_enum_type.v3.FractionalPercent.DenominatorType>`.
+	//	This field defaults to 100/:ref:`HUNDRED
+	//	<envoy_v3_api_enum_type.v3.FractionalPercent.DenominatorType>`.
 	TapEnabled *v31.RuntimeFractionalPercent `protobuf:"bytes,3,opt,name=tap_enabled,json=tapEnabled,proto3" json:"tap_enabled,omitempty"`
 }
 
@@ -175,7 +175,7 @@ func (*TapConfig) Descriptor() ([]byte, []int) {
 	return file_envoy_config_tap_v3_common_proto_rawDescGZIP(), []int{0}
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/tap/v3/common.proto.
 func (x *TapConfig) GetMatchConfig() *MatchPredicate {
 	if x != nil {
 		return x.MatchConfig
@@ -213,6 +213,7 @@ type MatchPredicate struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*MatchPredicate_OrMatch
 	//	*MatchPredicate_AndMatch
 	//	*MatchPredicate_NotMatch
@@ -467,9 +468,9 @@ func (x *HttpHeadersMatch) GetHeaders() []*v32.HeaderMatcher {
 //
 // .. attention::
 //
-//   Searching for patterns in HTTP body is potentially cpu intensive. For each specified pattern, http body is scanned byte by byte to find a match.
-//   If multiple patterns are specified, the process is repeated for each pattern. If location of a pattern is known, ``bytes_limit`` should be specified
-//   to scan only part of the http body.
+//	Searching for patterns in HTTP body is potentially cpu intensive. For each specified pattern, http body is scanned byte by byte to find a match.
+//	If multiple patterns are specified, the process is repeated for each pattern. If location of a pattern is known, ``bytes_limit`` should be specified
+//	to scan only part of the http body.
 type HttpGenericBodyMatch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -616,7 +617,7 @@ func (x *OutputConfig) GetStreaming() bool {
 }
 
 // Tap output sink configuration.
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 type OutputSink struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -625,10 +626,12 @@ type OutputSink struct {
 	// Sink output format.
 	Format OutputSink_Format `protobuf:"varint,1,opt,name=format,proto3,enum=envoy.config.tap.v3.OutputSink_Format" json:"format,omitempty"`
 	// Types that are assignable to OutputSinkType:
+	//
 	//	*OutputSink_StreamingAdmin
 	//	*OutputSink_FilePerTap
 	//	*OutputSink_StreamingGrpc
 	//	*OutputSink_BufferedAdmin
+	//	*OutputSink_CustomSink
 	OutputSinkType isOutputSink_OutputSinkType `protobuf_oneof:"output_sink_type"`
 }
 
@@ -706,6 +709,13 @@ func (x *OutputSink) GetBufferedAdmin() *BufferedAdminSink {
 	return nil
 }
 
+func (x *OutputSink) GetCustomSink() *v31.TypedExtensionConfig {
+	if x, ok := x.GetOutputSinkType().(*OutputSink_CustomSink); ok {
+		return x.CustomSink
+	}
+	return nil
+}
+
 type isOutputSink_OutputSinkType interface {
 	isOutputSink_OutputSinkType()
 }
@@ -715,10 +725,10 @@ type OutputSink_StreamingAdmin struct {
 	//
 	// .. attention::
 	//
-	//   It is only allowed to specify the streaming admin output sink if the tap is being
-	//   configured from the :http:post:`/tap` admin endpoint. Thus, if an extension has
-	//   been configured to receive tap configuration from some other source (e.g., static
-	//   file, XDS, etc.) configuring the streaming admin output type will fail.
+	//	It is only allowed to specify the streaming admin output sink if the tap is being
+	//	configured from the :http:post:`/tap` admin endpoint. Thus, if an extension has
+	//	been configured to receive tap configuration from some other source (e.g., static
+	//	file, XDS, etc.) configuring the streaming admin output type will fail.
 	StreamingAdmin *StreamingAdminSink `protobuf:"bytes,2,opt,name=streaming_admin,json=streamingAdmin,proto3,oneof"`
 }
 
@@ -739,13 +749,18 @@ type OutputSink_BufferedAdmin struct {
 	//
 	// .. attention::
 	//
-	//   It is only allowed to specify the buffered admin output sink if the tap is being
-	//   configured from the :http:post:`/tap` admin endpoint. Thus, if an extension has
-	//   been configured to receive tap configuration from some other source (e.g., static
-	//   file, XDS, etc.) configuring the buffered admin output type will fail.
+	//	It is only allowed to specify the buffered admin output sink if the tap is being
+	//	configured from the :http:post:`/tap` admin endpoint. Thus, if an extension has
+	//	been configured to receive tap configuration from some other source (e.g., static
+	//	file, XDS, etc.) configuring the buffered admin output type will fail.
 	BufferedAdmin *BufferedAdminSink `protobuf:"bytes,5,opt,name=buffered_admin,json=bufferedAdmin,proto3,oneof"`
 }
 
+type OutputSink_CustomSink struct {
+	// Tap output filter will be defined by an extension type
+	CustomSink *v31.TypedExtensionConfig `protobuf:"bytes,6,opt,name=custom_sink,json=customSink,proto3,oneof"`
+}
+
 func (*OutputSink_StreamingAdmin) isOutputSink_OutputSinkType() {}
 
 func (*OutputSink_FilePerTap) isOutputSink_OutputSinkType() {}
@@ -754,6 +769,8 @@ func (*OutputSink_StreamingGrpc) isOutputSink_OutputSinkType() {}
 
 func (*OutputSink_BufferedAdmin) isOutputSink_OutputSinkType() {}
 
+func (*OutputSink_CustomSink) isOutputSink_OutputSinkType() {}
+
 // Streaming admin sink configuration.
 type StreamingAdminSink struct {
 	state         protoimpl.MessageState
@@ -796,7 +813,7 @@ func (*StreamingAdminSink) Descriptor() ([]byte, []int) {
 // BufferedAdminSink configures a tap output to collect traces without returning them until
 // one of multiple criteria are satisfied.
 // Similar to StreamingAdminSink, it is only allowed to specify the buffered admin output
-// sink if the tap is being configured from the ``/tap`` admin endpoint.
+// sink if the tap is being configured from the “/tap“ admin endpoint.
 type BufferedAdminSink struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1024,6 +1041,7 @@ type HttpGenericBodyMatch_GenericTextMatch struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*HttpGenericBodyMatch_GenericTextMatch_StringMatch
 	//	*HttpGenericBodyMatch_GenericTextMatch_BinaryMatch
 	Rule isHttpGenericBodyMatch_GenericTextMatch_Rule `protobuf_oneof:"rule"`
@@ -1113,241 +1131,248 @@ var file_envoy_config_tap_v3_common_proto_rawDesc = []byte{
 	0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x67, 0x72, 0x70,
-	0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6d,
-	0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77,
-	0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf5, 0x02,
-	0x0a, 0x09, 0x54, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x53, 0x0a, 0x0c, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
-	0x33, 0x2e, 0x30, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x44, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52,
-	0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x50, 0x0a, 0x0d, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f,
+	0x76, 0x33, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
+	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
+	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0xf5, 0x02, 0x0a, 0x09, 0x54, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x53, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x50, 0x0a, 0x0d,
+	0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x0c, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4f,
+	0x0a, 0x0b, 0x74, 0x61, 0x70, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x52, 0x0a, 0x74, 0x61, 0x70, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3a,
+	0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68,
+	0x61, 0x2e, 0x54, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xe6, 0x08, 0x0a, 0x0e,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x49,
+	0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00,
+	0x52, 0x07, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4b, 0x0a, 0x09, 0x61, 0x6e, 0x64,
+	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e,
+	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e,
+	0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x42, 0x0a, 0x09, 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00,
+	0x52, 0x08, 0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x26, 0x0a, 0x09, 0x61, 0x6e,
+	0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa,
+	0x42, 0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x79, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x64, 0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74,
+	0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52,
+	0x17, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x66, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70,
+	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72,
+	0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70,
-	0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x6f, 0x75, 0x74, 0x70,
-	0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4f, 0x0a, 0x0b, 0x74, 0x61, 0x70, 0x5f,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x74,
-	0x61, 0x70, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25,
-	0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x54, 0x61, 0x70, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xe6, 0x08, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50,
-	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x49, 0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x72, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x4b, 0x0a, 0x09, 0x61, 0x6e, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x42, 0x0a, 0x09, 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50,
-	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x6e, 0x6f, 0x74, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x26, 0x0a, 0x09, 0x61, 0x6e, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x6a, 0x02, 0x08, 0x01,
-	0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x64, 0x0a, 0x1a,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x17, 0x68, 0x74, 0x74, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x66, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
-	0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61,
-	0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x66, 0x0a, 0x1b, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74,
-	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x68, 0x0a, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48,
-	0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48,
-	0x00, 0x52, 0x19, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54,
-	0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1f,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x65, 0x6e,
-	0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x12, 0x66, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x48, 0x00, 0x52, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x73, 0x0a, 0x20, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x1a, 0x89, 0x01, 0x0a, 0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65,
-	0x74, 0x12, 0x43, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02, 0x52,
-	0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18,
+	0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x68, 0x0a, 0x1c, 0x68, 0x74, 0x74, 0x70,
+	0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61,
+	0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x19, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x71, 0x0a, 0x1f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76,
+	0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64,
+	0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x73, 0x0a, 0x20, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62,
+	0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74,
+	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69,
+	0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1c, 0x68, 0x74,
+	0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69,
+	0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x89, 0x01, 0x0a, 0x08, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x12, 0x43, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x92, 0x01, 0x02, 0x08, 0x02, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x3a, 0x38, 0x9a, 0xc5,
+	0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70,
 	0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72,
-	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74,
-	0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70,
-	0x68, 0x61, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x85,
-	0x01, 0x0a, 0x10, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c, 0x0a, 0x2a, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32,
-	0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x96, 0x02, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74,
-	0x12, 0x60, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e,
-	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x65,
-	0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08,
-	0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x6e, 0x73, 0x1a, 0x7b, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78,
-	0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
-	0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a,
-	0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22,
-	0xc0, 0x02, 0x0a, 0x0c, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x41, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74,
-	0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b,
-	0x42, 0x0a, 0xfa, 0x42, 0x07, 0x92, 0x01, 0x04, 0x08, 0x01, 0x10, 0x01, 0x52, 0x05, 0x73, 0x69,
-	0x6e, 0x6b, 0x73, 0x12, 0x4f, 0x0a, 0x15, 0x6d, 0x61, 0x78, 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65,
-	0x72, 0x65, 0x64, 0x5f, 0x72, 0x78, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x12, 0x6d, 0x61, 0x78, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x52, 0x78, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x15, 0x6d, 0x61, 0x78, 0x5f, 0x62, 0x75, 0x66, 0x66,
-	0x65, 0x72, 0x65, 0x64, 0x5f, 0x74, 0x78, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x54, 0x78,
-	0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
-	0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x69, 0x6e, 0x67, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32,
-	0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x22, 0xdb, 0x04, 0x0a, 0x0a, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x53, 0x69, 0x6e,
-	0x6b, 0x12, 0x48, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x53, 0x69,
-	0x6e, 0x6b, 0x2e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x52, 0x0a, 0x0f, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52,
-	0x0e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12,
-	0x47, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x61, 0x70, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x69, 0x6c, 0x65,
-	0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69,
-	0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x12, 0x4f, 0x0a, 0x0e, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67,
-	0x47, 0x72, 0x70, 0x63, 0x53, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x12, 0x4f, 0x0a, 0x0e, 0x62, 0x75, 0x66,
-	0x66, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64,
-	0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x0d, 0x62, 0x75, 0x66,
-	0x66, 0x65, 0x72, 0x65, 0x64, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x7e, 0x0a, 0x06, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x12, 0x16, 0x0a, 0x12, 0x4a, 0x53, 0x4f, 0x4e, 0x5f, 0x42, 0x4f, 0x44,
-	0x59, 0x5f, 0x41, 0x53, 0x5f, 0x42, 0x59, 0x54, 0x45, 0x53, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13,
-	0x4a, 0x53, 0x4f, 0x4e, 0x5f, 0x42, 0x4f, 0x44, 0x59, 0x5f, 0x41, 0x53, 0x5f, 0x53, 0x54, 0x52,
-	0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x42,
-	0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x50, 0x52, 0x4f, 0x54, 0x4f,
-	0x5f, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x5f, 0x44,
-	0x45, 0x4c, 0x49, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x50, 0x52,
-	0x4f, 0x54, 0x4f, 0x5f, 0x54, 0x45, 0x58, 0x54, 0x10, 0x04, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e,
-	0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b, 0x42, 0x17, 0x0a, 0x10, 0x6f, 0x75, 0x74, 0x70, 0x75,
-	0x74, 0x5f, 0x73, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x22, 0x49, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x6d,
-	0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70,
-	0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
-	0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x22, 0x70, 0x0a, 0x11, 0x42,
-	0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b,
-	0x12, 0x26, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x04, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x32, 0x02, 0x20, 0x00, 0x52, 0x09, 0x6d,
-	0x61, 0x78, 0x54, 0x72, 0x61, 0x63, 0x65, 0x73, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0x6b, 0x0a,
-	0x0e, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x6b, 0x12,
-	0x28, 0x0a, 0x0b, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x70,
-	0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a,
-	0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x46, 0x69, 0x6c, 0x65,
-	0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x6b, 0x22, 0xae, 0x01, 0x0a, 0x11, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x53, 0x69, 0x6e, 0x6b,
-	0x12, 0x15, 0x0a, 0x06, 0x74, 0x61, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x74, 0x61, 0x70, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x0c, 0x67, 0x72, 0x70, 0x63, 0x5f,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x67, 0x72, 0x70, 0x63,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, 0x2b,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61,
-	0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x53, 0x69, 0x6e, 0x6b, 0x42, 0x7c, 0x0a, 0x21, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12,
+	0x03, 0xf8, 0x42, 0x01, 0x22, 0x85, 0x01, 0x0a, 0x10, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c,
+	0x0a, 0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
+	0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x48, 0x74, 0x74, 0x70,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x96, 0x02, 0x0a,
+	0x14, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65,
+	0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x60, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
+	0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x48,
+	0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08,
+	0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x1a, 0x7b, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c,
+	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73,
+	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x62, 0x69,
+	0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x69, 0x6e,
+	0x61, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65,
+	0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xc0, 0x02, 0x0a, 0x0c, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x6b, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75, 0x74, 0x70,
+	0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x92, 0x01, 0x04, 0x08, 0x01,
+	0x10, 0x01, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x4f, 0x0a, 0x15, 0x6d, 0x61, 0x78,
+	0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x72, 0x78, 0x5f, 0x62, 0x79, 0x74,
+	0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
+	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x42, 0x75, 0x66, 0x66, 0x65,
+	0x72, 0x65, 0x64, 0x52, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x15, 0x6d, 0x61,
+	0x78, 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x74, 0x78, 0x5f, 0x62, 0x79,
+	0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
+	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x42, 0x75, 0x66, 0x66,
+	0x65, 0x72, 0x65, 0x64, 0x54, 0x78, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28,
+	0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
+	0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x4f, 0x75, 0x74, 0x70,
+	0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xaa, 0x05, 0x0a, 0x0a, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b, 0x12, 0x48, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x75,
+	0x74, 0x70, 0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b, 0x2e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42,
+	0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x12, 0x52, 0x0a, 0x0f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x61,
+	0x64, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33,
-	0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x61, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x61, 0x70, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53,
+	0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67,
+	0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x47, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x65,
+	0x72, 0x5f, 0x74, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76,
+	0x33, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x6b,
+	0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x12, 0x4f,
+	0x0a, 0x0e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x67, 0x72, 0x70, 0x63,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x53, 0x69, 0x6e, 0x6b, 0x48, 0x00,
+	0x52, 0x0d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x12,
+	0x4f, 0x0a, 0x0e, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x75,
+	0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x48,
+	0x00, 0x52, 0x0d, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x41, 0x64, 0x6d, 0x69, 0x6e,
+	0x12, 0x4d, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x69, 0x6e, 0x6b, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70,
+	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x48, 0x00, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x69, 0x6e, 0x6b, 0x22,
+	0x7e, 0x0a, 0x06, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x16, 0x0a, 0x12, 0x4a, 0x53, 0x4f,
+	0x4e, 0x5f, 0x42, 0x4f, 0x44, 0x59, 0x5f, 0x41, 0x53, 0x5f, 0x42, 0x59, 0x54, 0x45, 0x53, 0x10,
+	0x00, 0x12, 0x17, 0x0a, 0x13, 0x4a, 0x53, 0x4f, 0x4e, 0x5f, 0x42, 0x4f, 0x44, 0x59, 0x5f, 0x41,
+	0x53, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52,
+	0x4f, 0x54, 0x4f, 0x5f, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d,
+	0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x4c, 0x45, 0x4e,
+	0x47, 0x54, 0x48, 0x5f, 0x44, 0x45, 0x4c, 0x49, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x03, 0x12,
+	0x0e, 0x0a, 0x0a, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x54, 0x45, 0x58, 0x54, 0x10, 0x04, 0x3a,
+	0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68,
+	0x61, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x53, 0x69, 0x6e, 0x6b, 0x42, 0x17, 0x0a, 0x10,
+	0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x49, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69,
+	0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x3a, 0x33, 0x9a, 0xc5, 0x88,
+	0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x6e, 0x6b,
+	0x22, 0x70, 0x0a, 0x11, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, 0x41, 0x64, 0x6d, 0x69,
+	0x6e, 0x53, 0x69, 0x6e, 0x6b, 0x12, 0x26, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x74, 0x72, 0x61,
+	0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x32, 0x02,
+	0x20, 0x00, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x54, 0x72, 0x61, 0x63, 0x65, 0x73, 0x12, 0x33, 0x0a,
+	0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f,
+	0x75, 0x74, 0x22, 0x6b, 0x0a, 0x0e, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70,
+	0x53, 0x69, 0x6e, 0x6b, 0x12, 0x28, 0x0a, 0x0b, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x65,
+	0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x0a, 0x70, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x3a, 0x2f,
+	0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61,
+	0x2e, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x65, 0x72, 0x54, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x6b, 0x22,
+	0xae, 0x01, 0x0a, 0x11, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70,
+	0x63, 0x53, 0x69, 0x6e, 0x6b, 0x12, 0x15, 0x0a, 0x06, 0x74, 0x61, 0x70, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x70, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x0c,
+	0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x0b, 0x67, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x32, 0x9a, 0xc5,
+	0x88, 0x1e, 0x2d, 0x0a, 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x47, 0x72, 0x70, 0x63, 0x53, 0x69, 0x6e, 0x6b,
+	0x42, 0x7c, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x21, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x61, 0x70, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2f, 0x74, 0x61, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x61, 0x70, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1382,8 +1407,9 @@ var file_envoy_config_tap_v3_common_proto_goTypes = []interface{}{
 	(*v31.RuntimeFractionalPercent)(nil),          // 14: envoy.config.core.v3.RuntimeFractionalPercent
 	(*v32.HeaderMatcher)(nil),                     // 15: envoy.config.route.v3.HeaderMatcher
 	(*wrappers.UInt32Value)(nil),                  // 16: google.protobuf.UInt32Value
-	(*duration.Duration)(nil),                     // 17: google.protobuf.Duration
-	(*v31.GrpcService)(nil),                       // 18: envoy.config.core.v3.GrpcService
+	(*v31.TypedExtensionConfig)(nil),              // 17: envoy.config.core.v3.TypedExtensionConfig
+	(*duration.Duration)(nil),                     // 18: google.protobuf.Duration
+	(*v31.GrpcService)(nil),                       // 19: envoy.config.core.v3.GrpcService
 }
 var file_envoy_config_tap_v3_common_proto_depIdxs = []int32{
 	2,  // 0: envoy.config.tap.v3.TapConfig.match_config:type_name -> envoy.config.tap.v3.MatchPredicate
@@ -1409,14 +1435,15 @@ var file_envoy_config_tap_v3_common_proto_depIdxs = []int32{
 	9,  // 20: envoy.config.tap.v3.OutputSink.file_per_tap:type_name -> envoy.config.tap.v3.FilePerTapSink
 	10, // 21: envoy.config.tap.v3.OutputSink.streaming_grpc:type_name -> envoy.config.tap.v3.StreamingGrpcSink
 	8,  // 22: envoy.config.tap.v3.OutputSink.buffered_admin:type_name -> envoy.config.tap.v3.BufferedAdminSink
-	17, // 23: envoy.config.tap.v3.BufferedAdminSink.timeout:type_name -> google.protobuf.Duration
-	18, // 24: envoy.config.tap.v3.StreamingGrpcSink.grpc_service:type_name -> envoy.config.core.v3.GrpcService
-	2,  // 25: envoy.config.tap.v3.MatchPredicate.MatchSet.rules:type_name -> envoy.config.tap.v3.MatchPredicate
-	26, // [26:26] is the sub-list for method output_type
-	26, // [26:26] is the sub-list for method input_type
-	26, // [26:26] is the sub-list for extension type_name
-	26, // [26:26] is the sub-list for extension extendee
-	0,  // [0:26] is the sub-list for field type_name
+	17, // 23: envoy.config.tap.v3.OutputSink.custom_sink:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	18, // 24: envoy.config.tap.v3.BufferedAdminSink.timeout:type_name -> google.protobuf.Duration
+	19, // 25: envoy.config.tap.v3.StreamingGrpcSink.grpc_service:type_name -> envoy.config.core.v3.GrpcService
+	2,  // 26: envoy.config.tap.v3.MatchPredicate.MatchSet.rules:type_name -> envoy.config.tap.v3.MatchPredicate
+	27, // [27:27] is the sub-list for method output_type
+	27, // [27:27] is the sub-list for method input_type
+	27, // [27:27] is the sub-list for extension type_name
+	27, // [27:27] is the sub-list for extension extendee
+	0,  // [0:27] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_tap_v3_common_proto_init() }
@@ -1587,6 +1614,7 @@ func file_envoy_config_tap_v3_common_proto_init() {
 		(*OutputSink_FilePerTap)(nil),
 		(*OutputSink_StreamingGrpc)(nil),
 		(*OutputSink_BufferedAdmin)(nil),
+		(*OutputSink_CustomSink)(nil),
 	}
 	file_envoy_config_tap_v3_common_proto_msgTypes[11].OneofWrappers = []interface{}{
 		(*HttpGenericBodyMatch_GenericTextMatch_StringMatch)(nil),
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.validate.go
index ed89bdc02de..dc7a31524c0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/tap/v3/common.pb.validate.go
@@ -1469,6 +1469,48 @@ func (m *OutputSink) validate(all bool) error {
 			}
 		}
 
+	case *OutputSink_CustomSink:
+		if v == nil {
+			err := OutputSinkValidationError{
+				field:  "OutputSinkType",
+				reason: "oneof value cannot be a typed-nil",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+		oneofOutputSinkTypePresent = true
+
+		if all {
+			switch v := interface{}(m.GetCustomSink()).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, OutputSinkValidationError{
+						field:  "CustomSink",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, OutputSinkValidationError{
+						field:  "CustomSink",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(m.GetCustomSink()).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return OutputSinkValidationError{
+					field:  "CustomSink",
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
 	default:
 		_ = v // ensures v is used
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/datadog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/datadog.pb.go
index 0501e193fce..368dbb17f16 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/datadog.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/datadog.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/datadog.proto
 
 package tracev3
@@ -118,18 +118,18 @@ var file_envoy_config_trace_v3_datadog_proto_rawDesc = []byte{
 	0x6f, 0x72, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e,
 	0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
 	0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x64, 0x6f, 0x67,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb3, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c,
-	0x44, 0x61, 0x74, 0x61, 0x64, 0x6f, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x76, 0x33, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2a, 0x12, 0x28, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x72, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x64, 0x6f, 0x67, 0x2e, 0x76, 0x34, 0x61,
-	0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb3, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2a, 0x12,
+	0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x64, 0x6f,
+	0x67, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x44, 0x61, 0x74, 0x61, 0x64, 0x6f, 0x67, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63,
+	0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/dynamic_ot.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/dynamic_ot.pb.go
index 0b50e856555..6f0fa9dd631 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/dynamic_ot.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/dynamic_ot.pb.go
@@ -1,13 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/dynamic_ot.proto
 
 package tracev3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
+	_ "github.com/envoyproxy/go-control-plane/envoy/annotations"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -34,9 +35,13 @@ type DynamicOtConfig struct {
 
 	// Dynamic library implementing the `OpenTracing API
 	// <https://github.com/opentracing/opentracing-cpp>`_.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto.
 	Library string `protobuf:"bytes,1,opt,name=library,proto3" json:"library,omitempty"`
 	// The configuration to use when creating a tracer from the given dynamic
 	// library.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto.
 	Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 }
 
@@ -72,6 +77,7 @@ func (*DynamicOtConfig) Descriptor() ([]byte, []int) {
 	return file_envoy_config_trace_v3_dynamic_ot_proto_rawDescGZIP(), []int{0}
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto.
 func (x *DynamicOtConfig) GetLibrary() string {
 	if x != nil {
 		return x.Library
@@ -79,6 +85,7 @@ func (x *DynamicOtConfig) GetLibrary() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto.
 func (x *DynamicOtConfig) GetConfig() *_struct.Struct {
 	if x != nil {
 		return x.Config
@@ -94,37 +101,40 @@ var file_envoy_config_trace_v3_dynamic_ot_proto_rawDesc = []byte{
 	0x6f, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x1a,
 	0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x75,
-	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75,
-	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64,
-	0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93, 0x01, 0x0a, 0x0f, 0x44, 0x79, 0x6e,
-	0x61, 0x6d, 0x69, 0x63, 0x4f, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x07,
-	0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x07, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x12,
-	0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x1e, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6d, 0x69, 0x67, 0x72, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xab, 0x01,
+	0x0a, 0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4f, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x2c, 0x0a, 0x07, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04,
+	0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x07, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x12,
+	0x3c, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x44,
-	0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4f, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb8,
-	0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72,
-	0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4f,
-	0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72,
-	0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xf2, 0x98,
+	0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2c, 0x9a,
+	0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x79, 0x6e, 0x61,
+	0x6d, 0x69, 0x63, 0x4f, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb8, 0x01, 0xf2, 0x98,
 	0xfe, 0x8f, 0x05, 0x2d, 0x12, 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
 	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x64,
 	0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6f, 0x74, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68,
-	0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0e,
+	0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4f, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74,
+	0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/http_tracer.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/http_tracer.pb.go
index f0031949185..9eb67464473 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/http_tracer.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/http_tracer.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/http_tracer.proto
 
 package tracev3
@@ -30,8 +30,8 @@ const (
 //
 // .. attention::
 //
-//   Use of this message type has been deprecated in favor of direct use of
-//   :ref:`Tracing.Http <envoy_v3_api_msg_config.trace.v3.Tracing.Http>`.
+//	Use of this message type has been deprecated in favor of direct use of
+//	:ref:`Tracing.Http <envoy_v3_api_msg_config.trace.v3.Tracing.Http>`.
 type Tracing struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -99,6 +99,7 @@ type Tracing_Http struct {
 	// [#extension-category: envoy.tracers]
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*Tracing_Http_TypedConfig
 	ConfigType isTracing_Http_ConfigType `protobuf_oneof:"config_type"`
 }
@@ -197,16 +198,16 @@ var file_envoy_config_trace_v3_http_tracer_proto_rawDesc = []byte{
 	0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e,
-	0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x42, 0x86, 0x01, 0x0a, 0x23, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e,
-	0x76, 0x33, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x54, 0x72, 0x61, 0x63, 0x65, 0x72, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65,
-	0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x42, 0x86, 0x01, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70,
+	0x54, 0x72, 0x61, 0x63, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63,
+	0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/lightstep.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/lightstep.pb.go
index 79a83f7813e..2b62d92a9b1 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/lightstep.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/lightstep.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/lightstep.proto
 
 package tracev3
@@ -94,7 +94,7 @@ type LightstepConfig struct {
 	// File containing the access token to the `LightStep
 	// <https://lightstep.com/>`_ API.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/lightstep.proto.
 	AccessTokenFile string `protobuf:"bytes,2,opt,name=access_token_file,json=accessTokenFile,proto3" json:"access_token_file,omitempty"`
 	// Access token to the `LightStep <https://lightstep.com/>`_ API.
 	AccessToken *v3.DataSource `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
@@ -141,7 +141,7 @@ func (x *LightstepConfig) GetCollectorCluster() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/lightstep.proto.
 func (x *LightstepConfig) GetAccessTokenFile() string {
 	if x != nil {
 		return x.AccessTokenFile
@@ -188,8 +188,8 @@ var file_envoy_config_trace_v3_lightstep_proto_rawDesc = []byte{
 	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74,
 	0x6f, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x11, 0x61, 0x63, 0x63,
 	0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x0f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x46, 0x69,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x52, 0x0f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x46, 0x69,
 	0x6c, 0x65, 0x12, 0x43, 0x0a, 0x0c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b,
 	0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
@@ -209,18 +209,18 @@ var file_envoy_config_trace_v3_lightstep_proto_rawDesc = []byte{
 	0x54, 0x10, 0x03, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76,
 	0x32, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x74, 0x65, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x42, 0xb7, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x4c, 0x69, 0x67, 0x68, 0x74,
-	0x73, 0x74, 0x65, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76,
-	0x33, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2c, 0x12, 0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72,
-	0x73, 0x2e, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x74, 0x65, 0x70, 0x2e, 0x76, 0x34, 0x61, 0x6c,
-	0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x67, 0x42, 0xb7, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2c, 0x12, 0x2a, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
+	0x63, 0x65, 0x72, 0x73, 0x2e, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x74, 0x65, 0x70, 0x2e, 0x76,
+	0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23,
+	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65,
+	0x2e, 0x76, 0x33, 0x42, 0x0e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x74, 0x65, 0x70, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65,
+	0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opencensus.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opencensus.pb.go
index c32240fa119..f76a34bd1d2 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opencensus.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opencensus.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/opencensus.proto
 
 package tracev3
@@ -93,50 +93,72 @@ type OpenCensusConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Configures tracing, e.g. the sampler, max number of annotations, etc.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	TraceConfig *v1.TraceConfig `protobuf:"bytes,1,opt,name=trace_config,json=traceConfig,proto3" json:"trace_config,omitempty"`
 	// Enables the stdout exporter if set to true. This is intended for debugging
 	// purposes.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	StdoutExporterEnabled bool `protobuf:"varint,2,opt,name=stdout_exporter_enabled,json=stdoutExporterEnabled,proto3" json:"stdout_exporter_enabled,omitempty"`
 	// Enables the Stackdriver exporter if set to true. The project_id must also
 	// be set.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	StackdriverExporterEnabled bool `protobuf:"varint,3,opt,name=stackdriver_exporter_enabled,json=stackdriverExporterEnabled,proto3" json:"stackdriver_exporter_enabled,omitempty"`
 	// The Cloud project_id to use for Stackdriver tracing.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	StackdriverProjectId string `protobuf:"bytes,4,opt,name=stackdriver_project_id,json=stackdriverProjectId,proto3" json:"stackdriver_project_id,omitempty"`
 	// (optional) By default, the Stackdriver exporter will connect to production
 	// Stackdriver. If stackdriver_address is non-empty, it will instead connect
 	// to this address, which is in the gRPC format:
 	// https://github.com/grpc/grpc/blob/master/doc/naming.md
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	StackdriverAddress string `protobuf:"bytes,10,opt,name=stackdriver_address,json=stackdriverAddress,proto3" json:"stackdriver_address,omitempty"`
 	// (optional) The gRPC server that hosts Stackdriver tracing service. Only
 	// Google gRPC is supported. If :ref:`target_uri <envoy_v3_api_field_config.core.v3.GrpcService.GoogleGrpc.target_uri>`
 	// is not provided, the default production Stackdriver address will be used.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	StackdriverGrpcService *v3.GrpcService `protobuf:"bytes,13,opt,name=stackdriver_grpc_service,json=stackdriverGrpcService,proto3" json:"stackdriver_grpc_service,omitempty"`
 	// Enables the Zipkin exporter if set to true. The url and service name must
 	// also be set. This is deprecated, prefer to use Envoy's :ref:`native Zipkin
 	// tracer <envoy_v3_api_msg_config.trace.v3.ZipkinConfig>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	ZipkinExporterEnabled bool `protobuf:"varint,5,opt,name=zipkin_exporter_enabled,json=zipkinExporterEnabled,proto3" json:"zipkin_exporter_enabled,omitempty"`
 	// The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans". This is
 	// deprecated, prefer to use Envoy's :ref:`native Zipkin tracer
 	// <envoy_v3_api_msg_config.trace.v3.ZipkinConfig>`.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	ZipkinUrl string `protobuf:"bytes,6,opt,name=zipkin_url,json=zipkinUrl,proto3" json:"zipkin_url,omitempty"`
 	// Enables the OpenCensus Agent exporter if set to true. The ocagent_address or
 	// ocagent_grpc_service must also be set.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	OcagentExporterEnabled bool `protobuf:"varint,11,opt,name=ocagent_exporter_enabled,json=ocagentExporterEnabled,proto3" json:"ocagent_exporter_enabled,omitempty"`
 	// The address of the OpenCensus Agent, if its exporter is enabled, in gRPC
 	// format: https://github.com/grpc/grpc/blob/master/doc/naming.md
 	// [#comment:TODO: deprecate this field]
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	OcagentAddress string `protobuf:"bytes,12,opt,name=ocagent_address,json=ocagentAddress,proto3" json:"ocagent_address,omitempty"`
 	// (optional) The gRPC server hosted by the OpenCensus Agent. Only Google gRPC is supported.
 	// This is only used if the ocagent_address is left empty.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	OcagentGrpcService *v3.GrpcService `protobuf:"bytes,14,opt,name=ocagent_grpc_service,json=ocagentGrpcService,proto3" json:"ocagent_grpc_service,omitempty"`
 	// List of incoming trace context headers we will accept. First one found
 	// wins.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	IncomingTraceContext []OpenCensusConfig_TraceContext `protobuf:"varint,8,rep,packed,name=incoming_trace_context,json=incomingTraceContext,proto3,enum=envoy.config.trace.v3.OpenCensusConfig_TraceContext" json:"incoming_trace_context,omitempty"`
 	// List of outgoing trace context headers we will produce.
+	//
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 	OutgoingTraceContext []OpenCensusConfig_TraceContext `protobuf:"varint,9,rep,packed,name=outgoing_trace_context,json=outgoingTraceContext,proto3,enum=envoy.config.trace.v3.OpenCensusConfig_TraceContext" json:"outgoing_trace_context,omitempty"`
 }
 
@@ -172,6 +194,7 @@ func (*OpenCensusConfig) Descriptor() ([]byte, []int) {
 	return file_envoy_config_trace_v3_opencensus_proto_rawDescGZIP(), []int{0}
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetTraceConfig() *v1.TraceConfig {
 	if x != nil {
 		return x.TraceConfig
@@ -179,6 +202,7 @@ func (x *OpenCensusConfig) GetTraceConfig() *v1.TraceConfig {
 	return nil
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetStdoutExporterEnabled() bool {
 	if x != nil {
 		return x.StdoutExporterEnabled
@@ -186,6 +210,7 @@ func (x *OpenCensusConfig) GetStdoutExporterEnabled() bool {
 	return false
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetStackdriverExporterEnabled() bool {
 	if x != nil {
 		return x.StackdriverExporterEnabled
@@ -193,6 +218,7 @@ func (x *OpenCensusConfig) GetStackdriverExporterEnabled() bool {
 	return false
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetStackdriverProjectId() string {
 	if x != nil {
 		return x.StackdriverProjectId
@@ -200,6 +226,7 @@ func (x *OpenCensusConfig) GetStackdriverProjectId() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetStackdriverAddress() string {
 	if x != nil {
 		return x.StackdriverAddress
@@ -207,6 +234,7 @@ func (x *OpenCensusConfig) GetStackdriverAddress() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetStackdriverGrpcService() *v3.GrpcService {
 	if x != nil {
 		return x.StackdriverGrpcService
@@ -214,7 +242,7 @@ func (x *OpenCensusConfig) GetStackdriverGrpcService() *v3.GrpcService {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetZipkinExporterEnabled() bool {
 	if x != nil {
 		return x.ZipkinExporterEnabled
@@ -222,7 +250,7 @@ func (x *OpenCensusConfig) GetZipkinExporterEnabled() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetZipkinUrl() string {
 	if x != nil {
 		return x.ZipkinUrl
@@ -230,6 +258,7 @@ func (x *OpenCensusConfig) GetZipkinUrl() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetOcagentExporterEnabled() bool {
 	if x != nil {
 		return x.OcagentExporterEnabled
@@ -237,6 +266,7 @@ func (x *OpenCensusConfig) GetOcagentExporterEnabled() bool {
 	return false
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetOcagentAddress() string {
 	if x != nil {
 		return x.OcagentAddress
@@ -244,6 +274,7 @@ func (x *OpenCensusConfig) GetOcagentAddress() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetOcagentGrpcService() *v3.GrpcService {
 	if x != nil {
 		return x.OcagentGrpcService
@@ -251,6 +282,7 @@ func (x *OpenCensusConfig) GetOcagentGrpcService() *v3.GrpcService {
 	return nil
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetIncomingTraceContext() []OpenCensusConfig_TraceContext {
 	if x != nil {
 		return x.IncomingTraceContext
@@ -258,6 +290,7 @@ func (x *OpenCensusConfig) GetIncomingTraceContext() []OpenCensusConfig_TraceCon
 	return nil
 }
 
+// Deprecated: Marked as deprecated in envoy/config/trace/v3/opencensus.proto.
 func (x *OpenCensusConfig) GetOutgoingTraceContext() []OpenCensusConfig_TraceContext {
 	if x != nil {
 		return x.OutgoingTraceContext
@@ -285,87 +318,96 @@ var file_envoy_config_trace_v3_opencensus_proto_rawDesc = []byte{
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74,
 	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61,
 	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb3, 0x08,
+	0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc2, 0x09,
 	0x0a, 0x10, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x49, 0x0a, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x56, 0x0a, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63,
 	0x65, 0x6e, 0x73, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x72, 0x61, 0x63,
 	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x36, 0x0a,
-	0x17, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72,
-	0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15,
-	0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x40, 0x0a, 0x1c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72,
-	0x69, 0x76, 0x65, 0x72, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x73, 0x74, 0x61,
-	0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72,
-	0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x34, 0x0a, 0x16, 0x73, 0x74, 0x61, 0x63, 0x6b,
-	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72,
-	0x69, 0x76, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x12, 0x2f, 0x0a,
-	0x13, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x74, 0x61, 0x63,
-	0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x5b,
-	0x0a, 0x18, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x67, 0x72,
-	0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x52, 0x16, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x43, 0x0a, 0x17, 0x7a,
-	0x69, 0x70, 0x6b, 0x69, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x15, 0x7a, 0x69, 0x70, 0x6b, 0x69,
-	0x6e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x12, 0x2a, 0x0a, 0x0a, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x09, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x55, 0x72, 0x6c, 0x12, 0x38, 0x0a, 0x18,
-	0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72,
-	0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16,
-	0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
-	0x53, 0x0a, 0x14, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x52, 0x12, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x12, 0x6a, 0x0a, 0x16, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67,
-	0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x08,
-	0x20, 0x03, 0x28, 0x0e, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x70, 0x65,
-	0x6e, 0x43, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x54, 0x72,
-	0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x14, 0x69, 0x6e, 0x63, 0x6f,
-	0x6d, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x12, 0x6a, 0x0a, 0x16, 0x6f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0e,
-	0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x65, 0x6e,
-	0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x14, 0x6f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67,
-	0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x60, 0x0a, 0x0c,
-	0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x08, 0x0a, 0x04,
-	0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f,
-	0x43, 0x4f, 0x4e, 0x54, 0x45, 0x58, 0x54, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x47, 0x52, 0x50,
-	0x43, 0x5f, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x42, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x17, 0x0a,
-	0x13, 0x43, 0x4c, 0x4f, 0x55, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x4f, 0x4e,
-	0x54, 0x45, 0x58, 0x54, 0x10, 0x03, 0x12, 0x06, 0x0a, 0x02, 0x42, 0x33, 0x10, 0x04, 0x3a, 0x2d,
-	0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x70, 0x65,
-	0x6e, 0x43, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x04, 0x08,
-	0x07, 0x10, 0x08, 0x42, 0xb9, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4f, 0x70, 0x65,
-	0x6e, 0x63, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x76, 0x33, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2d, 0x12, 0x2b, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x72, 0x73, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2e,
-	0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0b, 0x74,
+	0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x43, 0x0a, 0x17, 0x73, 0x74,
+	0x64, 0x6f, 0x75, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x15, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74,
+	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12,
+	0x4d, 0x0a, 0x1c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x65,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
+	0x18, 0x01, 0x52, 0x1a, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x41,
+	0x0a, 0x16, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x70, 0x72,
+	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
+	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x73, 0x74, 0x61,
+	0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49,
+	0x64, 0x12, 0x3c, 0x0a, 0x13, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
+	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x12, 0x73, 0x74, 0x61,
+	0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
+	0x68, 0x0a, 0x18, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x67,
+	0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x52, 0x16, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x47, 0x72,
+	0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x43, 0x0a, 0x17, 0x7a, 0x69, 0x70,
+	0x6b, 0x69, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8,
+	0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x15, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x2a,
+	0x0a, 0x0a, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52,
+	0x09, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x55, 0x72, 0x6c, 0x12, 0x45, 0x0a, 0x18, 0x6f, 0x63,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f, 0x65,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x16, 0x6f, 0x63, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x64, 0x12, 0x34, 0x0a, 0x0f, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8,
+	0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x60, 0x0a, 0x14, 0x6f, 0x63, 0x61, 0x67, 0x65,
+	0x6e, 0x74, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x70,
+	0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x12, 0x6f, 0x63, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72,
+	0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x16, 0x69, 0x6e, 0x63,
+	0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42,
+	0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x69, 0x6e,
+	0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x12, 0x77, 0x0a, 0x16, 0x6f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x5f, 0x74,
+	0x72, 0x61, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x09, 0x20, 0x03,
+	0x28, 0x0e, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x43,
+	0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x54, 0x72, 0x61, 0x63,
+	0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x6f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x54,
+	0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x60, 0x0a, 0x0c, 0x54,
+	0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x08, 0x0a, 0x04, 0x4e,
+	0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x43,
+	0x4f, 0x4e, 0x54, 0x45, 0x58, 0x54, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x47, 0x52, 0x50, 0x43,
+	0x5f, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x42, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13,
+	0x43, 0x4c, 0x4f, 0x55, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x54,
+	0x45, 0x58, 0x54, 0x10, 0x03, 0x12, 0x06, 0x0a, 0x02, 0x42, 0x33, 0x10, 0x04, 0x3a, 0x2d, 0x9a,
+	0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x70, 0x65, 0x6e,
+	0x43, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x04, 0x08, 0x07,
+	0x10, 0x08, 0x42, 0xb9, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2d, 0x12, 0x2b, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x73, 0x75, 0x73,
+	0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61,
+	0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x4f, 0x70, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x73, 0x75,
+	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.go
index 9ee7e93672a..f652e987ea9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/opentelemetry.proto
 
 package tracev3
@@ -23,7 +23,10 @@ const (
 )
 
 // Configuration for the OpenTelemetry tracer.
-//  [#extension: envoy.tracers.opentelemetry]
+//
+//	[#extension: envoy.tracers.opentelemetry]
+//
+// [#next-free-field: 6]
 type OpenTelemetryConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -31,11 +34,34 @@ type OpenTelemetryConfig struct {
 
 	// The upstream gRPC cluster that will receive OTLP traces.
 	// Note that the tracer drops traces if the server does not read data fast enough.
-	// This field can be left empty to disable reporting traces to the collector.
+	// This field can be left empty to disable reporting traces to the gRPC service.
+	// Only one of “grpc_service“, “http_service“ may be used.
 	GrpcService *v3.GrpcService `protobuf:"bytes,1,opt,name=grpc_service,json=grpcService,proto3" json:"grpc_service,omitempty"`
+	// The upstream HTTP cluster that will receive OTLP traces.
+	// This field can be left empty to disable reporting traces to the HTTP service.
+	// Only one of “grpc_service“, “http_service“ may be used.
+	//
+	// .. note::
+	//
+	//	Note: The ``request_headers_to_add`` property in the OTLP HTTP exporter service
+	//	does not support the :ref:`format specifier <config_access_log_format>` as used for
+	//	:ref:`HTTP access logging <config_access_log>`.
+	//	The values configured are added as HTTP headers on the OTLP export request
+	//	without any formatting applied.
+	HttpService *v3.HttpService `protobuf:"bytes,3,opt,name=http_service,json=httpService,proto3" json:"http_service,omitempty"`
 	// The name for the service. This will be populated in the ResourceSpan Resource attributes.
 	// If it is not provided, it will default to "unknown_service:envoy".
 	ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
+	// An ordered list of resource detectors
+	// [#extension-category: envoy.tracers.opentelemetry.resource_detectors]
+	ResourceDetectors []*v3.TypedExtensionConfig `protobuf:"bytes,4,rep,name=resource_detectors,json=resourceDetectors,proto3" json:"resource_detectors,omitempty"`
+	// Specifies the sampler to be used by the OpenTelemetry tracer.
+	// The configured sampler implements the Sampler interface defined by the OpenTelemetry specification.
+	// This field can be left empty. In this case, the default Envoy sampling decision is used.
+	//
+	// See: `OpenTelemetry sampler specification <https://opentelemetry.io/docs/specs/otel/trace/sdk/#sampler>`_
+	// [#extension-category: envoy.tracers.opentelemetry.samplers]
+	Sampler *v3.TypedExtensionConfig `protobuf:"bytes,5,opt,name=sampler,proto3" json:"sampler,omitempty"`
 }
 
 func (x *OpenTelemetryConfig) Reset() {
@@ -77,6 +103,13 @@ func (x *OpenTelemetryConfig) GetGrpcService() *v3.GrpcService {
 	return nil
 }
 
+func (x *OpenTelemetryConfig) GetHttpService() *v3.HttpService {
+	if x != nil {
+		return x.HttpService
+	}
+	return nil
+}
+
 func (x *OpenTelemetryConfig) GetServiceName() string {
 	if x != nil {
 		return x.ServiceName
@@ -84,6 +117,20 @@ func (x *OpenTelemetryConfig) GetServiceName() string {
 	return ""
 }
 
+func (x *OpenTelemetryConfig) GetResourceDetectors() []*v3.TypedExtensionConfig {
+	if x != nil {
+		return x.ResourceDetectors
+	}
+	return nil
+}
+
+func (x *OpenTelemetryConfig) GetSampler() *v3.TypedExtensionConfig {
+	if x != nil {
+		return x.Sampler
+	}
+	return nil
+}
+
 var File_envoy_config_trace_v3_opentelemetry_proto protoreflect.FileDescriptor
 
 var file_envoy_config_trace_v3_opentelemetry_proto_rawDesc = []byte{
@@ -91,28 +138,53 @@ var file_envoy_config_trace_v3_opentelemetry_proto_rawDesc = []byte{
 	0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65,
 	0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x15, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e,
-	0x76, 0x33, 0x1a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70,
-	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7e, 0x0a, 0x13, 0x4f, 0x70,
+	0x76, 0x33, 0x1a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x67,
+	0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
+	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x75, 0x64, 0x70, 0x61,
+	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6d, 0x69, 0x67,
+	0x72, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61,
+	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93, 0x03, 0x0a, 0x13, 0x4f, 0x70,
 	0x65, 0x6e, 0x54, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x44, 0x0a, 0x0c, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x67, 0x12, 0x5b, 0x0a, 0x0c, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x47,
-	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x0b, 0x67, 0x72, 0x70, 0x63,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x89, 0x01, 0x0a, 0x23, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e,
-	0x76, 0x33, 0x42, 0x12, 0x4f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72,
-	0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72,
-	0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x15, 0xf2, 0x98, 0xfe, 0x8f,
+	0x05, 0x0f, 0x12, 0x0d, 0x6f, 0x74, 0x6c, 0x70, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
+	0x72, 0x52, 0x0b, 0x67, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5b,
+	0x0a, 0x0c, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x15, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0f, 0x12,
+	0x0d, 0x6f, 0x74, 0x6c, 0x70, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x52, 0x0b,
+	0x68, 0x74, 0x74, 0x70, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x59,
+	0x0a, 0x12, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x44, 0x0a, 0x07, 0x73, 0x61, 0x6d,
+	0x70, 0x6c, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x42,
+	0x89, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42,
+	0x12, 0x4f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65,
+	0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -129,16 +201,21 @@ func file_envoy_config_trace_v3_opentelemetry_proto_rawDescGZIP() []byte {
 
 var file_envoy_config_trace_v3_opentelemetry_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_envoy_config_trace_v3_opentelemetry_proto_goTypes = []interface{}{
-	(*OpenTelemetryConfig)(nil), // 0: envoy.config.trace.v3.OpenTelemetryConfig
-	(*v3.GrpcService)(nil),      // 1: envoy.config.core.v3.GrpcService
+	(*OpenTelemetryConfig)(nil),     // 0: envoy.config.trace.v3.OpenTelemetryConfig
+	(*v3.GrpcService)(nil),          // 1: envoy.config.core.v3.GrpcService
+	(*v3.HttpService)(nil),          // 2: envoy.config.core.v3.HttpService
+	(*v3.TypedExtensionConfig)(nil), // 3: envoy.config.core.v3.TypedExtensionConfig
 }
 var file_envoy_config_trace_v3_opentelemetry_proto_depIdxs = []int32{
 	1, // 0: envoy.config.trace.v3.OpenTelemetryConfig.grpc_service:type_name -> envoy.config.core.v3.GrpcService
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	2, // 1: envoy.config.trace.v3.OpenTelemetryConfig.http_service:type_name -> envoy.config.core.v3.HttpService
+	3, // 2: envoy.config.trace.v3.OpenTelemetryConfig.resource_detectors:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	3, // 3: envoy.config.trace.v3.OpenTelemetryConfig.sampler:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_envoy_config_trace_v3_opentelemetry_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.validate.go
index 283cacfbd6b..d1043ccf4c6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/opentelemetry.pb.validate.go
@@ -86,8 +86,100 @@ func (m *OpenTelemetryConfig) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetHttpService()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, OpenTelemetryConfigValidationError{
+					field:  "HttpService",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, OpenTelemetryConfigValidationError{
+					field:  "HttpService",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetHttpService()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return OpenTelemetryConfigValidationError{
+				field:  "HttpService",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	// no validation rules for ServiceName
 
+	for idx, item := range m.GetResourceDetectors() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, OpenTelemetryConfigValidationError{
+						field:  fmt.Sprintf("ResourceDetectors[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, OpenTelemetryConfigValidationError{
+						field:  fmt.Sprintf("ResourceDetectors[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return OpenTelemetryConfigValidationError{
+					field:  fmt.Sprintf("ResourceDetectors[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
+	if all {
+		switch v := interface{}(m.GetSampler()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, OpenTelemetryConfigValidationError{
+					field:  "Sampler",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, OpenTelemetryConfigValidationError{
+					field:  "Sampler",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetSampler()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return OpenTelemetryConfigValidationError{
+				field:  "Sampler",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return OpenTelemetryConfigMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/service.pb.go
index e9460cf1eac..c032d11b559 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/service.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/service.proto
 
 package tracev3
@@ -96,15 +96,15 @@ var file_envoy_config_trace_v3_service_proto_rawDesc = []byte{
 	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61,
 	0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x83, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33,
-	0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74,
-	0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
+	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x83, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/skywalking.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/skywalking.pb.go
index 2c30cc78a6f..ad4f4eb5168 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/skywalking.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/skywalking.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/skywalking.proto
 
 package tracev3
@@ -25,10 +25,10 @@ const (
 )
 
 // Configuration for the SkyWalking tracer. Please note that if SkyWalking tracer is used as the
-// provider of http tracer, then
-// :ref:`start_child_span <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>`
-// in the router must be set to true to get the correct topology and tracing data. Moreover, SkyWalking
-// Tracer does not support SkyWalking extension header (``sw8-x``) temporarily.
+// provider of tracing, then
+// :ref:`spawn_upstream_span <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.spawn_upstream_span>`
+// in the tracing config must be set to true to get the correct topology and tracing data. Moreover, SkyWalking
+// Tracer does not support SkyWalking extension header (“sw8-x“) temporarily.
 // [#extension: envoy.tracers.skywalking]
 type SkyWalkingConfig struct {
 	state         protoimpl.MessageState
@@ -96,13 +96,13 @@ type ClientConfig struct {
 	// that configured by :ref:`Bootstrap node <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.node>`
 	// message's :ref:`cluster <envoy_v3_api_field_config.core.v3.Node.cluster>` field or command line
 	// option :option:`--service-cluster` will be used. If both this field and local service cluster
-	// name are empty, ``EnvoyProxy`` is used as the service name by default.
+	// name are empty, “EnvoyProxy“ is used as the service name by default.
 	ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
 	// Service instance name for SkyWalking tracer. If this field is empty, then local service node
 	// that configured by :ref:`Bootstrap node <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.node>`
 	// message's :ref:`id <envoy_v3_api_field_config.core.v3.Node.id>` field or command line  option
 	// :option:`--service-node` will be used. If both this field and local service node are empty,
-	// ``EnvoyProxy`` is used as the instance name by default.
+	// “EnvoyProxy“ is used as the instance name by default.
 	InstanceName string `protobuf:"bytes,2,opt,name=instance_name,json=instanceName,proto3" json:"instance_name,omitempty"`
 	// Authentication token config for SkyWalking. SkyWalking can use token authentication to secure
 	// that monitoring application data can be trusted. In current version, Token is considered as a
@@ -110,6 +110,7 @@ type ClientConfig struct {
 	// [#comment:TODO(wbpcode): Get backend token through the SDS API.]
 	//
 	// Types that are assignable to BackendTokenSpecifier:
+	//
 	//	*ClientConfig_BackendToken
 	BackendTokenSpecifier isClientConfig_BackendTokenSpecifier `protobuf_oneof:"backend_token_specifier"`
 	// Envoy caches the segment in memory when the SkyWalking backend service is temporarily unavailable.
@@ -240,19 +241,19 @@ var file_envoy_config_trace_v3_skywalking_proto_rawDesc = []byte{
 	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
 	0x0c, 0x6d, 0x61, 0x78, 0x43, 0x61, 0x63, 0x68, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x19, 0x0a,
 	0x17, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0xb9, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33,
-	0x42, 0x0f, 0x53, 0x6b, 0x79, 0x77, 0x61, 0x6c, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76,
-	0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x2d, 0x12,
-	0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x73, 0x6b, 0x79, 0x77, 0x61, 0x6c,
-	0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0xb9, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x2d, 0x12, 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x73, 0x6b, 0x79, 0x77,
+	0x61, 0x6c, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x53, 0x6b, 0x79,
+	0x77, 0x61, 0x6c, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61,
+	0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/trace.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/trace.pb.go
index aa069f64cd7..b69ff01e7dc 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/trace.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/trace.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/trace.proto
 
 package tracev3
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/xray.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/xray.pb.go
index 700016f6da0..7b3bc5cc87b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/xray.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/xray.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/xray.proto
 
 package tracev3
@@ -212,18 +212,18 @@ var file_envoy_config_trace_v3_xray_proto_rawDesc = []byte{
 	0x03, 0x61, 0x77, 0x73, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e,
 	0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x58, 0x52, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x42, 0xad, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x58, 0x72, 0x61, 0x79,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0xf2, 0x98, 0xfe,
-	0x8f, 0x05, 0x27, 0x12, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x78, 0x72,
-	0x61, 0x79, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x67, 0x42, 0xad, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x27, 0x12, 0x25, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70,
+	0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42,
+	0x09, 0x58, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/zipkin.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/zipkin.pb.go
index 44c37dcabc7..e9ca164f869 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/zipkin.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v3/zipkin.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/config/trace/v3/zipkin.proto
 
 package tracev3
@@ -36,7 +36,7 @@ const (
 	// user upgrading Envoy with this change. Furthermore, we also immediately deprecate this field,
 	// since in Zipkin realm this v1 version is considered to be not preferable anymore.]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/config/trace/v3/zipkin.proto.
 	ZipkinConfig_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE ZipkinConfig_CollectorEndpointVersion = 0
 	// Zipkin API v2, JSON over HTTP.
 	ZipkinConfig_HTTP_JSON ZipkinConfig_CollectorEndpointVersion = 1
@@ -119,13 +119,13 @@ type ZipkinConfig struct {
 	//
 	// * The Envoy Proxy is used as gateway or ingress.
 	// * The Envoy Proxy is used as sidecar but inbound traffic capturing or outbound traffic capturing is disabled.
-	// * Any case that the `start_child_span of router <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>` is set to true.
+	// * Any case that the :ref:`start_child_span of router <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>` is set to true.
 	//
 	// .. attention::
 	//
-	//   If this is set to true, then the
-	//   :ref:`start_child_span of router <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>`
-	//   SHOULD be set to true also to ensure the correctness of trace chain.
+	//	If this is set to true, then the
+	//	:ref:`start_child_span of router <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>`
+	//	SHOULD be set to true also to ensure the correctness of trace chain.
 	SplitSpansForRequest bool `protobuf:"varint,7,opt,name=split_spans_for_request,json=splitSpansForRequest,proto3" json:"split_spans_for_request,omitempty"`
 }
 
@@ -262,24 +262,24 @@ var file_envoy_config_trace_v3_zipkin_proto_rawDesc = []byte{
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x25,
 	0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x55,
 	0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x44, 0x4f, 0x5f, 0x4e, 0x4f,
-	0x54, 0x5f, 0x55, 0x53, 0x45, 0x10, 0x00, 0x1a, 0x08, 0x08, 0x01, 0xa8, 0xf7, 0xb4, 0x8b, 0x02,
+	0x54, 0x5f, 0x55, 0x53, 0x45, 0x10, 0x00, 0x1a, 0x08, 0xa8, 0xf7, 0xb4, 0x8b, 0x02, 0x01, 0x08,
 	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x5f, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x01,
 	0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x54, 0x54, 0x50, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x10, 0x02,
 	0x12, 0x08, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x10, 0x03, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e,
 	0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
 	0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x5a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb1, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x5a,
-	0x69, 0x70, 0x6b, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65,
-	0x76, 0x33, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x29, 0x12, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65,
-	0x72, 0x73, 0x2e, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x2e, 0x76, 0x34, 0x61, 0x6c, 0x70, 0x68,
-	0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xb1, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x29, 0x12, 0x27,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x7a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x2e,
+	0x76, 0x34, 0x61, 0x6c, 0x70, 0x68, 0x61, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63,
+	0x65, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x5a, 0x69, 0x70, 0x6b, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2f, 0x76,
+	0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3/accesslog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3/accesslog.pb.go
index 77e75ea19a1..8cbac9f9e51 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3/accesslog.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3/accesslog.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/data/accesslog/v3/accesslog.proto
 
 package accesslogv3
@@ -42,6 +42,9 @@ const (
 	AccessLogType_UpstreamPeriodic                        AccessLogType = 8
 	AccessLogType_UpstreamEnd                             AccessLogType = 9
 	AccessLogType_DownstreamTunnelSuccessfullyEstablished AccessLogType = 10
+	AccessLogType_UdpTunnelUpstreamConnected              AccessLogType = 11
+	AccessLogType_UdpPeriodic                             AccessLogType = 12
+	AccessLogType_UdpSessionEnd                           AccessLogType = 13
 )
 
 // Enum value maps for AccessLogType.
@@ -58,6 +61,9 @@ var (
 		8:  "UpstreamPeriodic",
 		9:  "UpstreamEnd",
 		10: "DownstreamTunnelSuccessfullyEstablished",
+		11: "UdpTunnelUpstreamConnected",
+		12: "UdpPeriodic",
+		13: "UdpSessionEnd",
 	}
 	AccessLogType_value = map[string]int32{
 		"NotSet":               0,
@@ -71,6 +77,9 @@ var (
 		"UpstreamPeriodic":     8,
 		"UpstreamEnd":          9,
 		"DownstreamTunnelSuccessfullyEstablished": 10,
+		"UdpTunnelUpstreamConnected":              11,
+		"UdpPeriodic":                             12,
+		"UdpSessionEnd":                           13,
 	}
 )
 
@@ -475,13 +484,13 @@ type AccessLogCommon struct {
 	// downstream byte received (i.e. time it takes to receive a request).
 	TimeToLastRxByte *duration.Duration `protobuf:"bytes,6,opt,name=time_to_last_rx_byte,json=timeToLastRxByte,proto3" json:"time_to_last_rx_byte,omitempty"`
 	// Interval between the first downstream byte received and the first upstream byte sent. There may
-	// by considerable delta between ``time_to_last_rx_byte`` and this value due to filters.
-	// Additionally, the same caveats apply as documented in ``time_to_last_downstream_tx_byte`` about
+	// by considerable delta between “time_to_last_rx_byte“ and this value due to filters.
+	// Additionally, the same caveats apply as documented in “time_to_last_downstream_tx_byte“ about
 	// not accounting for kernel socket buffer time, etc.
 	TimeToFirstUpstreamTxByte *duration.Duration `protobuf:"bytes,7,opt,name=time_to_first_upstream_tx_byte,json=timeToFirstUpstreamTxByte,proto3" json:"time_to_first_upstream_tx_byte,omitempty"`
 	// Interval between the first downstream byte received and the last upstream byte sent. There may
-	// by considerable delta between ``time_to_last_rx_byte`` and this value due to filters.
-	// Additionally, the same caveats apply as documented in ``time_to_last_downstream_tx_byte`` about
+	// by considerable delta between “time_to_last_rx_byte“ and this value due to filters.
+	// Additionally, the same caveats apply as documented in “time_to_last_downstream_tx_byte“ about
 	// not accounting for kernel socket buffer time, etc.
 	TimeToLastUpstreamTxByte *duration.Duration `protobuf:"bytes,8,opt,name=time_to_last_upstream_tx_byte,json=timeToLastUpstreamTxByte,proto3" json:"time_to_last_upstream_tx_byte,omitempty"`
 	// Interval between the first downstream byte received and the first upstream
@@ -491,13 +500,13 @@ type AccessLogCommon struct {
 	// byte received (i.e. time it takes to receive a complete response).
 	TimeToLastUpstreamRxByte *duration.Duration `protobuf:"bytes,10,opt,name=time_to_last_upstream_rx_byte,json=timeToLastUpstreamRxByte,proto3" json:"time_to_last_upstream_rx_byte,omitempty"`
 	// Interval between the first downstream byte received and the first downstream byte sent.
-	// There may be a considerable delta between the ``time_to_first_upstream_rx_byte`` and this field
+	// There may be a considerable delta between the “time_to_first_upstream_rx_byte“ and this field
 	// due to filters. Additionally, the same caveats apply as documented in
-	// ``time_to_last_downstream_tx_byte`` about not accounting for kernel socket buffer time, etc.
+	// “time_to_last_downstream_tx_byte“ about not accounting for kernel socket buffer time, etc.
 	TimeToFirstDownstreamTxByte *duration.Duration `protobuf:"bytes,11,opt,name=time_to_first_downstream_tx_byte,json=timeToFirstDownstreamTxByte,proto3" json:"time_to_first_downstream_tx_byte,omitempty"`
 	// Interval between the first downstream byte received and the last downstream byte sent.
 	// Depending on protocol, buffering, windowing, filters, etc. there may be a considerable delta
-	// between ``time_to_last_upstream_rx_byte`` and this field. Note also that this is an approximate
+	// between “time_to_last_upstream_rx_byte“ and this field. Note also that this is an approximate
 	// time. In the current implementation it does not include kernel socket buffer time. In the
 	// current implementation it also does not include send window buffering inside the HTTP/2 codec.
 	// In the future it is likely that work will be done to make this duration more accurate.
@@ -507,7 +516,7 @@ type AccessLogCommon struct {
 	UpstreamRemoteAddress *v3.Address `protobuf:"bytes,13,opt,name=upstream_remote_address,json=upstreamRemoteAddress,proto3" json:"upstream_remote_address,omitempty"`
 	// The upstream local/origin address that handles this exchange. This does not include retries.
 	UpstreamLocalAddress *v3.Address `protobuf:"bytes,14,opt,name=upstream_local_address,json=upstreamLocalAddress,proto3" json:"upstream_local_address,omitempty"`
-	// The upstream cluster that ``upstream_remote_address`` belongs to.
+	// The upstream cluster that “upstream_remote_address“ belongs to.
 	UpstreamCluster string `protobuf:"bytes,15,opt,name=upstream_cluster,json=upstreamCluster,proto3" json:"upstream_cluster,omitempty"`
 	// Flags indicating occurrences during request/response processing.
 	ResponseFlags *ResponseFlags `protobuf:"bytes,16,opt,name=response_flags,json=responseFlags,proto3" json:"response_flags,omitempty"`
@@ -532,8 +541,8 @@ type AccessLogCommon struct {
 	// for example the x-forwarder-for header, proxy protocol, etc.
 	DownstreamDirectRemoteAddress *v3.Address `protobuf:"bytes,20,opt,name=downstream_direct_remote_address,json=downstreamDirectRemoteAddress,proto3" json:"downstream_direct_remote_address,omitempty"`
 	// Map of filter state in stream info that have been configured to be logged. If the filter
-	// state serialized to any message other than ``google.protobuf.Any`` it will be packed into
-	// ``google.protobuf.Any``.
+	// state serialized to any message other than “google.protobuf.Any“ it will be packed into
+	// “google.protobuf.Any“.
 	FilterStateObjects map[string]*any1.Any `protobuf:"bytes,21,rep,name=filter_state_objects,json=filterStateObjects,proto3" json:"filter_state_objects,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// A list of custom tags, which annotate logs with additional information.
 	// To configure this value, users should configure
@@ -542,7 +551,7 @@ type AccessLogCommon struct {
 	// For HTTP: Total duration in milliseconds of the request from the start time to the last byte out.
 	// For TCP: Total duration in milliseconds of the downstream connection.
 	// This is the total duration of the request (i.e., when the request's ActiveStream is destroyed)
-	// and may be longer than ``time_to_last_downstream_tx_byte``.
+	// and may be longer than “time_to_last_downstream_tx_byte“.
 	Duration *duration.Duration `protobuf:"bytes,23,opt,name=duration,proto3" json:"duration,omitempty"`
 	// For HTTP: Number of times the request is attempted upstream. Note that the field is omitted when the request was never attempted upstream.
 	// For TCP: Number of times the connection request is attempted upstream. Note that the field is omitted when the connect request was never attempted upstream.
@@ -562,10 +571,10 @@ type AccessLogCommon struct {
 	//
 	// .. attention::
 	//
-	//   This field is deprecated in favor of ``access_log_type`` for better indication of the
-	//   type of the access log record.
+	//	This field is deprecated in favor of ``access_log_type`` for better indication of the
+	//	type of the access log record.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/data/accesslog/v3/accesslog.proto.
 	IntermediateLogEntry bool `protobuf:"varint,27,opt,name=intermediate_log_entry,json=intermediateLogEntry,proto3" json:"intermediate_log_entry,omitempty"`
 	// If downstream connection in listener failed due to transport socket (e.g. TLS handshake), provides the
 	// failure reason from the transport socket. The format of this field depends on the configured downstream
@@ -586,7 +595,7 @@ type AccessLogCommon struct {
 	// The type of the access log, which indicates when the log was recorded.
 	// See :ref:`ACCESS_LOG_TYPE <config_access_log_format_access_log_type>` for the available values.
 	// In case the access log was recorded by a flow which does not correspond to one of the supported
-	// values, then the default value will be ``NotSet``.
+	// values, then the default value will be “NotSet“.
 	// For more information about how access log behaves and when it is being recorded,
 	// please refer to :ref:`access logging <arch_overview_access_logs>`.
 	AccessLogType AccessLogType `protobuf:"varint,33,opt,name=access_log_type,json=accessLogType,proto3,enum=envoy.data.accesslog.v3.AccessLogType" json:"access_log_type,omitempty"`
@@ -806,7 +815,7 @@ func (x *AccessLogCommon) GetStreamId() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/data/accesslog/v3/accesslog.proto.
 func (x *AccessLogCommon) GetIntermediateLogEntry() bool {
 	if x != nil {
 		return x.IntermediateLogEntry
@@ -1152,7 +1161,7 @@ type TLSProperties struct {
 	TlsVersion TLSProperties_TLSVersion `protobuf:"varint,1,opt,name=tls_version,json=tlsVersion,proto3,enum=envoy.data.accesslog.v3.TLSProperties_TLSVersion" json:"tls_version,omitempty"`
 	// TLS cipher suite negotiated during handshake. The value is a
 	// four-digit hex code defined by the IANA TLS Cipher Suite Registry
-	// (e.g. ``009C`` for ``TLS_RSA_WITH_AES_128_GCM_SHA256``).
+	// (e.g. “009C“ for “TLS_RSA_WITH_AES_128_GCM_SHA256“).
 	//
 	// Here it is expressed as an integer.
 	TlsCipherSuite *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tls_cipher_suite,json=tlsCipherSuite,proto3" json:"tls_cipher_suite,omitempty"`
@@ -1164,7 +1173,7 @@ type TLSProperties struct {
 	PeerCertificateProperties *TLSProperties_CertificateProperties `protobuf:"bytes,5,opt,name=peer_certificate_properties,json=peerCertificateProperties,proto3" json:"peer_certificate_properties,omitempty"`
 	// The TLS session ID.
 	TlsSessionId string `protobuf:"bytes,6,opt,name=tls_session_id,json=tlsSessionId,proto3" json:"tls_session_id,omitempty"`
-	// The ``JA3`` fingerprint when ``JA3`` fingerprinting is enabled.
+	// The “JA3“ fingerprint when “JA3“ fingerprinting is enabled.
 	Ja3Fingerprint string `protobuf:"bytes,7,opt,name=ja3_fingerprint,json=ja3Fingerprint,proto3" json:"ja3_fingerprint,omitempty"`
 }
 
@@ -1259,26 +1268,26 @@ type HTTPRequestProperties struct {
 	RequestMethod v3.RequestMethod `protobuf:"varint,1,opt,name=request_method,json=requestMethod,proto3,enum=envoy.config.core.v3.RequestMethod" json:"request_method,omitempty"`
 	// The scheme portion of the incoming request URI.
 	Scheme string `protobuf:"bytes,2,opt,name=scheme,proto3" json:"scheme,omitempty"`
-	// HTTP/2 ``:authority`` or HTTP/1.1 ``Host`` header value.
+	// HTTP/2 “:authority“ or HTTP/1.1 “Host“ header value.
 	Authority string `protobuf:"bytes,3,opt,name=authority,proto3" json:"authority,omitempty"`
 	// The port of the incoming request URI
 	// (unused currently, as port is composed onto authority).
 	Port *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"`
 	// The path portion from the incoming request URI.
 	Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"`
-	// Value of the ``User-Agent`` request header.
+	// Value of the “User-Agent“ request header.
 	UserAgent string `protobuf:"bytes,6,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty"`
-	// Value of the ``Referer`` request header.
+	// Value of the “Referer“ request header.
 	Referer string `protobuf:"bytes,7,opt,name=referer,proto3" json:"referer,omitempty"`
-	// Value of the ``X-Forwarded-For`` request header.
+	// Value of the “X-Forwarded-For“ request header.
 	ForwardedFor string `protobuf:"bytes,8,opt,name=forwarded_for,json=forwardedFor,proto3" json:"forwarded_for,omitempty"`
-	// Value of the ``X-Request-Id`` request header
+	// Value of the “X-Request-Id“ request header
 	//
 	// This header is used by Envoy to uniquely identify a request.
 	// It will be generated for all external requests and internal requests that
 	// do not already have a request ID.
 	RequestId string `protobuf:"bytes,9,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
-	// Value of the ``X-Envoy-Original-Path`` request header.
+	// Value of the “X-Envoy-Original-Path“ request header.
 	OriginalPath string `protobuf:"bytes,10,opt,name=original_path,json=originalPath,proto3" json:"original_path,omitempty"`
 	// Size of the HTTP request headers in bytes.
 	//
@@ -1665,6 +1674,7 @@ type TLSProperties_CertificateProperties_SubjectAltName struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to San:
+	//
 	//	*TLSProperties_CertificateProperties_SubjectAltName_Uri
 	//	*TLSProperties_CertificateProperties_SubjectAltName_Dns
 	San isTLSProperties_CertificateProperties_SubjectAltName_San `protobuf_oneof:"san"`
@@ -1954,8 +1964,8 @@ var file_envoy_data_accesslog_v3_accesslog_proto_rawDesc = []byte{
 	0x1b, 0x0a, 0x09, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x1a, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x41, 0x0a, 0x16,
 	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x6f, 0x67,
-	0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x72,
 	0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
 	0x4d, 0x0a, 0x23, 0x64, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x74, 0x72,
 	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f,
@@ -2277,7 +2287,7 @@ var file_envoy_data_accesslog_v3_accesslog_proto_rawDesc = []byte{
 	0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x61, 0x63,
 	0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52,
 	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x2a, 0x87, 0x02, 0x0a, 0x0d, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x54,
+	0x73, 0x2a, 0xcb, 0x02, 0x0a, 0x0d, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x54,
 	0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x74, 0x10, 0x00, 0x12,
 	0x18, 0x0a, 0x14, 0x54, 0x63, 0x70, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f,
 	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x63, 0x70,
@@ -2293,17 +2303,21 @@ var file_envoy_data_accesslog_v3_accesslog_proto_rawDesc = []byte{
 	0x0b, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x2b,
 	0x0a, 0x27, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x75, 0x6e, 0x6e,
 	0x65, 0x6c, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x45, 0x73,
-	0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x0a, 0x42, 0x8d, 0x01, 0x0a, 0x25,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f,
-	0x67, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x0a, 0x12, 0x1e, 0x0a, 0x1a, 0x55,
+	0x64, 0x70, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x10, 0x0b, 0x12, 0x0f, 0x0a, 0x0b, 0x55,
+	0x64, 0x70, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x69, 0x63, 0x10, 0x0c, 0x12, 0x11, 0x0a, 0x0d,
+	0x55, 0x64, 0x70, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x64, 0x10, 0x0d, 0x42,
+	0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
+	0x33, 0x42, 0x0e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x4a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67,
+	0x2f, 0x76, 0x33, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x76, 0x33, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3/cluster.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
index 5ff4c5de1d2..3a346bf355b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/clusters/aggregate/v3/cluster.proto
 
 package aggregatev3
@@ -96,17 +96,17 @@ var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x67,
 	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e,
 	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xa9, 0x01,
-	0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x59, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x59,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
+	0x2f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3/fault.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3/fault.pb.go
index 1442b756b09..9fd8f66f4a4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3/fault.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3/fault.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/filters/common/fault/v3/fault.proto
 
 package faultv3
@@ -77,6 +77,7 @@ type FaultDelay struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to FaultDelaySecifier:
+	//
 	//	*FaultDelay_FixedDelay
 	//	*FaultDelay_HeaderDelay_
 	FaultDelaySecifier isFaultDelay_FaultDelaySecifier `protobuf_oneof:"fault_delay_secifier"`
@@ -173,6 +174,7 @@ type FaultRateLimit struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to LimitType:
+	//
 	//	*FaultRateLimit_FixedLimit_
 	//	*FaultRateLimit_HeaderLimit_
 	LimitType isFaultRateLimit_LimitType `protobuf_oneof:"limit_type"`
@@ -471,17 +473,17 @@ var file_envoy_extensions_filters_common_fault_v3_fault_proto_rawDesc = []byte{
 	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x32,
 	0x2e, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x42,
 	0x11, 0x0a, 0x0a, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8,
-	0x42, 0x01, 0x42, 0xa7, 0x01, 0x0a, 0x36, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x46,
-	0x61, 0x75, 0x6c, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2f, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x42, 0x01, 0x42, 0xa7, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x36, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x2f, 0x76, 0x33, 0x3b, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3/fault.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3/fault.pb.go
index 7d88eb82063..29569d824dd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3/fault.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3/fault.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/filters/http/fault/v3/fault.proto
 
 package faultv3
@@ -34,6 +34,7 @@ type FaultAbort struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to ErrorType:
+	//
 	//	*FaultAbort_HttpStatus
 	//	*FaultAbort_GrpcStatus
 	//	*FaultAbort_HeaderAbort_
@@ -145,7 +146,7 @@ type HTTPFault struct {
 	// object.
 	Delay *v31.FaultDelay `protobuf:"bytes,1,opt,name=delay,proto3" json:"delay,omitempty"`
 	// If specified, the filter will abort requests based on the values in
-	// the object. At least ``abort`` or ``delay`` must be specified.
+	// the object. At least “abort“ or “delay“ must be specified.
 	Abort *FaultAbort `protobuf:"bytes,2,opt,name=abort,proto3" json:"abort,omitempty"`
 	// Specifies the name of the (destination) upstream cluster that the
 	// filter should match on. Fault injection will be restricted to requests
@@ -159,7 +160,7 @@ type HTTPFault struct {
 	// The filter will check the request's headers against all the specified
 	// headers in the filter config. A match will happen if all the headers in the
 	// config are present in the request with the same values (or based on
-	// presence if the ``value`` field is not in the config).
+	// presence if the “value“ field is not in the config).
 	Headers []*v32.HeaderMatcher `protobuf:"bytes,4,rep,name=headers,proto3" json:"headers,omitempty"`
 	// Faults are injected for the specified list of downstream hosts. If this
 	// setting is not set, faults are injected for all downstream nodes.
@@ -172,22 +173,24 @@ type HTTPFault struct {
 	// filter. Note that because this setting can be overridden at the route level, it's possible
 	// for the number of active faults to be greater than this value (if injected via a different
 	// route). If not specified, defaults to unlimited. This setting can be overridden via
-	// ``runtime <config_http_filters_fault_injection_runtime>`` and any faults that are not injected
-	// due to overflow will be indicated via the ``faults_overflow
-	// <config_http_filters_fault_injection_stats>`` stat.
+	// “runtime <config_http_filters_fault_injection_runtime>“ and any faults that are not injected
+	// due to overflow will be indicated via the “faults_overflow
+	// <config_http_filters_fault_injection_stats>“ stat.
 	//
 	// .. attention::
-	//   Like other :ref:`circuit breakers <arch_overview_circuit_break>` in Envoy, this is a fuzzy
-	//   limit. It's possible for the number of active faults to rise slightly above the configured
-	//   amount due to the implementation details.
+	//
+	//	Like other :ref:`circuit breakers <arch_overview_circuit_break>` in Envoy, this is a fuzzy
+	//	limit. It's possible for the number of active faults to rise slightly above the configured
+	//	amount due to the implementation details.
 	MaxActiveFaults *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_active_faults,json=maxActiveFaults,proto3" json:"max_active_faults,omitempty"`
 	// The response rate limit to be applied to the response body of the stream. When configured,
 	// the percentage can be overridden by the :ref:`fault.http.rate_limit.response_percent
 	// <config_http_filters_fault_injection_runtime>` runtime key.
 	//
 	// .. attention::
-	//  This is a per-stream limit versus a connection level limit. This means that concurrent streams
-	//  will each get an independent limit.
+	//
+	//	This is a per-stream limit versus a connection level limit. This means that concurrent streams
+	//	will each get an independent limit.
 	ResponseRateLimit *v31.FaultRateLimit `protobuf:"bytes,7,opt,name=response_rate_limit,json=responseRateLimit,proto3" json:"response_rate_limit,omitempty"`
 	// The runtime key to override the :ref:`default <config_http_filters_fault_injection_runtime>`
 	// runtime. The default is: fault.http.delay.fixed_delay_percent
@@ -529,17 +532,17 @@ var file_envoy_extensions_filters_http_fault_v3_fault_proto_rawDesc = []byte{
 	0x61, 0x74, 0x61, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, 0x2b, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e,
 	0x68, 0x74, 0x74, 0x70, 0x2e, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x54,
-	0x54, 0x50, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x42, 0xa3, 0x01, 0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x33,
-	0x42, 0x0a, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x55,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f,
-	0x68, 0x74, 0x74, 0x70, 0x2f, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70,
+	0x54, 0x50, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x42, 0xa3, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x55, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3/rbac.pb.go
index ece90bfbb5e..0dc8c2583f9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3/rbac.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3/rbac.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/filters/http/rbac/v3/rbac.proto
 
 package rbacv3
@@ -232,16 +232,16 @@ var file_envoy_extensions_filters_http_rbac_v3_rbac_proto_rawDesc = []byte{
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68,
 	0x74, 0x74, 0x70, 0x2e, 0x72, 0x62, 0x61, 0x63, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x42, 0x41, 0x43,
 	0x50, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x42, 0x9f,
-	0x01, 0x0a, 0x33, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72,
-	0x62, 0x61, 0x63, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x52, 0x62, 0x61, 0x63, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x72, 0x62, 0x61, 0x63, 0x2f, 0x76,
-	0x33, 0x3b, 0x72, 0x62, 0x61, 0x63, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x33, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72, 0x62, 0x61, 0x63, 0x2e, 0x76, 0x33, 0x42, 0x09,
+	0x52, 0x62, 0x61, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74,
+	0x70, 0x2f, 0x72, 0x62, 0x61, 0x63, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x62, 0x61, 0x63, 0x76, 0x33,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3/router.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3/router.pb.go
index 2280a4c76ed..a53a6f18c9f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3/router.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3/router.pb.go
@@ -1,13 +1,14 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/filters/http/router/v3/router.proto
 
 package routerv3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
+	_ "github.com/envoyproxy/go-control-plane/envoy/annotations"
 	v3 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
 	v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
@@ -39,6 +40,14 @@ type Router struct {
 	// useful in scenarios where other filters (auth, ratelimit, etc.) make
 	// outbound calls and have child spans rooted at the same ingress
 	// parent. Defaults to false.
+	//
+	// .. attention::
+	//
+	//	This field is deprecated by the
+	//	:ref:`spawn_upstream_span <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.spawn_upstream_span>`.
+	//	Please use that ``spawn_upstream_span`` field to control the span creation.
+	//
+	// Deprecated: Marked as deprecated in envoy/extensions/filters/http/router/v3/router.proto.
 	StartChildSpan bool `protobuf:"varint,2,opt,name=start_child_span,json=startChildSpan,proto3" json:"start_child_span,omitempty"`
 	// Configuration for HTTP upstream logs emitted by the router. Upstream logs
 	// are configured in the same way as access logs, but each log entry represents
@@ -47,10 +56,10 @@ type Router struct {
 	UpstreamLog []*v3.AccessLog `protobuf:"bytes,3,rep,name=upstream_log,json=upstreamLog,proto3" json:"upstream_log,omitempty"`
 	// Additional upstream access log options.
 	UpstreamLogOptions *Router_UpstreamAccessLogOptions `protobuf:"bytes,9,opt,name=upstream_log_options,json=upstreamLogOptions,proto3" json:"upstream_log_options,omitempty"`
-	// Do not add any additional ``x-envoy-`` headers to requests or responses. This
+	// Do not add any additional “x-envoy-“ headers to requests or responses. This
 	// only affects the :ref:`router filter generated x-envoy- headers
 	// <config_http_filters_router_headers_set>`, other Envoy filters and the HTTP
-	// connection manager may continue to set ``x-envoy-`` headers.
+	// connection manager may continue to set “x-envoy-“ headers.
 	SuppressEnvoyHeaders bool `protobuf:"varint,4,opt,name=suppress_envoy_headers,json=suppressEnvoyHeaders,proto3" json:"suppress_envoy_headers,omitempty"`
 	// Specifies a list of HTTP headers to strictly validate. Envoy will reject a
 	// request and respond with HTTP status 400 if the request contains an invalid
@@ -83,18 +92,19 @@ type Router struct {
 	// for more details.
 	SuppressGrpcRequestFailureCodeStats bool `protobuf:"varint,7,opt,name=suppress_grpc_request_failure_code_stats,json=suppressGrpcRequestFailureCodeStats,proto3" json:"suppress_grpc_request_failure_code_stats,omitempty"`
 	// .. note::
-	//   Upstream HTTP filters are currently in alpha.
 	//
-	// Optional HTTP filters for the upstream filter chain.
+	//	Upstream HTTP filters are currently in alpha.
+	//
+	// Optional HTTP filters for the upstream HTTP filter chain.
 	//
 	// These filters will be applied for all requests that pass through the router.
 	// They will also be applied to shadowed requests.
-	// Upstream filters cannot change route or cluster.
-	// Upstream filters specified on the cluster will override these filters.
+	// Upstream HTTP filters cannot change route or cluster.
+	// Upstream HTTP filters specified on the cluster will override these filters.
 	//
-	// If using upstream filters, please be aware that local errors sent by
-	// upstream filters will not trigger retries, and local errors sent by
-	// upstream filters will count as a final response if hedging is configured.
+	// If using upstream HTTP filters, please be aware that local errors sent by
+	// upstream HTTP filters will not trigger retries, and local errors sent by
+	// upstream HTTP filters will count as a final response if hedging is configured.
 	// [#extension-category: envoy.filters.http.upstream]
 	UpstreamHttpFilters []*v31.HttpFilter `protobuf:"bytes,8,rep,name=upstream_http_filters,json=upstreamHttpFilters,proto3" json:"upstream_http_filters,omitempty"`
 }
@@ -138,6 +148,7 @@ func (x *Router) GetDynamicStats() *wrappers.BoolValue {
 	return nil
 }
 
+// Deprecated: Marked as deprecated in envoy/extensions/filters/http/router/v3/router.proto.
 func (x *Router) GetStartChildSpan() bool {
 	if x != nil {
 		return x.StartChildSpan
@@ -280,93 +291,96 @@ var file_envoy_extensions_filters_http_router_v3_router_proto_rawDesc = []byte{
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e,
-	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0xd3, 0x08, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x0d, 0x64,
-	0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0c,
-	0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x28, 0x0a, 0x10,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x5f, 0x73, 0x70, 0x61, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x43, 0x68, 0x69,
-	0x6c, 0x64, 0x53, 0x70, 0x61, 0x6e, 0x12, 0x47, 0x0a, 0x0c, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c,
-	0x6f, 0x67, 0x52, 0x0b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x12,
-	0x7a, 0x0a, 0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f, 0x67, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x48, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x55,
-	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x12, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x73,
-	0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x73, 0x75, 0x70,
-	0x70, 0x72, 0x65, 0x73, 0x73, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x12, 0xc7, 0x01, 0x0a, 0x14, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x63, 0x68, 0x65,
-	0x63, 0x6b, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
-	0x42, 0x94, 0x01, 0xfa, 0x42, 0x90, 0x01, 0x92, 0x01, 0x8c, 0x01, 0x22, 0x89, 0x01, 0x72, 0x86,
-	0x01, 0x52, 0x1e, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x75, 0x70, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x2d, 0x72, 0x71, 0x2d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x2d, 0x6d,
-	0x73, 0x52, 0x26, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x75, 0x70, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x2d, 0x72, 0x71, 0x2d, 0x70, 0x65, 0x72, 0x2d, 0x74, 0x72, 0x79, 0x2d, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x2d, 0x6d, 0x73, 0x52, 0x13, 0x78, 0x2d, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2d, 0x6d, 0x61, 0x78, 0x2d, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x15,
-	0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x72, 0x65, 0x74, 0x72, 0x79, 0x2d, 0x67, 0x72,
-	0x70, 0x63, 0x2d, 0x6f, 0x6e, 0x52, 0x10, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x72,
-	0x65, 0x74, 0x72, 0x79, 0x2d, 0x6f, 0x6e, 0x52, 0x12, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x72,
-	0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f,
-	0x72, 0x71, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x18, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65,
-	0x64, 0x52, 0x71, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x55, 0x0a, 0x28, 0x73, 0x75,
-	0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x23, 0x73, 0x75,
-	0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x47, 0x72, 0x70, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74,
-	0x73, 0x12, 0x7b, 0x0a, 0x15, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77,
-	0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48,
-	0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x13, 0x75, 0x70, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x1a, 0xd3,
-	0x01, 0x0a, 0x18, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x41, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4f, 0x0a, 0x25, 0x66,
-	0x6c, 0x75, 0x73, 0x68, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f,
-	0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x66, 0x6c, 0x75, 0x73,
-	0x68, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x4f, 0x6e, 0x55, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x66, 0x0a, 0x1b,
-	0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x66, 0x6c, 0x75,
-	0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42,
-	0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x18, 0x75, 0x70, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x42, 0xa7, 0x01, 0x0a, 0x35, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x42, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e,
+	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61,
+	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f,
+	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x08, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72,
+	0x12, 0x3f, 0x0a, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x73, 0x74, 0x61, 0x74,
+	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x52, 0x0c, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x53, 0x74, 0x61, 0x74,
+	0x73, 0x12, 0x35, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x63, 0x68, 0x69, 0x6c, 0x64,
+	0x5f, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x43,
+	0x68, 0x69, 0x6c, 0x64, 0x53, 0x70, 0x61, 0x6e, 0x12, 0x47, 0x0a, 0x0c, 0x75, 0x70, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x4c, 0x6f, 0x67, 0x52, 0x0b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f,
+	0x67, 0x12, 0x7a, 0x0a, 0x14, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f,
+	0x67, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x48, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72,
+	0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c,
+	0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x12, 0x75, 0x70, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a,
+	0x16, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x73,
+	0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x12, 0xc7, 0x01, 0x0a, 0x14, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x63,
+	0x68, 0x65, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x09, 0x42, 0x94, 0x01, 0xfa, 0x42, 0x90, 0x01, 0x92, 0x01, 0x8c, 0x01, 0x22, 0x89, 0x01,
+	0x72, 0x86, 0x01, 0x52, 0x1e, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x75, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x2d, 0x72, 0x71, 0x2d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x2d, 0x6d, 0x73, 0x52, 0x26, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x75, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x2d, 0x72, 0x71, 0x2d, 0x70, 0x65, 0x72, 0x2d, 0x74, 0x72, 0x79,
+	0x2d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x2d, 0x6d, 0x73, 0x52, 0x13, 0x78, 0x2d, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x6d, 0x61, 0x78, 0x2d, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73,
+	0x52, 0x15, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2d, 0x72, 0x65, 0x74, 0x72, 0x79, 0x2d,
+	0x67, 0x72, 0x70, 0x63, 0x2d, 0x6f, 0x6e, 0x52, 0x10, 0x78, 0x2d, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2d, 0x72, 0x65, 0x74, 0x72, 0x79, 0x2d, 0x6f, 0x6e, 0x52, 0x12, 0x73, 0x74, 0x72, 0x69, 0x63,
+	0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x3d, 0x0a,
+	0x1b, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65,
+	0x64, 0x5f, 0x72, 0x71, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x18, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74, 0x45, 0x78, 0x70, 0x65, 0x63,
+	0x74, 0x65, 0x64, 0x52, 0x71, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x55, 0x0a, 0x28,
+	0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x72, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x63, 0x6f,
+	0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x23,
+	0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x47, 0x72, 0x70, 0x63, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x73, 0x12, 0x7b, 0x0a, 0x15, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
+	0x68, 0x74, 0x74, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x08, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0x2e, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x13, 0x75, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x1a, 0xd3, 0x01, 0x0a, 0x18, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x41, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4f, 0x0a,
+	0x25, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
+	0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x66, 0x6c,
+	0x75, 0x73, 0x68, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x4f, 0x6e,
+	0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x66,
+	0x0a, 0x1b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x66,
+	0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c,
+	0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x18, 0x75, 0x70,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x6f, 0x67, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e,
+	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76,
+	0x32, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x42, 0xa7, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x35, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
index f8a0f1b2665..91e76c5f08c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
 
 package http_connection_managerv3
@@ -351,6 +351,7 @@ type HttpConnectionManager struct {
 	// more information.
 	StatPrefix string `protobuf:"bytes,2,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 	// Types that are assignable to RouteSpecifier:
+	//
 	//	*HttpConnectionManager_Rds
 	//	*HttpConnectionManager_RouteConfig
 	//	*HttpConnectionManager_ScopedRoutes
@@ -382,7 +383,7 @@ type HttpConnectionManager struct {
 	// [#not-implemented-hide:]
 	Http3ProtocolOptions *v3.Http3ProtocolOptions `protobuf:"bytes,44,opt,name=http3_protocol_options,json=http3ProtocolOptions,proto3" json:"http3_protocol_options,omitempty"`
 	// An optional override that the connection manager will write to the server
-	// header in responses. If not set, the default is ``envoy``.
+	// header in responses. If not set, the default is “envoy“.
 	ServerName string `protobuf:"bytes,10,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"`
 	// Defines the action to be applied to the Server header on the response path.
 	// By default, Envoy will overwrite the header with the value specified in
@@ -477,14 +478,16 @@ type HttpConnectionManager struct {
 	// The default timeout is 1000 ms if this option is not specified.
 	//
 	// .. NOTE::
-	//    To be useful in avoiding the race condition described above, this timeout must be set
-	//    to *at least* <max round trip time expected between clients and Envoy>+<100ms to account for
-	//    a reasonable "worst" case processing time for a full iteration of Envoy's event loop>.
+	//
+	//	To be useful in avoiding the race condition described above, this timeout must be set
+	//	to *at least* <max round trip time expected between clients and Envoy>+<100ms to account for
+	//	a reasonable "worst" case processing time for a full iteration of Envoy's event loop>.
 	//
 	// .. WARNING::
-	//    A value of 0 will completely disable delayed close processing. When disabled, the downstream
-	//    connection's socket will be closed immediately after the write flush is completed or will
-	//    never close if the write flush does not complete.
+	//
+	//	A value of 0 will completely disable delayed close processing. When disabled, the downstream
+	//	connection's socket will be closed immediately after the write flush is completed or will
+	//	never close if the write flush does not complete.
 	DelayedCloseTimeout *duration.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"`
 	// Configuration for :ref:`HTTP access logs <arch_overview_access_logs>`
 	// emitted by the connection manager.
@@ -497,7 +500,7 @@ type HttpConnectionManager struct {
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.access_log_flush_interval>`
 	// are specified, the former (deprecated field) is ignored.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto.
 	AccessLogFlushInterval *duration.Duration `protobuf:"bytes,54,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"`
 	// .. attention::
 	// This field is deprecated in favor of
@@ -507,7 +510,7 @@ type HttpConnectionManager struct {
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.flush_access_log_on_new_request>`
 	// are specified, the former (deprecated field) is ignored.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto.
 	FlushAccessLogOnNewRequest bool `protobuf:"varint,55,opt,name=flush_access_log_on_new_request,json=flushAccessLogOnNewRequest,proto3" json:"flush_access_log_on_new_request,omitempty"`
 	// Additional access log options for HTTP connection manager.
 	AccessLogOptions *HttpConnectionManager_HcmAccessLogOptions `protobuf:"bytes,56,opt,name=access_log_options,json=accessLogOptions,proto3" json:"access_log_options,omitempty"`
@@ -536,10 +539,11 @@ type HttpConnectionManager struct {
 	// fallback to using the remote address.
 	//
 	// .. WARNING::
-	//    Extensions cannot be used in conjunction with :ref:`use_remote_address
-	//    <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address>`
-	//    nor :ref:`xff_num_trusted_hops
-	//    <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.xff_num_trusted_hops>`.
+	//
+	//	Extensions cannot be used in conjunction with :ref:`use_remote_address
+	//	<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address>`
+	//	nor :ref:`xff_num_trusted_hops
+	//	<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.xff_num_trusted_hops>`.
 	//
 	// [#extension-category: envoy.http.original_ip_detection]
 	OriginalIpDetectionExtensions []*v3.TypedExtensionConfig `protobuf:"bytes,46,rep,name=original_ip_detection_extensions,json=originalIpDetectionExtensions,proto3" json:"original_ip_detection_extensions,omitempty"`
@@ -562,7 +566,7 @@ type HttpConnectionManager struct {
 	// has mutated the request headers. While :ref:`use_remote_address
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address>`
 	// will also suppress XFF addition, it has consequences for logging and other
-	// Envoy uses of the remote address, so ``skip_xff_append`` should be used
+	// Envoy uses of the remote address, so “skip_xff_append“ should be used
 	// when only an elision of XFF addition is intended.
 	SkipXffAppend bool `protobuf:"varint,21,opt,name=skip_xff_append,json=skipXffAppend,proto3" json:"skip_xff_append,omitempty"`
 	// Via header value to append to request and response headers. If this is
@@ -589,8 +593,8 @@ type HttpConnectionManager struct {
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.forward_client_cert_details>`
 	// is APPEND_FORWARD or SANITIZE_SET and the client connection is mTLS. It specifies the fields in
 	// the client certificate to be forwarded. Note that in the
-	// :ref:`config_http_conn_man_headers_x-forwarded-client-cert` header, ``Hash`` is always set, and
-	// ``By`` is always set when the client certificate presents the URI type Subject Alternative Name
+	// :ref:`config_http_conn_man_headers_x-forwarded-client-cert` header, “Hash“ is always set, and
+	// “By“ is always set when the client certificate presents the URI type Subject Alternative Name
 	// value.
 	SetCurrentClientCertDetails *HttpConnectionManager_SetCurrentClientCertDetails `protobuf:"bytes,17,opt,name=set_current_client_cert_details,json=setCurrentClientCertDetails,proto3" json:"set_current_client_cert_details,omitempty"`
 	// If proxy_100_continue is true, Envoy will proxy incoming "Expect:
@@ -602,7 +606,7 @@ type HttpConnectionManager struct {
 	// :ref:`use_remote_address
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address>`
 	// is true and represent_ipv4_remote_address_as_ipv4_mapped_ipv6 is true and the remote address is
-	// an IPv4 address, the address will be mapped to IPv6 before it is appended to ``x-forwarded-for``.
+	// an IPv4 address, the address will be mapped to IPv6 before it is appended to “x-forwarded-for“.
 	// This is useful for testing compatibility of upstream services that parse the header value. For
 	// example, 50.0.0.1 is represented as ::FFFF:50.0.0.1. See `IPv4-Mapped IPv6 Addresses
 	// <https://tools.ietf.org/html/rfc4291#section-2.5.5.2>`_ for details. This will also affect the
@@ -614,7 +618,7 @@ type HttpConnectionManager struct {
 	RepresentIpv4RemoteAddressAsIpv4MappedIpv6 bool                                   `protobuf:"varint,20,opt,name=represent_ipv4_remote_address_as_ipv4_mapped_ipv6,json=representIpv4RemoteAddressAsIpv4MappedIpv6,proto3" json:"represent_ipv4_remote_address_as_ipv4_mapped_ipv6,omitempty"`
 	UpgradeConfigs                             []*HttpConnectionManager_UpgradeConfig `protobuf:"bytes,23,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"`
 	// Should paths be normalized according to RFC 3986 before any processing of
-	// requests by HTTP filters or routing? This affects the upstream ``:path`` header
+	// requests by HTTP filters or routing? This affects the upstream “:path“ header
 	// as well. For paths that fail this check, Envoy will respond with 400 to
 	// paths that are malformed. This defaults to false currently but will default
 	// true in the future. When not specified, this value may be overridden by the
@@ -629,9 +633,9 @@ type HttpConnectionManager struct {
 	// is present.]
 	NormalizePath *wrappers.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"`
 	// Determines if adjacent slashes in the path are merged into one before any processing of
-	// requests by HTTP filters or routing. This affects the upstream ``:path`` header as well. Without
-	// setting this option, incoming requests with path ``//dir///file`` will not match against route
-	// with ``prefix`` match set to ``/dir``. Defaults to ``false``. Note that slash merging is not part of
+	// requests by HTTP filters or routing. This affects the upstream “:path“ header as well. Without
+	// setting this option, incoming requests with path “//dir///file“ will not match against route
+	// with “prefix“ match set to “/dir“. Defaults to “false“. Note that slash merging is not part of
 	// `HTTP spec <https://tools.ietf.org/html/rfc3986>`_ and is provided for convenience.
 	// [#comment:TODO: This field is ignored when the
 	// :ref:`header validation configuration <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.typed_header_validation_config>`
@@ -655,11 +659,12 @@ type HttpConnectionManager struct {
 	// the following configuration can be used:
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension
 	//
-	//   typed_config:
-	//     "@type": type.googleapis.com/envoy.extensions.request_id.uuid.v3.UuidRequestIdConfig
-	//     pack_trace_reason: false
+	//	:type-name: envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension
+	//
+	//	typed_config:
+	//	  "@type": type.googleapis.com/envoy.extensions.request_id.uuid.v3.UuidRequestIdConfig
+	//	  pack_trace_reason: false
 	//
 	// [#extension-category: envoy.request_id]
 	RequestIdExtension *RequestIDExtension `protobuf:"bytes,36,opt,name=request_id_extension,json=requestIdExtension,proto3" json:"request_id_extension,omitempty"`
@@ -672,12 +677,13 @@ type HttpConnectionManager struct {
 	// local port. This affects the upstream host header unless the method is
 	// CONNECT in which case if no filter adds a port the original port will be restored before headers are
 	// sent upstream.
-	// Without setting this option, incoming requests with host ``example:443`` will not match against
-	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to ``example``. Defaults to ``false``. Note that port removal is not part
+	// Without setting this option, incoming requests with host “example:443“ will not match against
+	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to “example“. Defaults to “false“. Note that port removal is not part
 	// of `HTTP spec <https://tools.ietf.org/html/rfc3986>`_ and is provided for convenience.
-	// Only one of ``strip_matching_host_port`` or ``strip_any_host_port`` can be set.
+	// Only one of “strip_matching_host_port“ or “strip_any_host_port“ can be set.
 	StripMatchingHostPort bool `protobuf:"varint,39,opt,name=strip_matching_host_port,json=stripMatchingHostPort,proto3" json:"strip_matching_host_port,omitempty"`
 	// Types that are assignable to StripPortMode:
+	//
 	//	*HttpConnectionManager_StripAnyHostPort
 	StripPortMode isHttpConnectionManager_StripPortMode `protobuf_oneof:"strip_port_mode"`
 	// Governs Envoy's behavior when receiving invalid HTTP from downstream.
@@ -694,13 +700,13 @@ type HttpConnectionManager struct {
 	// <envoy_v3_api_field_config.core.v3.Http1ProtocolOptions.override_stream_error_on_invalid_http_message>` or the new HTTP/2 option
 	// :ref:`override_stream_error_on_invalid_http_message
 	// <envoy_v3_api_field_config.core.v3.Http2ProtocolOptions.override_stream_error_on_invalid_http_message>`
-	// ``not`` the deprecated but similarly named :ref:`stream_error_on_invalid_http_messaging
+	// “not“ the deprecated but similarly named :ref:`stream_error_on_invalid_http_messaging
 	// <envoy_v3_api_field_config.core.v3.Http2ProtocolOptions.stream_error_on_invalid_http_messaging>`
 	StreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,40,opt,name=stream_error_on_invalid_http_message,json=streamErrorOnInvalidHttpMessage,proto3" json:"stream_error_on_invalid_http_message,omitempty"`
 	// [#not-implemented-hide:] Path normalization configuration. This includes
 	// configurations for transformations (e.g. RFC 3986 normalization or merge
 	// adjacent slashes) and the policy to apply them. The policy determines
-	// whether transformations affect the forwarded ``:path`` header. RFC 3986 path
+	// whether transformations affect the forwarded “:path“ header. RFC 3986 path
 	// normalization is enabled by default and the default policy is that the
 	// normalized header will be forwarded. See :ref:`PathNormalizationOptions
 	// <envoy_v3_api_msg_extensions.filters.network.http_connection_manager.v3.PathNormalizationOptions>`
@@ -709,11 +715,11 @@ type HttpConnectionManager struct {
 	// Determines if trailing dot of the host should be removed from host/authority header before any
 	// processing of request by HTTP filters or routing.
 	// This affects the upstream host header.
-	// Without setting this option, incoming requests with host ``example.com.`` will not match against
-	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to ``example.com``. Defaults to ``false``.
+	// Without setting this option, incoming requests with host “example.com.“ will not match against
+	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to “example.com“. Defaults to “false“.
 	// When the incoming request contains a host/authority header that includes a port number,
 	// setting this option will strip a trailing dot, if present, from the host section,
-	// leaving the port as is (e.g. host value ``example.com.:443`` will be updated to ``example.com:443``).
+	// leaving the port as is (e.g. host value “example.com.:443“ will be updated to “example.com:443“).
 	StripTrailingHostDot bool `protobuf:"varint,47,opt,name=strip_trailing_host_dot,json=stripTrailingHostDot,proto3" json:"strip_trailing_host_dot,omitempty"`
 	// Proxy-Status HTTP response header configuration.
 	// If this config is set, the Proxy-Status HTTP response header field is
@@ -723,8 +729,8 @@ type HttpConnectionManager struct {
 	// UHV is an extensible mechanism for checking validity of HTTP requests as well as providing
 	// normalization for request attributes, such as URI path.
 	// If the typed_header_validation_config is present it overrides the following options:
-	// ``normalize_path``, ``merge_slashes``, ``path_with_escaped_slashes_action``
-	// ``http_protocol_options.allow_chunked_length``, ``common_http_protocol_options.headers_with_underscores_action``.
+	// “normalize_path“, “merge_slashes“, “path_with_escaped_slashes_action“
+	// “http_protocol_options.allow_chunked_length“, “common_http_protocol_options.headers_with_underscores_action“.
 	//
 	// The default UHV checks the following:
 	//
@@ -734,19 +740,20 @@ type HttpConnectionManager struct {
 	// #. Syntax of HTTP/2 pseudo headers
 	// #. HTTP/3 header map validity according to `RFC 9114 section 4.3 <https://www.rfc-editor.org/rfc/rfc9114.html>`_
 	// #. Syntax of HTTP/3 pseudo headers
-	// #. Syntax of ``Content-Length`` and ``Transfer-Encoding``
-	// #. Validation of HTTP/1 requests with both ``Content-Length`` and ``Transfer-Encoding`` headers
+	// #. Syntax of “Content-Length“ and “Transfer-Encoding“
+	// #. Validation of HTTP/1 requests with both “Content-Length“ and “Transfer-Encoding“ headers
 	// #. Normalization of the URI path according to `Normalization and Comparison <https://datatracker.ietf.org/doc/html/rfc3986#section-6>`_
-	//    without `case normalization <https://datatracker.ietf.org/doc/html/rfc3986#section-6.2.2.1>`_
+	//
+	//	without `case normalization <https://datatracker.ietf.org/doc/html/rfc3986#section-6.2.2.1>`_
 	//
 	// [#not-implemented-hide:]
 	// [#extension-category: envoy.http.header_validators]
 	TypedHeaderValidationConfig *v3.TypedExtensionConfig `protobuf:"bytes,50,opt,name=typed_header_validation_config,json=typedHeaderValidationConfig,proto3" json:"typed_header_validation_config,omitempty"`
-	// Append the `x-forwarded-port` header with the port value client used to connect to Envoy. It
-	// will be ignored if the `x-forwarded-port` header has been set by any trusted proxy in front of Envoy.
+	// Append the “x-forwarded-port“ header with the port value client used to connect to Envoy. It
+	// will be ignored if the “x-forwarded-port“ header has been set by any trusted proxy in front of Envoy.
 	AppendXForwardedPort bool `protobuf:"varint,51,opt,name=append_x_forwarded_port,json=appendXForwardedPort,proto3" json:"append_x_forwarded_port,omitempty"`
-	// Whether the HCM will add ProxyProtocolFilterState to the Connection lifetime filter state. Defaults to `true`.
-	// This should be set to `false` in cases where Envoy's view of the downstream address may not correspond to the
+	// Whether the HCM will add ProxyProtocolFilterState to the Connection lifetime filter state. Defaults to “true“.
+	// This should be set to “false“ in cases where Envoy's view of the downstream address may not correspond to the
 	// actual client address, for example, if there's another proxy in front of the Envoy.
 	AddProxyProtocolConnectionState *wrappers.BoolValue `protobuf:"bytes,53,opt,name=add_proxy_protocol_connection_state,json=addProxyProtocolConnectionState,proto3" json:"add_proxy_protocol_connection_state,omitempty"`
 }
@@ -944,7 +951,7 @@ func (x *HttpConnectionManager) GetAccessLog() []*v31.AccessLog {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto.
 func (x *HttpConnectionManager) GetAccessLogFlushInterval() *duration.Duration {
 	if x != nil {
 		return x.AccessLogFlushInterval
@@ -952,7 +959,7 @@ func (x *HttpConnectionManager) GetAccessLogFlushInterval() *duration.Duration {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto.
 func (x *HttpConnectionManager) GetFlushAccessLogOnNewRequest() bool {
 	if x != nil {
 		return x.FlushAccessLogOnNewRequest
@@ -1213,10 +1220,10 @@ type HttpConnectionManager_StripAnyHostPort struct {
 	// of request by HTTP filters or routing.
 	// This affects the upstream host header unless the method is CONNECT in
 	// which case if no filter adds a port the original port will be restored before headers are sent upstream.
-	// Without setting this option, incoming requests with host ``example:443`` will not match against
-	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to ``example``. Defaults to ``false``. Note that port removal is not part
+	// Without setting this option, incoming requests with host “example:443“ will not match against
+	// route with :ref:`domains<envoy_v3_api_field_config.route.v3.VirtualHost.domains>` match set to “example“. Defaults to “false“. Note that port removal is not part
 	// of `HTTP spec <https://tools.ietf.org/html/rfc3986>`_ and is provided for convenience.
-	// Only one of ``strip_matching_host_port`` or ``strip_any_host_port`` can be set.
+	// Only one of “strip_matching_host_port“ or “strip_any_host_port“ can be set.
 	StripAnyHostPort bool `protobuf:"varint,42,opt,name=strip_any_host_port,json=stripAnyHostPort,proto3,oneof"`
 }
 
@@ -1234,41 +1241,42 @@ type LocalReplyConfig struct {
 	// The configuration to form response body from the :ref:`command operators <config_access_log_command_operators>`
 	// and to specify response content type as one of: plain/text or application/json.
 	//
-	// Example one: "plain/text" ``body_format``.
+	// Example one: "plain/text" “body_format“.
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
+	//
+	//	text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
 	//
 	// The following response body in "plain/text" format will be generated for a request with
 	// local reply body of "upstream connection error", response_code=503 and path=/foo.
 	//
 	// .. code-block:: text
 	//
-	//   upstream connect error:503:path=/foo
+	//	upstream connect error:503:path=/foo
 	//
-	// Example two: "application/json" ``body_format``.
+	// Example two: "application/json" “body_format“.
 	//
 	// .. validated-code-block:: yaml
-	//   :type-name: envoy.config.core.v3.SubstitutionFormatString
 	//
-	//   json_format:
-	//     status: "%RESPONSE_CODE%"
-	//     message: "%LOCAL_REPLY_BODY%"
-	//     path: "%REQ(:path)%"
+	//	:type-name: envoy.config.core.v3.SubstitutionFormatString
+	//
+	//	json_format:
+	//	  status: "%RESPONSE_CODE%"
+	//	  message: "%LOCAL_REPLY_BODY%"
+	//	  path: "%REQ(:path)%"
 	//
 	// The following response body in "application/json" format would be generated for a request with
 	// local reply body of "upstream connection error", response_code=503 and path=/foo.
 	//
 	// .. code-block:: json
 	//
-	//  {
-	//    "status": 503,
-	//    "message": "upstream connection error",
-	//    "path": "/foo"
-	//  }
-	//
+	//	{
+	//	  "status": 503,
+	//	  "message": "upstream connection error",
+	//	  "path": "/foo"
+	//	}
 	BodyFormat *v3.SubstitutionFormatString `protobuf:"bytes,2,opt,name=body_format,json=bodyFormat,proto3" json:"body_format,omitempty"`
 }
 
@@ -1329,10 +1337,10 @@ type ResponseMapper struct {
 	Filter *v31.AccessLogFilter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
 	// The new response status code if specified.
 	StatusCode *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
-	// The new local reply body text if specified. It will be used in the ``%LOCAL_REPLY_BODY%``
-	// command operator in the ``body_format``.
+	// The new local reply body text if specified. It will be used in the “%LOCAL_REPLY_BODY%“
+	// command operator in the “body_format“.
 	Body *v3.DataSource `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"`
-	// A per mapper ``body_format`` to override the :ref:`body_format <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.LocalReplyConfig.body_format>`.
+	// A per mapper “body_format“ to override the :ref:`body_format <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.LocalReplyConfig.body_format>`.
 	// It will be used when this mapper is matched.
 	BodyFormatOverride *v3.SubstitutionFormatString `protobuf:"bytes,4,opt,name=body_format_override,json=bodyFormatOverride,proto3" json:"body_format_override,omitempty"`
 	// HTTP headers to add to a local reply. This allows the response mapper to append, to add
@@ -1530,6 +1538,7 @@ type ScopedRoutes struct {
 	// ScopedRouteConfiguration messages.
 	RdsConfigSource *v3.ConfigSource `protobuf:"bytes,3,opt,name=rds_config_source,json=rdsConfigSource,proto3" json:"rds_config_source,omitempty"`
 	// Types that are assignable to ConfigSpecifier:
+	//
 	//	*ScopedRoutes_ScopedRouteConfigurationsList
 	//	*ScopedRoutes_ScopedRds
 	ConfigSpecifier isScopedRoutes_ConfigSpecifier `protobuf_oneof:"config_specifier"`
@@ -1693,7 +1702,7 @@ func (x *ScopedRds) GetSrdsResourcesLocator() string {
 	return ""
 }
 
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 type HttpFilter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1702,14 +1711,21 @@ type HttpFilter struct {
 	// The name of the filter configuration. It also serves as a resource name in ExtensionConfigDS.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to ConfigType:
+	//
 	//	*HttpFilter_TypedConfig
 	//	*HttpFilter_ConfigDiscovery
 	ConfigType isHttpFilter_ConfigType `protobuf_oneof:"config_type"`
 	// If true, clients that do not support this filter may ignore the
 	// filter but otherwise accept the config.
 	// Otherwise, clients that do not support this filter must reject the config.
-	// This is also same with typed per filter config.
 	IsOptional bool `protobuf:"varint,6,opt,name=is_optional,json=isOptional,proto3" json:"is_optional,omitempty"`
+	// If true, the filter is disabled by default and must be explicitly enabled by setting
+	// per filter configuration in the route configuration.
+	// See :ref:`route based filter chain <arch_overview_http_filters_route_based_filter_chain>`
+	// for more details.
+	//
+	// Terminal filters (e.g. “envoy.filters.http.router“) cannot be marked as disabled.
+	Disabled bool `protobuf:"varint,7,opt,name=disabled,proto3" json:"disabled,omitempty"`
 }
 
 func (x *HttpFilter) Reset() {
@@ -1779,6 +1795,13 @@ func (x *HttpFilter) GetIsOptional() bool {
 	return false
 }
 
+func (x *HttpFilter) GetDisabled() bool {
+	if x != nil {
+		return x.Disabled
+	}
+	return false
+}
+
 type isHttpFilter_ConfigType interface {
 	isHttpFilter_ConfigType()
 }
@@ -1910,7 +1933,7 @@ func (x *EnvoyMobileHttpConnectionManager) GetConfig() *HttpConnectionManager {
 	return nil
 }
 
-// [#next-free-field: 10]
+// [#next-free-field: 11]
 type HttpConnectionManager_Tracing struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1951,13 +1974,34 @@ type HttpConnectionManager_Tracing struct {
 	// If not specified, no tracing will be performed.
 	//
 	// .. attention::
-	//   Please be aware that ``envoy.tracers.opencensus`` provider can only be configured once
-	//   in Envoy lifetime.
-	//   Any attempts to reconfigure it or to use different configurations for different HCM filters
-	//   will be rejected.
-	//   Such a constraint is inherent to OpenCensus itself. It cannot be overcome without changes
-	//   on OpenCensus side.
+	//
+	//	Please be aware that ``envoy.tracers.opencensus`` provider can only be configured once
+	//	in Envoy lifetime.
+	//	Any attempts to reconfigure it or to use different configurations for different HCM filters
+	//	will be rejected.
+	//	Such a constraint is inherent to OpenCensus itself. It cannot be overcome without changes
+	//	on OpenCensus side.
 	Provider *v35.Tracing_Http `protobuf:"bytes,9,opt,name=provider,proto3" json:"provider,omitempty"`
+	// Create separate tracing span for each upstream request if true. And if this flag is set to true,
+	// the tracing provider will assume that Envoy will be independent hop in the trace chain and may
+	// set span type to client or server based on this flag.
+	// This will deprecate the
+	// :ref:`start_child_span <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>`
+	// in the router.
+	//
+	// Users should set appropriate value based on their tracing provider and actual scenario:
+	//
+	//   - If Envoy is used as sidecar and users want to make the sidecar and its application as only one
+	//     hop in the trace chain, this flag should be set to false. And please also make sure the
+	//     :ref:`start_child_span <envoy_v3_api_field_extensions.filters.http.router.v3.Router.start_child_span>`
+	//     in the router is not set to true.
+	//   - If Envoy is used as gateway or independent proxy, or users want to make the sidecar and its
+	//     application as different hops in the trace chain, this flag should be set to true.
+	//   - If tracing provider that has explicit requirements on span creation (like SkyWalking),
+	//     this flag should be set to true.
+	//
+	// The default value is false for now for backward compatibility.
+	SpawnUpstreamSpan *wrappers.BoolValue `protobuf:"bytes,10,opt,name=spawn_upstream_span,json=spawnUpstreamSpan,proto3" json:"spawn_upstream_span,omitempty"`
 }
 
 func (x *HttpConnectionManager_Tracing) Reset() {
@@ -2041,6 +2085,13 @@ func (x *HttpConnectionManager_Tracing) GetProvider() *v35.Tracing_Http {
 	return nil
 }
 
+func (x *HttpConnectionManager_Tracing) GetSpawnUpstreamSpan() *wrappers.BoolValue {
+	if x != nil {
+		return x.SpawnUpstreamSpan
+	}
+	return nil
+}
+
 type HttpConnectionManager_InternalAddressConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2196,13 +2247,14 @@ func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetUri() bool {
 //
 // .. warning::
 //
-//    The current implementation of upgrade headers does not handle
-//    multi-valued upgrade headers. Support for multi-valued headers may be
-//    added in the future if needed.
+//	The current implementation of upgrade headers does not handle
+//	multi-valued upgrade headers. Support for multi-valued headers may be
+//	added in the future if needed.
 //
 // .. warning::
-//    The current implementation of upgrade headers does not work with HTTP/2
-//    upstreams.
+//
+//	The current implementation of upgrade headers does not work with HTTP/2
+//	upstreams.
 type HttpConnectionManager_UpgradeConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2282,17 +2334,17 @@ func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrappers.BoolValue {
 // path will be visible internally if a transformation is enabled. Any path rewrites that the
 // router performs (e.g. :ref:`regex_rewrite
 // <envoy_v3_api_field_config.route.v3.RouteAction.regex_rewrite>` or :ref:`prefix_rewrite
-// <envoy_v3_api_field_config.route.v3.RouteAction.prefix_rewrite>`) will apply to the ``:path`` header
+// <envoy_v3_api_field_config.route.v3.RouteAction.prefix_rewrite>`) will apply to the “:path“ header
 // destined for the upstream.
 //
-// Note: access logging and tracing will show the original ``:path`` header.
+// Note: access logging and tracing will show the original “:path“ header.
 type HttpConnectionManager_PathNormalizationOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	// [#not-implemented-hide:] Normalization applies internally before any processing of requests by
-	// HTTP filters, routing, and matching *and* will affect the forwarded ``:path`` header. Defaults
+	// HTTP filters, routing, and matching *and* will affect the forwarded “:path“ header. Defaults
 	// to :ref:`NormalizePathRFC3986
 	// <envoy_v3_api_msg_type.http.v3.PathTransformation.Operation.NormalizePathRFC3986>`. When not
 	// specified, this value may be overridden by the runtime variable
@@ -2302,7 +2354,7 @@ type HttpConnectionManager_PathNormalizationOptions struct {
 	ForwardingTransformation *v36.PathTransformation `protobuf:"bytes,1,opt,name=forwarding_transformation,json=forwardingTransformation,proto3" json:"forwarding_transformation,omitempty"`
 	// [#not-implemented-hide:] Normalization only applies internally before any processing of
 	// requests by HTTP filters, routing, and matching. These will be applied after full
-	// transformation is applied. The ``:path`` header before this transformation will be restored in
+	// transformation is applied. The “:path“ header before this transformation will be restored in
 	// the router filter and sent upstream unless it was mutated by a filter. Defaults to no
 	// transformations.
 	// Multiple actions can be applied in the same Transformation, forming a sequential
@@ -2367,7 +2419,8 @@ func (x *HttpConnectionManager_PathNormalizationOptions) GetHttpFilterTransforma
 //
 // The Proxy-Status header is a string of the form:
 //
-//   "<server_name>; error=<error_type>; details=<details>"
+//	"<server_name>; error=<error_type>; details=<details>"
+//
 // [#next-free-field: 7]
 type HttpConnectionManager_ProxyStatusConfig struct {
 	state         protoimpl.MessageState
@@ -2375,28 +2428,29 @@ type HttpConnectionManager_ProxyStatusConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// If true, the details field of the Proxy-Status header is not populated with stream_info.response_code_details.
-	// This value defaults to ``false``, i.e. the ``details`` field is populated by default.
+	// This value defaults to “false“, i.e. the “details“ field is populated by default.
 	RemoveDetails bool `protobuf:"varint,1,opt,name=remove_details,json=removeDetails,proto3" json:"remove_details,omitempty"`
 	// If true, the details field of the Proxy-Status header will not contain
-	// connection termination details. This value defaults to ``false``, i.e. the
-	// ``details`` field will contain connection termination details by default.
+	// connection termination details. This value defaults to “false“, i.e. the
+	// “details“ field will contain connection termination details by default.
 	RemoveConnectionTerminationDetails bool `protobuf:"varint,2,opt,name=remove_connection_termination_details,json=removeConnectionTerminationDetails,proto3" json:"remove_connection_termination_details,omitempty"`
 	// If true, the details field of the Proxy-Status header will not contain an
-	// enumeration of the Envoy ResponseFlags. This value defaults to ``false``,
-	// i.e. the ``details`` field will contain a list of ResponseFlags by default.
+	// enumeration of the Envoy ResponseFlags. This value defaults to “false“,
+	// i.e. the “details“ field will contain a list of ResponseFlags by default.
 	RemoveResponseFlags bool `protobuf:"varint,3,opt,name=remove_response_flags,json=removeResponseFlags,proto3" json:"remove_response_flags,omitempty"`
 	// If true, overwrites the existing Status header with the response code
 	// recommended by the Proxy-Status spec.
-	// This value defaults to ``false``, i.e. the HTTP response code is not
+	// This value defaults to “false“, i.e. the HTTP response code is not
 	// overwritten.
 	SetRecommendedResponseCode bool `protobuf:"varint,4,opt,name=set_recommended_response_code,json=setRecommendedResponseCode,proto3" json:"set_recommended_response_code,omitempty"`
 	// The name of the proxy as it appears at the start of the Proxy-Status
 	// header.
 	//
-	// If neither of these values are set, this value defaults to ``server_name``,
+	// If neither of these values are set, this value defaults to “server_name“,
 	// which itself defaults to "envoy".
 	//
 	// Types that are assignable to ProxyName:
+	//
 	//	*HttpConnectionManager_ProxyStatusConfig_UseNodeId
 	//	*HttpConnectionManager_ProxyStatusConfig_LiteralProxyName
 	ProxyName isHttpConnectionManager_ProxyStatusConfig_ProxyName `protobuf_oneof:"proxy_name"`
@@ -2488,13 +2542,13 @@ type isHttpConnectionManager_ProxyStatusConfig_ProxyName interface {
 }
 
 type HttpConnectionManager_ProxyStatusConfig_UseNodeId struct {
-	// If ``use_node_id`` is set, Proxy-Status headers will use the Envoy's node
+	// If “use_node_id“ is set, Proxy-Status headers will use the Envoy's node
 	// ID as the name of the proxy.
 	UseNodeId bool `protobuf:"varint,5,opt,name=use_node_id,json=useNodeId,proto3,oneof"`
 }
 
 type HttpConnectionManager_ProxyStatusConfig_LiteralProxyName struct {
-	// If ``literal_proxy_name`` is set, Proxy-Status headers will use this
+	// If “literal_proxy_name“ is set, Proxy-Status headers will use this
 	// value as the name of the proxy.
 	LiteralProxyName string `protobuf:"bytes,6,opt,name=literal_proxy_name,json=literalProxyName,proto3,oneof"`
 }
@@ -2514,7 +2568,7 @@ type HttpConnectionManager_HcmAccessLogOptions struct {
 	// on stream close, when the HTTP request is complete. If this field is set, the HCM will flush access
 	// logs periodically at the specified interval. This is especially useful in the case of long-lived
 	// requests, such as CONNECT and Websockets. Final access logs can be detected via the
-	// `requestComplete()` method of `StreamInfo` in access log filters, or thru the `%DURATION%` substitution
+	// “requestComplete()“ method of “StreamInfo“ in access log filters, or through the “%DURATION%“ substitution
 	// string.
 	// The interval must be at least 1 millisecond.
 	AccessLogFlushInterval *duration.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"`
@@ -2648,6 +2702,7 @@ type ScopedRoutes_ScopeKeyBuilder_FragmentBuilder struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Type:
+	//
 	//	*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_
 	Type isScopedRoutes_ScopeKeyBuilder_FragmentBuilder_Type `protobuf_oneof:"type"`
 }
@@ -2715,18 +2770,18 @@ func (*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_) isSco
 //
 // .. code::
 //
-//              <0> <1>   <-- index
-//    X-Header: a=b;c=d
-//    |         || |
-//    |         || \----> <element_separator>
-//    |         ||
-//    |         |\----> <element.separator>
-//    |         |
-//    |         \----> <element.key>
-//    |
-//    \----> <name>
+//	          <0> <1>   <-- index
+//	X-Header: a=b;c=d
+//	|         || |
+//	|         || \----> <element_separator>
+//	|         ||
+//	|         |\----> <element.separator>
+//	|         |
+//	|         \----> <element.key>
+//	|
+//	\----> <name>
 //
-//    Each 'a=b' key-value pair constitutes an 'element' of the header field.
+//	Each 'a=b' key-value pair constitutes an 'element' of the header field.
 type ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2736,7 +2791,7 @@ type ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor struct {
 	//
 	// .. note::
 	//
-	//   If the header appears multiple times only the first value is used.
+	//	If the header appears multiple times only the first value is used.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The element separator (e.g., ';' separates 'a;b;c;d').
 	// Default: empty string. This causes the entirety of the header field to be extracted.
@@ -2744,6 +2799,7 @@ type ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor struct {
 	// must be set to 0.
 	ElementSeparator string `protobuf:"bytes,2,opt,name=element_separator,json=elementSeparator,proto3" json:"element_separator,omitempty"`
 	// Types that are assignable to ExtractType:
+	//
 	//	*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_Index
 	//	*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_Element
 	ExtractType isScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_ExtractType `protobuf_oneof:"extract_type"`
@@ -2962,7 +3018,7 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
 	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd2, 0x40, 0x0a, 0x15, 0x48, 0x74,
+	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x41, 0x0a, 0x15, 0x48, 0x74,
 	0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61,
 	0x67, 0x65, 0x72, 0x12, 0x85, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x5f, 0x74, 0x79,
 	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
@@ -3038,8 +3094,8 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x14, 0x68,
 	0x74, 0x74, 0x70, 0x33, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4f, 0x70, 0x74, 0x69,
 	0x6f, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0,
-	0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d,
+	0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d,
 	0x65, 0x12, 0xb9, 0x01, 0x0a, 0x1c, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61,
 	0x64, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x6d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
@@ -3098,13 +3154,13 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e,
 	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x36, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x17, 0x18, 0x01, 0xfa, 0x42, 0x09, 0xaa, 0x01,
-	0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x17, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x32,
+	0x04, 0x10, 0xc0, 0x84, 0x3d, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
 	0x52, 0x16, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x46, 0x6c, 0x75, 0x73, 0x68,
 	0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x50, 0x0a, 0x1f, 0x66, 0x6c, 0x75, 0x73,
 	0x68, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f,
 	0x6e, 0x65, 0x77, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x37, 0x20, 0x01, 0x28,
-	0x08, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x1a,
+	0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x1a,
 	0x66, 0x6c, 0x75, 0x73, 0x68, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x6e,
 	0x4e, 0x65, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x94, 0x01, 0x0a, 0x12, 0x61,
 	0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
@@ -3152,8 +3208,8 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x69, 0x67, 0x12, 0x26, 0x0a, 0x0f, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x78, 0x66, 0x66, 0x5f, 0x61,
 	0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x6b, 0x69,
 	0x70, 0x58, 0x66, 0x66, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x76, 0x69,
-	0x61, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01,
-	0x02, 0xc8, 0x01, 0x00, 0x52, 0x03, 0x76, 0x69, 0x61, 0x12, 0x4a, 0x0a, 0x13, 0x67, 0x65, 0x6e,
+	0x61, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x02, 0x52, 0x03, 0x76, 0x69, 0x61, 0x12, 0x4a, 0x0a, 0x13, 0x67, 0x65, 0x6e,
 	0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64,
 	0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
@@ -3297,7 +3353,7 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
 	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1f, 0x61, 0x64, 0x64, 0x50,
 	0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, 0xf6, 0x04, 0x0a, 0x07,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, 0xc2, 0x05, 0x0a, 0x07,
 	0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x12, 0x3f, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e,
 	0x74, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33,
@@ -3325,417 +3381,424 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x33,
 	0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x08, 0x70,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x28, 0x0a, 0x0d, 0x4f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x47, 0x52,
-	0x45, 0x53, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x45, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10,
-	0x01, 0x3a, 0x5b, 0x9a, 0xc5, 0x88, 0x1e, 0x56, 0x0a, 0x54, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32,
-	0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x4a, 0x04,
-	0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x0e, 0x6f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x18, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x66, 0x6f, 0x72, 0x5f,
-	0x74, 0x61, 0x67, 0x73, 0x1a, 0xe7, 0x01, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21,
-	0x0a, 0x0c, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x75, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x73, 0x12, 0x40, 0x0a, 0x0b, 0x63, 0x69, 0x64, 0x72, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69,
-	0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0a, 0x63, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x73, 0x3a, 0x69, 0x9a, 0xc5, 0x88, 0x1e, 0x64, 0x0a, 0x62, 0x65, 0x6e, 0x76, 0x6f,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x13, 0x73, 0x70, 0x61, 0x77, 0x6e,
+	0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x11, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53,
+	0x70, 0x61, 0x6e, 0x22, 0x28, 0x0a, 0x0d, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10,
+	0x00, 0x12, 0x0a, 0x0a, 0x06, 0x45, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10, 0x01, 0x3a, 0x5b, 0x9a,
+	0xc5, 0x88, 0x1e, 0x56, 0x0a, 0x54, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74, 0x74,
+	0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67,
+	0x65, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02,
+	0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x0e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x18, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x74, 0x61, 0x67, 0x73,
+	0x1a, 0xe7, 0x01, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x6e,
+	0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x75, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x40, 0x0a,
+	0x0b, 0x63, 0x69, 0x64, 0x72, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x52, 0x0a, 0x63, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x3a,
+	0x69, 0x9a, 0xc5, 0x88, 0x1e, 0x64, 0x0a, 0x62, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77,
+	0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x48,
+	0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x98, 0x02, 0x0a, 0x1b, 0x53,
+	0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43,
+	0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x73, 0x75,
+	0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
+	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
+	0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04,
+	0x63, 0x65, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6e,
+	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6e, 0x73, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x72, 0x69, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x75, 0x72, 0x69, 0x3a, 0x6f,
+	0x9a, 0xc5, 0x88, 0x1e, 0x6a, 0x0a, 0x68, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f,
+	0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74,
+	0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x4a,
+	0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0xae, 0x02, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64,
+	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61,
+	0x64, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x75,
+	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x61, 0x0a, 0x07, 0x66, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68,
+	0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x34, 0x0a,
+	0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x3a, 0x61, 0x9a, 0xc5, 0x88, 0x1e, 0x5c, 0x0a, 0x5a, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e,
 	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e,
 	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
 	0x76, 0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x98,
-	0x02, 0x0a, 0x1b, 0x53, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x34,
-	0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x73, 0x75, 0x62,
-	0x6a, 0x65, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x04, 0x63, 0x65, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x10,
-	0x0a, 0x03, 0x64, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6e, 0x73,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x75,
-	0x72, 0x69, 0x3a, 0x6f, 0x9a, 0xc5, 0x88, 0x1e, 0x6a, 0x0a, 0x68, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e,
+	0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xe5, 0x01, 0x0a, 0x18, 0x50, 0x61, 0x74, 0x68, 0x4e,
+	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x63, 0x0a, 0x19, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e,
+	0x67, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74, 0x68,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18,
+	0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x64, 0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70,
+	0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76,
+	0x33, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xe4,
+	0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x64,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x72, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x51, 0x0a, 0x25, 0x72,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x74,
+	0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x22, 0x72, 0x65, 0x6d, 0x6f,
+	0x76, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x65, 0x72, 0x6d,
+	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x32,
+	0x0a, 0x15, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x72,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x6c, 0x61,
+	0x67, 0x73, 0x12, 0x41, 0x0a, 0x1d, 0x73, 0x65, 0x74, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d,
+	0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63,
+	0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x73, 0x65, 0x74, 0x52, 0x65,
+	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, 0x65, 0x5f, 0x6e, 0x6f, 0x64,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x75, 0x73,
+	0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x69, 0x74, 0x65, 0x72,
+	0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x10, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x50, 0x72,
+	0x6f, 0x78, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x9d, 0x02, 0x0a, 0x13, 0x48, 0x63, 0x6d, 0x41, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x62, 0x0a,
+	0x19, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x66, 0x6c, 0x75, 0x73,
+	0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0xfa, 0x42, 0x09,
+	0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x16, 0x61, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x4c, 0x6f, 0x67, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
+	0x6c, 0x12, 0x43, 0x0a, 0x1f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x66, 0x6c, 0x75, 0x73,
+	0x68, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x6e, 0x4e, 0x65, 0x77, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5d, 0x0a, 0x2c, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f,
+	0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x5f, 0x73, 0x75,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x5f, 0x65, 0x73, 0x74, 0x61, 0x62,
+	0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x27, 0x66, 0x6c,
+	0x75, 0x73, 0x68, 0x4c, 0x6f, 0x67, 0x4f, 0x6e, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x53, 0x75,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c,
+	0x69, 0x73, 0x68, 0x65, 0x64, 0x22, 0x36, 0x0a, 0x09, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x55, 0x54, 0x4f, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05,
+	0x48, 0x54, 0x54, 0x50, 0x31, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x32,
+	0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x33, 0x10, 0x03, 0x22, 0x53, 0x0a,
+	0x1a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x4f,
+	0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x50,
+	0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x01,
+	0x12, 0x10, 0x0a, 0x0c, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52, 0x4f, 0x55, 0x47, 0x48,
+	0x10, 0x02, 0x22, 0x79, 0x0a, 0x18, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x0c,
+	0x0a, 0x08, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49, 0x5a, 0x45, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c,
+	0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x12,
+	0x0a, 0x0e, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44,
+	0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49, 0x5a, 0x45, 0x5f, 0x53,
+	0x45, 0x54, 0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x41, 0x4c, 0x57, 0x41, 0x59, 0x53, 0x5f, 0x46,
+	0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x04, 0x22, 0xa0, 0x01,
+	0x0a, 0x1c, 0x50, 0x61, 0x74, 0x68, 0x57, 0x69, 0x74, 0x68, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65,
+	0x64, 0x53, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23,
+	0x0a, 0x1f, 0x49, 0x4d, 0x50, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x43, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c,
+	0x54, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x45, 0x45, 0x50, 0x5f, 0x55, 0x4e, 0x43, 0x48,
+	0x41, 0x4e, 0x47, 0x45, 0x44, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x4a, 0x45, 0x43,
+	0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x55,
+	0x4e, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x52, 0x45, 0x44, 0x49,
+	0x52, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12, 0x18, 0x0a, 0x14, 0x55, 0x4e, 0x45, 0x53, 0x43, 0x41,
+	0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x10, 0x04,
+	0x3a, 0x53, 0x9a, 0xc5, 0x88, 0x1e, 0x4e, 0x0a, 0x4c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e,
+	0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61,
+	0x6e, 0x61, 0x67, 0x65, 0x72, 0x42, 0x16, 0x0a, 0x0f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x73,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x11, 0x0a,
+	0x0f, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6d, 0x6f, 0x64, 0x65,
+	0x4a, 0x04, 0x08, 0x1b, 0x10, 0x1c, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x52, 0x0c, 0x69, 0x64,
+	0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xca, 0x01, 0x0a, 0x10, 0x4c,
+	0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x65, 0x0a, 0x07, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x4b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77,
+	0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x52, 0x07, 0x6d,
+	0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x62, 0x6f, 0x64,
+	0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x9c, 0x03, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x12, 0x4c, 0x0a, 0x06, 0x66, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0xfa, 0x42, 0x08,
+	0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8, 0x01, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x43, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x60, 0x0a, 0x14, 0x62, 0x6f,
+	0x64, 0x79, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69,
+	0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x12, 0x62, 0x6f, 0x64, 0x79, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x58, 0x0a, 0x0e,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xfa,
+	0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xc7, 0x01, 0x0a, 0x03, 0x52, 0x64, 0x73, 0x12, 0x51,
+	0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
+	0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x12, 0x2a, 0x0a, 0x11, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x3a, 0x41, 0x9a,
+	0xc5, 0x88, 0x1e, 0x3c, 0x0a, 0x3a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x64, 0x73,
+	0x22, 0xf7, 0x01, 0x0a, 0x1d, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x79, 0x0a, 0x1b, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
+	0x08, 0x01, 0x52, 0x19, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x5b, 0x9a,
+	0xc5, 0x88, 0x1e, 0x56, 0x0a, 0x54, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f,
+	0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xe5, 0x0e, 0x0a, 0x0c, 0x53,
+	0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x8f, 0x01, 0x0a, 0x11, 0x73, 0x63, 0x6f,
+	0x70, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x59, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e,
+	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e,
+	0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x42,
+	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x73, 0x63, 0x6f, 0x70, 0x65,
+	0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11, 0x72, 0x64,
+	0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0f, 0x72, 0x64, 0x73, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0xa5, 0x01, 0x0a, 0x20, 0x73,
+	0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x5a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73,
+	0x74, 0x48, 0x00, 0x52, 0x1d, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x67, 0x0a, 0x0a, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x64, 0x73,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x48, 0x00,
+	0x52, 0x09, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x1a, 0xdf, 0x09, 0x0a, 0x0f,
+	0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x12,
+	0x91, 0x01, 0x0a, 0x09, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x69, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e,
 	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e,
 	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76,
-	0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65,
-	0x6e, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61,
-	0x69, 0x6c, 0x73, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0xae, 0x02, 0x0a, 0x0d, 0x55, 0x70,
-	0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x75,
-	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x61,
-	0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f,
-	0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3a, 0x61, 0x9a, 0xc5, 0x88, 0x1e, 0x5c, 0x0a, 0x5a,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70,
+	0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53,
+	0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46,
+	0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x42, 0x08,
+	0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x09, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65,
+	0x6e, 0x74, 0x73, 0x1a, 0xdb, 0x07, 0x0a, 0x0f, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74,
+	0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x12, 0xb6, 0x01, 0x0a, 0x16, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x7e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70,
 	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x67,
-	0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xe5, 0x01, 0x0a, 0x18, 0x50,
-	0x61, 0x74, 0x68, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x63, 0x0a, 0x19, 0x66, 0x6f, 0x72, 0x77, 0x61,
-	0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76, 0x33, 0x2e,
-	0x50, 0x61, 0x74, 0x68, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x18, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x64, 0x0a, 0x1a,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x1a, 0xe4, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x6d, 0x6f,
-	0x76, 0x65, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12,
-	0x51, 0x0a, 0x25, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x22,
-	0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x13, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x41, 0x0a, 0x1d, 0x73, 0x65, 0x74, 0x5f, 0x72, 0x65,
-	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x73,
-	0x65, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, 0x65,
-	0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00,
-	0x52, 0x09, 0x75, 0x73, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x6c,
-	0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x10, 0x6c, 0x69, 0x74, 0x65, 0x72,
-	0x61, 0x6c, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x9d, 0x02, 0x0a, 0x13, 0x48, 0x63,
-	0x6d, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x62, 0x0a, 0x19, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f,
-	0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x0c, 0xfa, 0x42, 0x09, 0xaa, 0x01, 0x06, 0x32, 0x04, 0x10, 0xc0, 0x84, 0x3d, 0x52, 0x16, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x43, 0x0a, 0x1f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x6e, 0x65, 0x77,
-	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a,
-	0x66, 0x6c, 0x75, 0x73, 0x68, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x4f, 0x6e,
-	0x4e, 0x65, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5d, 0x0a, 0x2c, 0x66, 0x6c,
-	0x75, 0x73, 0x68, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x75, 0x6e, 0x6e, 0x65,
-	0x6c, 0x5f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x5f, 0x65,
-	0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x27, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x4c, 0x6f, 0x67, 0x4f, 0x6e, 0x54, 0x75, 0x6e, 0x6e,
-	0x65, 0x6c, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x45, 0x73,
-	0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x22, 0x36, 0x0a, 0x09, 0x43, 0x6f, 0x64,
-	0x65, 0x63, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x55, 0x54, 0x4f, 0x10, 0x00,
-	0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x31, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x48,
-	0x54, 0x54, 0x50, 0x32, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x33, 0x10,
-	0x03, 0x22, 0x53, 0x0a, 0x1a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x0d, 0x0a, 0x09, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x00, 0x12, 0x14,
-	0x0a, 0x10, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53, 0x45,
-	0x4e, 0x54, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52,
-	0x4f, 0x55, 0x47, 0x48, 0x10, 0x02, 0x22, 0x79, 0x0a, 0x18, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72,
-	0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x73, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49, 0x5a, 0x45, 0x10, 0x00,
-	0x12, 0x10, 0x0a, 0x0c, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59,
-	0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x46, 0x4f, 0x52,
-	0x57, 0x41, 0x52, 0x44, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49,
-	0x5a, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x41, 0x4c, 0x57, 0x41,
-	0x59, 0x53, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10,
-	0x04, 0x22, 0xa0, 0x01, 0x0a, 0x1c, 0x50, 0x61, 0x74, 0x68, 0x57, 0x69, 0x74, 0x68, 0x45, 0x73,
-	0x63, 0x61, 0x70, 0x65, 0x64, 0x53, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x1f, 0x49, 0x4d, 0x50, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x41,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x43, 0x5f, 0x44, 0x45,
-	0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x45, 0x45, 0x50, 0x5f,
-	0x55, 0x4e, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x44, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x52,
-	0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x02, 0x12,
-	0x19, 0x0a, 0x15, 0x55, 0x4e, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44, 0x5f,
-	0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12, 0x18, 0x0a, 0x14, 0x55, 0x4e,
-	0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41,
-	0x52, 0x44, 0x10, 0x04, 0x3a, 0x53, 0x9a, 0xc5, 0x88, 0x1e, 0x4e, 0x0a, 0x4c, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
-	0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x42, 0x16, 0x0a, 0x0f, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42,
-	0x01, 0x42, 0x11, 0x0a, 0x0f, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x5f,
-	0x6d, 0x6f, 0x64, 0x65, 0x4a, 0x04, 0x08, 0x1b, 0x10, 0x1c, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c,
-	0x52, 0x0c, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xca,
-	0x01, 0x0a, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x65, 0x0a, 0x07, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45,
+	0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x48, 0x00, 0x52, 0x14, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72,
+	0x1a, 0x95, 0x05, 0x0a, 0x14, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01,
+	0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x11,
+	0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x05, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x12, 0xa5, 0x01, 0x0a, 0x07, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x88, 0x01, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
 	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e,
 	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e,
 	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x65,
-	0x72, 0x52, 0x07, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x62, 0x6f,
-	0x64, 0x79, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74,
-	0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52,
-	0x0a, 0x62, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x9c, 0x03, 0x0a, 0x0e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x12, 0x4c,
-	0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x4c, 0x6f, 0x67, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
-	0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x0b,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42,
-	0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8, 0x01, 0x52, 0x0a, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61,
-	0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x60,
-	0x0a, 0x14, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x6f, 0x76,
-	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x12, 0x62, 0x6f,
-	0x64, 0x79, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65,
-	0x12, 0x58, 0x0a, 0x0e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61,
-	0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x92, 0x01, 0x03, 0x10, 0xe8, 0x07, 0x52, 0x0c, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xc7, 0x01, 0x0a, 0x03, 0x52,
-	0x64, 0x73, 0x12, 0x51, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4e, 0x61, 0x6d,
-	0x65, 0x3a, 0x41, 0x9a, 0xc5, 0x88, 0x1e, 0x3c, 0x0a, 0x3a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e,
+	0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e,
+	0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4b, 0x76, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00,
+	0x52, 0x07, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0xdb, 0x01, 0x0a, 0x09, 0x4b, 0x76,
+	0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x09, 0x73, 0x65, 0x70, 0x61, 0x72,
+	0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
+	0x02, 0x10, 0x01, 0x52, 0x09, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x19,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x8b, 0x01, 0x9a, 0xc5, 0x88, 0x1e,
+	0x85, 0x01, 0x0a, 0x82, 0x01, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70,
+	0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65,
+	0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e,
+	0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4b, 0x76,
+	0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x3a, 0x7f, 0x9a, 0xc5, 0x88, 0x1e, 0x7a, 0x0a, 0x78,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70,
+	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45,
+	0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x42, 0x0e, 0x0a, 0x0c, 0x65, 0x78, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x6a, 0x9a, 0xc5, 0x88, 0x1e, 0x65, 0x0a,
+	0x63, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74,
+	0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69,
+	0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69,
+	0x6c, 0x64, 0x65, 0x72, 0x42, 0x0b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42,
+	0x01, 0x3a, 0x5a, 0x9a, 0xc5, 0x88, 0x1e, 0x55, 0x0a, 0x53, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65,
 	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
 	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32,
-	0x2e, 0x52, 0x64, 0x73, 0x22, 0xf7, 0x01, 0x0a, 0x1d, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x79, 0x0a, 0x1b, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64,
-	0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x19, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x3a, 0x5b, 0x9a, 0xc5, 0x88, 0x1e, 0x56, 0x0a, 0x54, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63,
+	0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x3a, 0x4a, 0x9a,
+	0xc5, 0x88, 0x1e, 0x45, 0x0a, 0x43, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f,
+	0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x17, 0x0a, 0x10, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8,
+	0x42, 0x01, 0x22, 0xf1, 0x01, 0x0a, 0x09, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73,
+	0x12, 0x65, 0x0a, 0x18, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x64, 0x73, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x15, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x73, 0x72, 0x64, 0x73, 0x5f,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x73, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x3a, 0x47, 0x9a,
+	0xc5, 0x88, 0x1e, 0x42, 0x0a, 0x40, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f,
+	0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x22, 0xe8, 0x02, 0x0a, 0x0a, 0x48, 0x74, 0x74, 0x70, 0x46,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00,
+	0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x58, 0x0a,
+	0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69,
+	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x64, 0x3a, 0x48, 0x9a, 0xc5, 0x88, 0x1e, 0x43, 0x0a, 0x41, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x0d,
+	0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08,
+	0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x22, 0x9f, 0x01, 0x0a, 0x12, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65,
+	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x3a, 0x50, 0x9a, 0xc5, 0x88, 0x1e, 0x4b, 0x0a, 0x49, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65,
 	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
 	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32,
-	0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xdf,
-	0x0e, 0x0a, 0x0c, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12,
-	0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x8f, 0x01, 0x0a,
-	0x11, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x59, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x22, 0x8e, 0x01, 0x0a, 0x20, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x4d, 0x6f, 0x62,
+	0x69, 0x6c, 0x65, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x6a, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x52, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
 	0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70,
 	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
-	0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c,
-	0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x73,
-	0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x4e,
-	0x0a, 0x11, 0x72, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0f, 0x72,
-	0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0xa5,
-	0x01, 0x0a, 0x20, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6c,
-	0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x5a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74,
-	0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x1d, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x67, 0x0a, 0x0a, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64,
-	0x5f, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52,
-	0x64, 0x73, 0x48, 0x00, 0x52, 0x09, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x1a,
-	0xd9, 0x09, 0x0a, 0x0f, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c,
-	0x64, 0x65, 0x72, 0x12, 0x91, 0x01, 0x0a, 0x09, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x69, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64,
-	0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64,
-	0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x09, 0x66, 0x72,
-	0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0xd5, 0x07, 0x0a, 0x0f, 0x46, 0x72, 0x61, 0x67,
-	0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x12, 0xb6, 0x01, 0x0a, 0x16,
-	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x65, 0x78, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x7e, 0x2e, 0x65,
+	0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x52, 0x06, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x42, 0xef, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x49, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
 	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e,
 	0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65,
-	0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79,
-	0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74,
-	0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x48, 0x00, 0x52, 0x14,
-	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x6f, 0x72, 0x1a, 0x8f, 0x05, 0x0a, 0x14, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x1b, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
-	0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x65, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65,
-	0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
-	0xa5, 0x01, 0x0a, 0x07, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x88, 0x01, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63,
-	0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x72,
-	0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x6f, 0x72, 0x2e, 0x4b, 0x76, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x07,
-	0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0xdb, 0x01, 0x0a, 0x09, 0x4b, 0x76, 0x45, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x09, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74,
-	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x09, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
-	0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x8b, 0x01, 0x9a, 0xc5, 0x88, 0x1e, 0x85, 0x01,
-	0x0a, 0x82, 0x01, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68,
-	0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42,
-	0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42,
-	0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x4b, 0x76, 0x45, 0x6c,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x3a, 0x7f, 0x9a, 0xc5, 0x88, 0x1e, 0x7a, 0x0a, 0x78, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65,
-	0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65,
-	0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x78, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x42, 0x0e, 0x0a, 0x0c, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x6a, 0x9a, 0xc5, 0x88, 0x1e, 0x65, 0x0a, 0x63, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67,
-	0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64,
-	0x65, 0x72, 0x2e, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64,
-	0x65, 0x72, 0x42, 0x0b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a,
-	0x5a, 0x9a, 0xc5, 0x88, 0x1e, 0x55, 0x0a, 0x53, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77,
-	0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53,
-	0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x53, 0x63, 0x6f, 0x70,
-	0x65, 0x4b, 0x65, 0x79, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x3a, 0x4a, 0x9a, 0xc5, 0x88,
-	0x1e, 0x45, 0x0a, 0x43, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65,
-	0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x17, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x22, 0xf1, 0x01, 0x0a, 0x09, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x12, 0x65,
-	0x0a, 0x18, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x15,
-	0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x73, 0x72, 0x64, 0x73, 0x5f, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x73, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x3a, 0x47, 0x9a, 0xc5, 0x88,
-	0x1e, 0x42, 0x0a, 0x40, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65,
-	0x64, 0x52, 0x64, 0x73, 0x22, 0xcc, 0x02, 0x0a, 0x0a, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b,
-	0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x58, 0x0a, 0x10, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x3a, 0x48, 0x9a, 0xc5, 0x88, 0x1e, 0x43, 0x0a, 0x41, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67,
-	0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a,
-	0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x22, 0x9f, 0x01, 0x0a, 0x12, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49,
-	0x44, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x74, 0x79,
-	0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x3a, 0x50, 0x9a, 0xc5, 0x88, 0x1e, 0x4b, 0x0a, 0x49, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e,
-	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
-	0x76, 0x32, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x44, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x8e, 0x01, 0x0a, 0x20, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x4d,
-	0x6f, 0x62, 0x69, 0x6c, 0x65, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x6a, 0x0a, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x52, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x52, 0x06,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xef, 0x01, 0x0a, 0x49, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x42, 0x1a, 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x7c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x68, 0x74, 0x74, 0x70,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61,
-	0x67, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x1a, 0x48, 0x74, 0x74, 0x70,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x7c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74,
+	0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3868,21 +3931,22 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec
 	33, // 60: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.max_path_tag_length:type_name -> google.protobuf.UInt32Value
 	46, // 61: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.custom_tags:type_name -> envoy.type.tracing.v3.CustomTag
 	47, // 62: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.provider:type_name -> envoy.config.trace.v3.Tracing.Http
-	48, // 63: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.InternalAddressConfig.cidr_ranges:type_name -> envoy.config.core.v3.CidrRange
-	27, // 64: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.SetCurrentClientCertDetails.subject:type_name -> google.protobuf.BoolValue
-	12, // 65: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig.filters:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter
-	27, // 66: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue
-	49, // 67: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions.forwarding_transformation:type_name -> envoy.type.http.v3.PathTransformation
-	49, // 68: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions.http_filter_transformation:type_name -> envoy.type.http.v3.PathTransformation
-	34, // 69: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.access_log_flush_interval:type_name -> google.protobuf.Duration
-	23, // 70: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.fragments:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder
-	24, // 71: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.header_value_extractor:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor
-	25, // 72: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.element:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement
-	73, // [73:73] is the sub-list for method output_type
-	73, // [73:73] is the sub-list for method input_type
-	73, // [73:73] is the sub-list for extension type_name
-	73, // [73:73] is the sub-list for extension extendee
-	0,  // [0:73] is the sub-list for field type_name
+	27, // 63: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.spawn_upstream_span:type_name -> google.protobuf.BoolValue
+	48, // 64: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.InternalAddressConfig.cidr_ranges:type_name -> envoy.config.core.v3.CidrRange
+	27, // 65: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.SetCurrentClientCertDetails.subject:type_name -> google.protobuf.BoolValue
+	12, // 66: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig.filters:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter
+	27, // 67: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue
+	49, // 68: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions.forwarding_transformation:type_name -> envoy.type.http.v3.PathTransformation
+	49, // 69: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions.http_filter_transformation:type_name -> envoy.type.http.v3.PathTransformation
+	34, // 70: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.access_log_flush_interval:type_name -> google.protobuf.Duration
+	23, // 71: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.fragments:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder
+	24, // 72: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.header_value_extractor:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor
+	25, // 73: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.element:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement
+	74, // [74:74] is the sub-list for method output_type
+	74, // [74:74] is the sub-list for method input_type
+	74, // [74:74] is the sub-list for extension type_name
+	74, // [74:74] is the sub-list for extension extendee
+	0,  // [0:74] is the sub-list for field type_name
 }
 
 func init() {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go
index 7c81d81b2a1..9b5309b0000 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go
@@ -2494,6 +2494,8 @@ func (m *HttpFilter) validate(all bool) error {
 
 	// no validation rules for IsOptional
 
+	// no validation rules for Disabled
+
 	switch v := m.ConfigType.(type) {
 	case *HttpFilter_TypedConfig:
 		if v == nil {
@@ -3126,6 +3128,35 @@ func (m *HttpConnectionManager_Tracing) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetSpawnUpstreamSpan()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, HttpConnectionManager_TracingValidationError{
+					field:  "SpawnUpstreamSpan",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, HttpConnectionManager_TracingValidationError{
+					field:  "SpawnUpstreamSpan",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetSpawnUpstreamSpan()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return HttpConnectionManager_TracingValidationError{
+				field:  "SpawnUpstreamSpan",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return HttpConnectionManager_TracingMultiError(errors)
 	}
@@ -4468,6 +4499,17 @@ func (m *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor) vali
 		errors = append(errors, err)
 	}
 
+	if !_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_Name_Pattern.MatchString(m.GetName()) {
+		err := ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractorValidationError{
+			field:  "Name",
+			reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
 	// no validation rules for ElementSeparator
 
 	switch v := m.ExtractType.(type) {
@@ -4621,6 +4663,8 @@ var _ interface {
 	ErrorName() string
 } = ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractorValidationError{}
 
+var _ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_Name_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
+
 // Validate checks the field values on
 // ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement
 // with the rules defined in the proto definition for this message. If any
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
index 6f37c7c2640..6067ababf67 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
 
 package client_side_weighted_round_robinv3
@@ -29,14 +29,16 @@ const (
 // This policy differs from the built-in ROUND_ROBIN policy in terms of
 // how the endpoint weights are determined. In the ROUND_ROBIN policy,
 // the endpoint weights are sent by the control plane via EDS. However,
-// in this policy, the endpoint weights are instead determined via
-// qps (queries per second), eps (errors per second), and CPU utilization
-// metrics sent by the endpoint using the Open Request Cost Aggregation (ORCA)
-// protocol. A query counts towards qps when successful, otherwise towards both
-// qps and eps. What counts as an error is up to the endpoint to define.
-// A config parameter error_utilization_penalty controls the penalty to adjust
-// endpoint weights using eps and qps. The weight of a given endpoint is
-// computed as: qps / (cpu_utilization + eps/qps * error_utilization_penalty)
+// in this policy, the endpoint weights are instead determined via qps (queries
+// per second), eps (errors per second), and utilization metrics sent by the
+// endpoint using the Open Request Cost Aggregation (ORCA) protocol. Utilization
+// is determined by using the ORCA application_utilization field, if set, or
+// else falling back to the cpu_utilization field. All queries count toward qps,
+// regardless of result. Only failed queries count toward eps. A config
+// parameter error_utilization_penalty controls the penalty to adjust endpoint
+// weights using eps and qps. The weight of a given endpoint is computed as:
+//
+//	qps / (utilization + eps/qps * error_utilization_penalty)
 //
 // See the :ref:`load balancing architecture overview<arch_overview_load_balancing_types>` for more information.
 //
@@ -204,25 +206,25 @@ var file_envoy_extensions_load_balancing_policies_client_side_weighted_round_rob
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
 	0x42, 0x0a, 0xfa, 0x42, 0x07, 0x0a, 0x05, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x52, 0x17, 0x65, 0x72,
 	0x72, 0x6f, 0x72, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65,
-	0x6e, 0x61, 0x6c, 0x74, 0x79, 0x42, 0xa2, 0x02, 0x0a, 0x5a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x77, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69,
-	0x6e, 0x2e, 0x76, 0x33, 0x42, 0x21, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x64, 0x65,
-	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62,
-	0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x96, 0x01, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
-	0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
-	0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b,
-	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x77, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6e, 0x61, 0x6c, 0x74, 0x79, 0x42, 0xa2, 0x02, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x5a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f,
+	0x73, 0x69, 0x64, 0x65, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x21, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x69, 0x64, 0x65, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
+	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x96, 0x01, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64,
+	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f,
+	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72,
+	0x6f, 0x62, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73,
+	0x69, 0x64, 0x65, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75,
+	0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
index 0684dda0b6c..a5e23ba8d57 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/common/v3/common.proto
 
 package commonv3
@@ -32,6 +32,7 @@ type LocalityLbConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to LocalityConfigSpecifier:
+	//
 	//	*LocalityLbConfig_ZoneAwareLbConfig_
 	//	*LocalityLbConfig_LocalityWeightedLbConfig_
 	LocalityConfigSpecifier isLocalityLbConfig_LocalityConfigSpecifier `protobuf_oneof:"locality_config_specifier"`
@@ -125,8 +126,8 @@ type SlowStartConfig struct {
 	// By tuning the parameter, is possible to achieve polynomial or exponential shape of ramp-up curve.
 	//
 	// During slow start window, effective weight of an endpoint would be scaled with time factor and aggression:
-	// ``new_weight = weight * max(min_weight_percent, time_factor ^ (1 / aggression))``,
-	// where ``time_factor=(time_since_start_seconds / slow_start_time_seconds)``.
+	// “new_weight = weight * max(min_weight_percent, time_factor ^ (1 / aggression))“,
+	// where “time_factor=(time_since_start_seconds / slow_start_time_seconds)“.
 	//
 	// As time progresses, more and more traffic would be sent to endpoint, which is in slow start window.
 	// Once host exits slow start, time_factor and aggression no longer affect its weight.
@@ -196,7 +197,7 @@ type ConsistentHashingLbConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// If set to ``true``, the cluster will use hostname instead of the resolved
+	// If set to “true“, the cluster will use hostname instead of the resolved
 	// address as the key to consistently hash to an upstream host. Only valid for StrictDNS clusters with hostnames which resolve to a single IP address.
 	UseHostnameForHashing bool `protobuf:"varint,1,opt,name=use_hostname_for_hashing,json=useHostnameForHashing,proto3" json:"use_hostname_for_hashing,omitempty"`
 	// Configures percentage of average cluster load to bound per upstream host. For example, with a value of 150
@@ -207,7 +208,7 @@ type ConsistentHashingLbConfig struct {
 	// Applies to both Ring Hash and Maglev load balancers.
 	//
 	// This is implemented based on the method described in the paper https://arxiv.org/abs/1608.01350. For the specified
-	// ``hash_balance_factor``, requests to any upstream host are capped at ``hash_balance_factor/100`` times the average number of requests
+	// “hash_balance_factor“, requests to any upstream host are capped at “hash_balance_factor/100“ times the average number of requests
 	// across the cluster. When a request arrives for an upstream host that is currently serving at its max capacity, linear probing
 	// is used to identify an eligible host. Further, the linear probe is implemented using a random jump in hosts ring/table to identify
 	// the eligible host (this technique is as described in the paper https://arxiv.org/abs/1908.08762 - the random jump avoids the
@@ -215,7 +216,7 @@ type ConsistentHashingLbConfig struct {
 	//
 	// If weights are specified on the hosts, they are respected.
 	//
-	// This is an O(N) algorithm, unlike other load balancers. Using a lower ``hash_balance_factor`` results in more hosts
+	// This is an O(N) algorithm, unlike other load balancers. Using a lower “hash_balance_factor“ results in more hosts
 	// being probed, so use a higher value if you require better performance.
 	HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"`
 }
@@ -468,19 +469,19 @@ var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDesc
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32,
 	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x64, 0x52, 0x11,
 	0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x46, 0x61, 0x63, 0x74, 0x6f,
-	0x72, 0x42, 0xbd, 0x01, 0x0a, 0x40, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x62, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c,
-	0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x42, 0xbd, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x40, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61,
+	0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
+	0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0b,
+	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x62, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go
index e6a862dd90b..51aa1f4be4a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto
 
 package least_requestv3
@@ -28,6 +28,7 @@ const (
 // This configuration allows the built-in LEAST_REQUEST LB policy to be configured via the LB policy
 // extension point. See the :ref:`load balancing architecture overview
 // <arch_overview_load_balancing_types>` for more information.
+// [#next-free-field: 6]
 type LeastRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -39,18 +40,18 @@ type LeastRequest struct {
 	// The following formula is used to calculate the dynamic weights when hosts have different load
 	// balancing weights:
 	//
-	// `weight = load_balancing_weight / (active_requests + 1)^active_request_bias`
+	// “weight = load_balancing_weight / (active_requests + 1)^active_request_bias“
 	//
 	// The larger the active request bias is, the more aggressively active requests will lower the
 	// effective weight when all host weights are not equal.
 	//
-	// `active_request_bias` must be greater than or equal to 0.0.
+	// “active_request_bias“ must be greater than or equal to 0.0.
 	//
-	// When `active_request_bias == 0.0` the Least Request Load Balancer doesn't consider the number
+	// When “active_request_bias == 0.0“ the Least Request Load Balancer doesn't consider the number
 	// of active requests at the time it picks a host and behaves like the Round Robin Load
 	// Balancer.
 	//
-	// When `active_request_bias > 0.0` the Least Request Load Balancer scales the load balancing
+	// When “active_request_bias > 0.0“ the Least Request Load Balancer scales the load balancing
 	// weight by the number of active requests at the time it does a pick.
 	//
 	// The value is cached for performance reasons and refreshed whenever one of the Load Balancer's
@@ -58,13 +59,19 @@ type LeastRequest struct {
 	// weight change.
 	//
 	// .. note::
-	//   This setting only takes effect if all host weights are not equal.
+	//
+	//	This setting only takes effect if all host weights are not equal.
 	ActiveRequestBias *v3.RuntimeDouble `protobuf:"bytes,2,opt,name=active_request_bias,json=activeRequestBias,proto3" json:"active_request_bias,omitempty"`
 	// Configuration for slow start mode.
 	// If this configuration is not set, slow start will not be not enabled.
 	SlowStartConfig *v31.SlowStartConfig `protobuf:"bytes,3,opt,name=slow_start_config,json=slowStartConfig,proto3" json:"slow_start_config,omitempty"`
 	// Configuration for local zone aware load balancing or locality weighted load balancing.
 	LocalityLbConfig *v31.LocalityLbConfig `protobuf:"bytes,4,opt,name=locality_lb_config,json=localityLbConfig,proto3" json:"locality_lb_config,omitempty"`
+	// [#not-implemented-hide:]
+	// Configuration for performing full scan on the list of hosts.
+	// If this configuration is set, when selecting the host a full scan on the list hosts will be
+	// used to select the one with least requests instead of using random choices.
+	EnableFullScan *wrappers.BoolValue `protobuf:"bytes,5,opt,name=enable_full_scan,json=enableFullScan,proto3" json:"enable_full_scan,omitempty"`
 }
 
 func (x *LeastRequest) Reset() {
@@ -127,6 +134,13 @@ func (x *LeastRequest) GetLocalityLbConfig() *v31.LocalityLbConfig {
 	return nil
 }
 
+func (x *LeastRequest) GetEnableFullScan() *wrappers.BoolValue {
+	if x != nil {
+		return x.EnableFullScan
+	}
+	return nil
+}
+
 var File_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto_rawDesc = []byte{
@@ -150,7 +164,7 @@ var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request
 	0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73,
 	0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c,
 	0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x92, 0x03, 0x0a, 0x0c, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x03, 0x0a, 0x0c, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f,
 	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
@@ -175,21 +189,26 @@ var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request
 	0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
 	0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c,
 	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
-	0x79, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xd8, 0x01, 0x0a, 0x47, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61,
-	0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x2e, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x70, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
-	0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73,
-	0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x65, 0x61,
-	0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x10, 0x65, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
+	0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x46, 0x75, 0x6c, 0x6c, 0x53, 0x63, 0x61, 0x6e, 0x42,
+	0xd8, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x47, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+	0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
+	0x65, 0x73, 0x2e, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x76, 0x33, 0x42, 0x11, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x70, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67,
+	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x5f,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x65, 0x61, 0x73, 0x74,
+	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -211,17 +230,19 @@ var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request
 	(*v3.RuntimeDouble)(nil),     // 2: envoy.config.core.v3.RuntimeDouble
 	(*v31.SlowStartConfig)(nil),  // 3: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig
 	(*v31.LocalityLbConfig)(nil), // 4: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig
+	(*wrappers.BoolValue)(nil),   // 5: google.protobuf.BoolValue
 }
 var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto_depIdxs = []int32{
 	1, // 0: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.choice_count:type_name -> google.protobuf.UInt32Value
 	2, // 1: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.active_request_bias:type_name -> envoy.config.core.v3.RuntimeDouble
 	3, // 2: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.slow_start_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig
 	4, // 3: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.locality_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
+	5, // 4: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.enable_full_scan:type_name -> google.protobuf.BoolValue
+	5, // [5:5] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go
index 344e831f604..fcec6a429fd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go
@@ -159,6 +159,35 @@ func (m *LeastRequest) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetEnableFullScan()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, LeastRequestValidationError{
+					field:  "EnableFullScan",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, LeastRequestValidationError{
+					field:  "EnableFullScan",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetEnableFullScan()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return LeastRequestValidationError{
+				field:  "EnableFullScan",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return LeastRequestMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.go
index 61328f766cb..58cfa7c7a03 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
 
 package pick_firstv3
@@ -89,19 +89,19 @@ var file_envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_proto
 	0x14, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
 	0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x73, 0x68, 0x75,
 	0x66, 0x66, 0x6c, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x42,
-	0xcc, 0x01, 0x0a, 0x44, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e,
-	0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x69, 0x63, 0x6b, 0x5f,
-	0x66, 0x69, 0x72, 0x73, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x50, 0x69, 0x63, 0x6b, 0x46, 0x69,
-	0x72, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6a, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
-	0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x70, 0x69, 0x63, 0x6b,
-	0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x70, 0x69, 0x63, 0x6b, 0x5f, 0x66,
-	0x69, 0x72, 0x73, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
+	0xcc, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x44, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+	0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
+	0x65, 0x73, 0x2e, 0x70, 0x69, 0x63, 0x6b, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x2e, 0x76, 0x33,
+	0x42, 0x0e, 0x50, 0x69, 0x63, 0x6b, 0x46, 0x69, 0x72, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x6a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64,
+	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x2f, 0x70, 0x69, 0x63, 0x6b, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x2f, 0x76,
+	0x33, 0x3b, 0x70, 0x69, 0x63, 0x6b, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x76, 0x33, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go
index b715687f4ed..501283fa7f6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
 
 package ring_hashv3
@@ -101,14 +101,15 @@ type RingHash struct {
 	// to further constrain resource use. See also
 	// :ref:`minimum_ring_size<envoy_v3_api_field_config.cluster.v3.Cluster.RingHashLbConfig.minimum_ring_size>`.
 	MaximumRingSize *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"`
-	// If set to `true`, the cluster will use hostname instead of the resolved
+	// If set to “true“, the cluster will use hostname instead of the resolved
 	// address as the key to consistently hash to an upstream host. Only valid for StrictDNS clusters with hostnames which resolve to a single IP address.
 	//
-	// ..note::
-	//   This is deprecated and please use :ref:`consistent_hashing_lb_config
-	//   <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+	// .. note::
 	//
-	// Deprecated: Do not use.
+	//	This is deprecated and please use :ref:`consistent_hashing_lb_config
+	//	<envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+	//
+	// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto.
 	UseHostnameForHashing bool `protobuf:"varint,4,opt,name=use_hostname_for_hashing,json=useHostnameForHashing,proto3" json:"use_hostname_for_hashing,omitempty"`
 	// Configures percentage of average cluster load to bound per upstream host. For example, with a value of 150
 	// no upstream host will get a load more than 1.5 times the average load of all the hosts in the cluster.
@@ -116,7 +117,7 @@ type RingHash struct {
 	// Minimum is 100.
 	//
 	// This is implemented based on the method described in the paper https://arxiv.org/abs/1608.01350. For the specified
-	// `hash_balance_factor`, requests to any upstream host are capped at `hash_balance_factor/100` times the average number of requests
+	// “hash_balance_factor“, requests to any upstream host are capped at “hash_balance_factor/100“ times the average number of requests
 	// across the cluster. When a request arrives for an upstream host that is currently serving at its max capacity, linear probing
 	// is used to identify an eligible host. Further, the linear probe is implemented using a random jump in hosts ring/table to identify
 	// the eligible host (this technique is as described in the paper https://arxiv.org/abs/1908.08762 - the random jump avoids the
@@ -124,14 +125,15 @@ type RingHash struct {
 	//
 	// If weights are specified on the hosts, they are respected.
 	//
-	// This is an O(N) algorithm, unlike other load balancers. Using a lower `hash_balance_factor` results in more hosts
+	// This is an O(N) algorithm, unlike other load balancers. Using a lower “hash_balance_factor“ results in more hosts
 	// being probed, so use a higher value if you require better performance.
 	//
-	// ..note::
-	//   This is deprecated and please use :ref:`consistent_hashing_lb_config
-	//   <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+	// .. note::
+	//
+	//	This is deprecated and please use :ref:`consistent_hashing_lb_config
+	//	<envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto.
 	HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"`
 	// Common configuration for hashing-based load balancing policies.
 	ConsistentHashingLbConfig *v3.ConsistentHashingLbConfig `protobuf:"bytes,6,opt,name=consistent_hashing_lb_config,json=consistentHashingLbConfig,proto3" json:"consistent_hashing_lb_config,omitempty"`
@@ -192,7 +194,7 @@ func (x *RingHash) GetMaximumRingSize() *wrappers.UInt64Value {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto.
 func (x *RingHash) GetUseHostnameForHashing() bool {
 	if x != nil {
 		return x.UseHostnameForHashing
@@ -200,7 +202,7 @@ func (x *RingHash) GetUseHostnameForHashing() bool {
 	return false
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto.
 func (x *RingHash) GetHashBalanceFactor() *wrappers.UInt32Value {
 	if x != nil {
 		return x.HashBalanceFactor
@@ -266,14 +268,14 @@ var file_envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_r
 	0x04, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69,
 	0x7a, 0x65, 0x12, 0x44, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61,
 	0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x6f,
+	0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x46, 0x6f,
 	0x72, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x60, 0x0a, 0x13, 0x68, 0x61, 0x73, 0x68,
 	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18,
 	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x42, 0x12, 0x18, 0x01, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x64, 0x92, 0xc7,
-	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c,
+	0x6c, 0x75, 0x65, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x64, 0x92, 0xc7, 0x86, 0xd8,
+	0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c,
 	0x61, 0x6e, 0x63, 0x65, 0x46, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x8e, 0x01, 0x0a, 0x1c, 0x63,
 	0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e,
 	0x67, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28,
@@ -297,20 +299,20 @@ var file_envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_r
 	0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x0c, 0x44, 0x45,
 	0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07,
 	0x58, 0x58, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4d, 0x55, 0x52,
-	0x4d, 0x55, 0x52, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x32, 0x10, 0x02, 0x42, 0xc8, 0x01, 0x0a,
-	0x43, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73,
-	0x68, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x68, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c,
-	0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68,
-	0x2f, 0x76, 0x33, 0x3b, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4d, 0x55, 0x52, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x32, 0x10, 0x02, 0x42, 0xc8, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x43, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e,
+	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x52, 0x69,
+	0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x68, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x72,
+	0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x69, 0x6e, 0x67,
+	0x5f, 0x68, 0x61, 0x73, 0x68, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.go
index dac8bedb2ca..c239c5dc99f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto
 
 package round_robinv3
@@ -115,20 +115,20 @@ var file_envoy_extensions_load_balancing_policies_round_robin_v3_round_robin_pro
 	0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62,
 	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
-	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xd0, 0x01, 0x0a, 0x45, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x69, 0x65, 0x73, 0x2e, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x2e,
-	0x76, 0x33, 0x42, 0x0f, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c,
-	0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62,
-	0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69,
-	0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xd0, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x45, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69,
+	0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x52, 0x6f, 0x75, 0x6e,
+	0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6c, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.go
index ccaa74aabcd..7467d942010 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto
 
 package wrr_localityv3
@@ -98,20 +98,20 @@ var file_envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_p
 	0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f,
 	0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x15,
 	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x50, 0x69, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0xd4, 0x01, 0x0a, 0x46, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x2e, 0x77, 0x72, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x76, 0x33,
-	0x42, 0x10, 0x57, 0x72, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f,
-	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x77, 0x72, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x77, 0x72, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0xd4, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x46, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x77, 0x72, 0x72, 0x5f, 0x6c, 0x6f, 0x63,
+	0x61, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x57, 0x72, 0x72, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6e, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e,
+	0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x77, 0x72,
+	0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x77, 0x72,
+	0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.go
index 55bec6a6113..8a63cb980f0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/rbac/audit_loggers/stream/v3/stream.proto
 
 package streamv3
@@ -74,19 +74,19 @@ var file_envoy_extensions_rbac_audit_loggers_stream_v3_stream_proto_rawDesc = []
 	0x73, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x33, 0x1a, 0x1d, 0x75, 0x64, 0x70,
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74,
 	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x74,
-	0x64, 0x6f, 0x75, 0x74, 0x41, 0x75, 0x64, 0x69, 0x74, 0x4c, 0x6f, 0x67, 0x42, 0xb3, 0x01, 0x0a,
-	0x3b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x72, 0x62, 0x61, 0x63, 0x2e, 0x61, 0x75, 0x64, 0x69, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x67, 0x65,
-	0x72, 0x73, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5d, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x62, 0x61, 0x63, 0x2f, 0x61, 0x75, 0x64, 0x69, 0x74, 0x5f,
-	0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2f, 0x76,
-	0x33, 0x3b, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x6f, 0x75, 0x74, 0x41, 0x75, 0x64, 0x69, 0x74, 0x4c, 0x6f, 0x67, 0x42, 0xb3, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x3b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x72, 0x62, 0x61, 0x63, 0x2e, 0x61, 0x75, 0x64,
+	0x69, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x5d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x62, 0x61,
+	0x63, 0x2f, 0x61, 0x75, 0x64, 0x69, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x73, 0x2f,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/cert.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/cert.pb.go
index 50e6f3745ae..84edfea54a9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/cert.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/cert.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/transport_sockets/tls/v3/cert.proto
 
 package tlsv3
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.go
index 3eee2a308f9..3890402c720 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/transport_sockets/tls/v3/common.proto
 
 package tlsv3
@@ -201,16 +201,16 @@ type TlsParameters struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Minimum TLS protocol version. By default, it's ``TLSv1_2`` for both clients and servers.
+	// Minimum TLS protocol version. By default, it's “TLSv1_2“ for both clients and servers.
 	//
 	// TLS protocol versions below TLSv1_2 require setting compatible ciphers with the
-	// ``cipher_suites`` setting as the default ciphers no longer include compatible ciphers.
+	// “cipher_suites“ setting as the default ciphers no longer include compatible ciphers.
 	//
 	// .. attention::
 	//
-	//   Using TLS protocol versions below TLSv1_2 has serious security considerations and risks.
+	//	Using TLS protocol versions below TLSv1_2 has serious security considerations and risks.
 	TlsMinimumProtocolVersion TlsParameters_TlsProtocol `protobuf:"varint,1,opt,name=tls_minimum_protocol_version,json=tlsMinimumProtocolVersion,proto3,enum=envoy.extensions.transport_sockets.tls.v3.TlsParameters_TlsProtocol" json:"tls_minimum_protocol_version,omitempty"`
-	// Maximum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_3`` for
+	// Maximum TLS protocol version. By default, it's “TLSv1_2“ for clients and “TLSv1_3“ for
 	// servers.
 	TlsMaximumProtocolVersion TlsParameters_TlsProtocol `protobuf:"varint,2,opt,name=tls_maximum_protocol_version,json=tlsMaximumProtocolVersion,proto3,enum=envoy.extensions.transport_sockets.tls.v3.TlsParameters_TlsProtocol" json:"tls_maximum_protocol_version,omitempty"`
 	// If specified, the TLS listener will only support the specified `cipher list
@@ -226,37 +226,37 @@ type TlsParameters struct {
 	//
 	// .. code-block:: none
 	//
-	//   [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-	//   [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
+	//	[ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
+	//	[ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
 	//
 	// In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default server cipher list is:
 	//
 	// .. code-block:: none
 	//
-	//   ECDHE-ECDSA-AES128-GCM-SHA256
-	//   ECDHE-RSA-AES128-GCM-SHA256
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
+	//	ECDHE-ECDSA-AES128-GCM-SHA256
+	//	ECDHE-RSA-AES128-GCM-SHA256
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
 	//
 	// In non-FIPS builds, the default client cipher list is:
 	//
 	// .. code-block:: none
 	//
-	//   [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-	//   [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
+	//	[ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
+	//	[ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
 	//
 	// In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default client cipher list is:
 	//
 	// .. code-block:: none
 	//
-	//   ECDHE-ECDSA-AES128-GCM-SHA256
-	//   ECDHE-RSA-AES128-GCM-SHA256
-	//   ECDHE-ECDSA-AES256-GCM-SHA384
-	//   ECDHE-RSA-AES256-GCM-SHA384
+	//	ECDHE-ECDSA-AES128-GCM-SHA256
+	//	ECDHE-RSA-AES128-GCM-SHA256
+	//	ECDHE-ECDSA-AES256-GCM-SHA384
+	//	ECDHE-RSA-AES256-GCM-SHA384
 	CipherSuites []string `protobuf:"bytes,3,rep,name=cipher_suites,json=cipherSuites,proto3" json:"cipher_suites,omitempty"`
 	// If specified, the TLS connection will only support the specified ECDH
 	// curves. If not specified, the default curves will be used.
@@ -265,14 +265,14 @@ type TlsParameters struct {
 	//
 	// .. code-block:: none
 	//
-	//   X25519
-	//   P-256
+	//	X25519
+	//	P-256
 	//
 	// In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default curve is:
 	//
 	// .. code-block:: none
 	//
-	//   P-256
+	//	P-256
 	EcdhCurves []string `protobuf:"bytes,4,rep,name=ecdh_curves,json=ecdhCurves,proto3" json:"ecdh_curves,omitempty"`
 	// If specified, the TLS connection will only support the specified signature algorithms.
 	// The list is ordered by preference.
@@ -282,32 +282,32 @@ type TlsParameters struct {
 	//
 	// .. code-block:: none
 	//
-	//   ecdsa_secp256r1_sha256
-	//   rsa_pss_rsae_sha256
-	//   rsa_pkcs1_sha256
-	//   ecdsa_secp384r1_sha384
-	//   rsa_pss_rsae_sha384
-	//   rsa_pkcs1_sha384
-	//   rsa_pss_rsae_sha512
-	//   rsa_pkcs1_sha512
-	//   rsa_pkcs1_sha1
+	//	ecdsa_secp256r1_sha256
+	//	rsa_pss_rsae_sha256
+	//	rsa_pkcs1_sha256
+	//	ecdsa_secp384r1_sha384
+	//	rsa_pss_rsae_sha384
+	//	rsa_pkcs1_sha384
+	//	rsa_pss_rsae_sha512
+	//	rsa_pkcs1_sha512
+	//	rsa_pkcs1_sha1
 	//
 	// Signature algorithms supported by BoringSSL (may be out of date):
 	//
 	// .. code-block:: none
 	//
-	//   rsa_pkcs1_sha256
-	//   rsa_pkcs1_sha384
-	//   rsa_pkcs1_sha512
-	//   ecdsa_secp256r1_sha256
-	//   ecdsa_secp384r1_sha384
-	//   ecdsa_secp521r1_sha512
-	//   rsa_pss_rsae_sha256
-	//   rsa_pss_rsae_sha384
-	//   rsa_pss_rsae_sha512
-	//   ed25519
-	//   rsa_pkcs1_sha1
-	//   ecdsa_sha1
+	//	rsa_pkcs1_sha256
+	//	rsa_pkcs1_sha384
+	//	rsa_pkcs1_sha512
+	//	ecdsa_secp256r1_sha256
+	//	ecdsa_secp384r1_sha384
+	//	ecdsa_secp521r1_sha512
+	//	rsa_pss_rsae_sha256
+	//	rsa_pss_rsae_sha384
+	//	rsa_pss_rsae_sha512
+	//	ed25519
+	//	rsa_pkcs1_sha1
+	//	ecdsa_sha1
 	SignatureAlgorithms []string `protobuf:"bytes,5,rep,name=signature_algorithms,json=signatureAlgorithms,proto3" json:"signature_algorithms,omitempty"`
 }
 
@@ -392,8 +392,13 @@ type PrivateKeyProvider struct {
 	// Private key method provider specific configuration.
 	//
 	// Types that are assignable to ConfigType:
+	//
 	//	*PrivateKeyProvider_TypedConfig
 	ConfigType isPrivateKeyProvider_ConfigType `protobuf_oneof:"config_type"`
+	// If the private key provider isn't available (eg. the required hardware capability doesn't existed),
+	// Envoy will fallback to the BoringSSL default implementation when the “fallback“ is true.
+	// The default value is “false“.
+	Fallback bool `protobuf:"varint,4,opt,name=fallback,proto3" json:"fallback,omitempty"`
 }
 
 func (x *PrivateKeyProvider) Reset() {
@@ -449,6 +454,13 @@ func (x *PrivateKeyProvider) GetTypedConfig() *any1.Any {
 	return nil
 }
 
+func (x *PrivateKeyProvider) GetFallback() bool {
+	if x != nil {
+		return x.Fallback
+	}
+	return false
+}
+
 type isPrivateKeyProvider_ConfigType interface {
 	isPrivateKeyProvider_ConfigType()
 }
@@ -467,45 +479,45 @@ type TlsCertificate struct {
 
 	// The TLS certificate chain.
 	//
-	// If ``certificate_chain`` is a filesystem path, a watch will be added to the
+	// If “certificate_chain“ is a filesystem path, a watch will be added to the
 	// parent directory for any file moves to support rotation. This currently
-	// only applies to dynamic secrets, when the ``TlsCertificate`` is delivered via
+	// only applies to dynamic secrets, when the “TlsCertificate“ is delivered via
 	// SDS.
 	CertificateChain *v3.DataSource `protobuf:"bytes,1,opt,name=certificate_chain,json=certificateChain,proto3" json:"certificate_chain,omitempty"`
 	// The TLS private key.
 	//
-	// If ``private_key`` is a filesystem path, a watch will be added to the parent
+	// If “private_key“ is a filesystem path, a watch will be added to the parent
 	// directory for any file moves to support rotation. This currently only
-	// applies to dynamic secrets, when the ``TlsCertificate`` is delivered via SDS.
+	// applies to dynamic secrets, when the “TlsCertificate“ is delivered via SDS.
 	PrivateKey *v3.DataSource `protobuf:"bytes,2,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
-	// ``Pkcs12`` data containing TLS certificate, chain, and private key.
+	// “Pkcs12“ data containing TLS certificate, chain, and private key.
 	//
-	// If ``pkcs12`` is a filesystem path, the file will be read, but no watch will
-	// be added to the parent directory, since ``pkcs12`` isn't used by SDS.
-	// This field is mutually exclusive with ``certificate_chain``, ``private_key`` and ``private_key_provider``.
-	// This can't be marked as ``oneof`` due to API compatibility reasons. Setting
+	// If “pkcs12“ is a filesystem path, the file will be read, but no watch will
+	// be added to the parent directory, since “pkcs12“ isn't used by SDS.
+	// This field is mutually exclusive with “certificate_chain“, “private_key“ and “private_key_provider“.
+	// This can't be marked as “oneof“ due to API compatibility reasons. Setting
 	// both :ref:`private_key <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>`,
 	// :ref:`certificate_chain <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.certificate_chain>`,
 	// or :ref:`private_key_provider <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key_provider>`
 	// and :ref:`pkcs12 <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.pkcs12>`
 	// fields will result in an error. Use :ref:`password
 	// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.password>`
-	// to specify the password to unprotect the ``PKCS12`` data, if necessary.
+	// to specify the password to unprotect the “PKCS12“ data, if necessary.
 	Pkcs12 *v3.DataSource `protobuf:"bytes,8,opt,name=pkcs12,proto3" json:"pkcs12,omitempty"`
-	// If specified, updates of file-based ``certificate_chain`` and ``private_key``
+	// If specified, updates of file-based “certificate_chain“ and “private_key“
 	// sources will be triggered by this watch. The certificate/key pair will be
 	// read together and validated for atomic read consistency (i.e. no
 	// intervening modification occurred between cert/key read, verified by file
 	// hash comparisons). This allows explicit control over the path watched, by
 	// default the parent directories of the filesystem paths in
-	// ``certificate_chain`` and ``private_key`` are watched if this field is not
-	// specified. This only applies when a ``TlsCertificate`` is delivered by SDS
+	// “certificate_chain“ and “private_key“ are watched if this field is not
+	// specified. This only applies when a “TlsCertificate“ is delivered by SDS
 	// with references to filesystem paths. See the :ref:`SDS key rotation
 	// <sds_key_rotation>` documentation for further details.
 	WatchedDirectory *v3.WatchedDirectory `protobuf:"bytes,7,opt,name=watched_directory,json=watchedDirectory,proto3" json:"watched_directory,omitempty"`
 	// BoringSSL private key method provider. This is an alternative to :ref:`private_key
 	// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` field. This can't be
-	// marked as ``oneof`` due to API compatibility reasons. Setting both :ref:`private_key
+	// marked as “oneof“ due to API compatibility reasons. Setting both :ref:`private_key
 	// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` and
 	// :ref:`private_key_provider
 	// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key_provider>` fields will result in an
@@ -515,8 +527,8 @@ type TlsCertificate struct {
 	// TLS private key is not password encrypted.
 	Password *v3.DataSource `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"`
 	// The OCSP response to be stapled with this certificate during the handshake.
-	// The response must be DER-encoded and may only be  provided via ``filename`` or
-	// ``inline_bytes``. The response may pertain to only one certificate.
+	// The response must be DER-encoded and may only be  provided via “filename“ or
+	// “inline_bytes“. The response may pertain to only one certificate.
 	OcspStaple *v3.DataSource `protobuf:"bytes,4,opt,name=ocsp_staple,json=ocspStaple,proto3" json:"ocsp_staple,omitempty"`
 	// [#not-implemented-hide:]
 	SignedCertificateTimestamp []*v3.DataSource `protobuf:"bytes,5,rep,name=signed_certificate_timestamp,json=signedCertificateTimestamp,proto3" json:"signed_certificate_timestamp,omitempty"`
@@ -626,18 +638,18 @@ type TlsSessionTicketKeys struct {
 	// or on different hosts.
 	//
 	// Each key must contain exactly 80 bytes of cryptographically-secure random data. For
-	// example, the output of ``openssl rand 80``.
+	// example, the output of “openssl rand 80“.
 	//
 	// .. attention::
 	//
-	//   Using this feature has serious security considerations and risks. Improper handling of keys
-	//   may result in loss of secrecy in connections, even if ciphers supporting perfect forward
-	//   secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
-	//   discussion. To minimize the risk, you must:
+	//	Using this feature has serious security considerations and risks. Improper handling of keys
+	//	may result in loss of secrecy in connections, even if ciphers supporting perfect forward
+	//	secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
+	//	discussion. To minimize the risk, you must:
 	//
-	//   * Keep the session ticket keys at least as secure as your TLS certificate private keys
-	//   * Rotate session ticket keys at least daily, and preferably hourly
-	//   * Always generate keys using a cryptographically-secure random data source
+	//	* Keep the session ticket keys at least as secure as your TLS certificate private keys
+	//	* Rotate session ticket keys at least daily, and preferably hourly
+	//	* Always generate keys using a cryptographically-secure random data source
 	Keys []*v3.DataSource `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"`
 }
 
@@ -839,30 +851,30 @@ type CertificateValidationContext struct {
 	// See :ref:`the TLS overview <arch_overview_ssl_enabling_verification>` for a list of common
 	// system CA locations.
 	//
-	// If ``trusted_ca`` is a filesystem path, a watch will be added to the parent
+	// If “trusted_ca“ is a filesystem path, a watch will be added to the parent
 	// directory for any file moves to support rotation. This currently only
-	// applies to dynamic secrets, when the ``CertificateValidationContext`` is
+	// applies to dynamic secrets, when the “CertificateValidationContext“ is
 	// delivered via SDS.
 	//
-	// X509_V_FLAG_PARTIAL_CHAIN is set by default, so non-root/intermediate ca certificate in ``trusted_ca``
+	// X509_V_FLAG_PARTIAL_CHAIN is set by default, so non-root/intermediate ca certificate in “trusted_ca“
 	// can be treated as trust anchor as well. It allows verification with building valid partial chain instead
 	// of a full chain.
 	//
-	// Only one of ``trusted_ca`` and ``ca_certificate_provider_instance`` may be specified.
+	// Only one of “trusted_ca“ and “ca_certificate_provider_instance“ may be specified.
 	//
 	// [#next-major-version: This field and watched_directory below should ideally be moved into a
 	// separate sub-message, since there's no point in specifying the latter field without this one.]
 	TrustedCa *v3.DataSource `protobuf:"bytes,1,opt,name=trusted_ca,json=trustedCa,proto3" json:"trusted_ca,omitempty"`
 	// Certificate provider instance for fetching TLS certificates.
 	//
-	// Only one of ``trusted_ca`` and ``ca_certificate_provider_instance`` may be specified.
+	// Only one of “trusted_ca“ and “ca_certificate_provider_instance“ may be specified.
 	// [#not-implemented-hide:]
 	CaCertificateProviderInstance *CertificateProviderPluginInstance `protobuf:"bytes,13,opt,name=ca_certificate_provider_instance,json=caCertificateProviderInstance,proto3" json:"ca_certificate_provider_instance,omitempty"`
-	// If specified, updates of a file-based ``trusted_ca`` source will be triggered
+	// If specified, updates of a file-based “trusted_ca“ source will be triggered
 	// by this watch. This allows explicit control over the path watched, by
-	// default the parent directory of the filesystem path in ``trusted_ca`` is
+	// default the parent directory of the filesystem path in “trusted_ca“ is
 	// watched if this field is not specified. This only applies when a
-	// ``CertificateValidationContext`` is delivered by SDS with references to
+	// “CertificateValidationContext“ is delivered by SDS with references to
 	// filesystem paths. See the :ref:`SDS key rotation <sds_key_rotation>`
 	// documentation for further details.
 	WatchedDirectory *v3.WatchedDirectory `protobuf:"bytes,11,opt,name=watched_directory,json=watchedDirectory,proto3" json:"watched_directory,omitempty"`
@@ -875,11 +887,11 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -noout -pubkey
-	//     | openssl pkey -pubin -outform DER
-	//     | openssl dgst -sha256 -binary
-	//     | openssl enc -base64
-	//   NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
+	//	$ openssl x509 -in path/to/client.crt -noout -pubkey
+	//	  | openssl pkey -pubin -outform DER
+	//	  | openssl dgst -sha256 -binary
+	//	  | openssl enc -base64
+	//	NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
 	//
 	// This is the format used in HTTP Public Key Pinning.
 	//
@@ -892,10 +904,10 @@ type CertificateValidationContext struct {
 	//
 	// .. attention::
 	//
-	//   This option is preferred over :ref:`verify_certificate_hash
-	//   <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`,
-	//   because SPKI is tied to a private key, so it doesn't change when the certificate
-	//   is renewed using the same private key.
+	//	This option is preferred over :ref:`verify_certificate_hash
+	//	<envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`,
+	//	because SPKI is tied to a private key, so it doesn't change when the certificate
+	//	is renewed using the same private key.
 	VerifyCertificateSpki []string `protobuf:"bytes,3,rep,name=verify_certificate_spki,json=verifyCertificateSpki,proto3" json:"verify_certificate_spki,omitempty"`
 	// An optional list of hex-encoded SHA-256 hashes. If specified, Envoy will verify that
 	// the SHA-256 of the DER-encoded presented certificate matches one of the specified values.
@@ -904,16 +916,16 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
-	//   df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
+	//	$ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
+	//	df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
 	//
 	// A long hex-encoded and colon-separated SHA-256 (a.k.a. "fingerprint") of the certificate
 	// can be generated with the following command:
 	//
 	// .. code-block:: bash
 	//
-	//   $ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
-	//   DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
+	//	$ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
+	//	DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
 	//
 	// Both of those formats are acceptable.
 	//
@@ -936,16 +948,16 @@ type CertificateValidationContext struct {
 	//
 	// .. code-block:: yaml
 	//
-	//  match_typed_subject_alt_names:
-	//  - san_type: DNS
-	//    matcher:
-	//      exact: "api.example.com"
+	//	match_typed_subject_alt_names:
+	//	- san_type: DNS
+	//	  matcher:
+	//	    exact: "api.example.com"
 	//
 	// .. attention::
 	//
-	//   Subject Alternative Names are easily spoofable and verifying only them is insecure,
-	//   therefore this option must be used together with :ref:`trusted_ca
-	//   <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
+	//	Subject Alternative Names are easily spoofable and verifying only them is insecure,
+	//	therefore this option must be used together with :ref:`trusted_ca
+	//	<envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
 	MatchTypedSubjectAltNames []*SubjectAltNameMatcher `protobuf:"bytes,15,rep,name=match_typed_subject_alt_names,json=matchTypedSubjectAltNames,proto3" json:"match_typed_subject_alt_names,omitempty"`
 	// This field is deprecated in favor of
 	// :ref:`match_typed_subject_alt_names
@@ -954,7 +966,7 @@ type CertificateValidationContext struct {
 	// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_typed_subject_alt_names>`
 	// are specified, the former (deprecated field) is ignored.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/common.proto.
 	MatchSubjectAltNames []*v31.StringMatcher `protobuf:"bytes,9,rep,name=match_subject_alt_names,json=matchSubjectAltNames,proto3" json:"match_subject_alt_names,omitempty"`
 	// [#not-implemented-hide:] Must present signed certificate time-stamp.
 	RequireSignedCertificateTimestamp *wrappers.BoolValue `protobuf:"bytes,6,opt,name=require_signed_certificate_timestamp,json=requireSignedCertificateTimestamp,proto3" json:"require_signed_certificate_timestamp,omitempty"`
@@ -969,6 +981,11 @@ type CertificateValidationContext struct {
 	// from that chain. This default behavior can be altered by setting
 	// :ref:`only_verify_leaf_cert_crl <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.only_verify_leaf_cert_crl>` to
 	// true.
+	//
+	// If “crl“ is a filesystem path, a watch will be added to the parent
+	// directory for any file moves to support rotation. This currently only
+	// applies to dynamic secrets, when the “CertificateValidationContext“ is
+	// delivered via SDS.
 	Crl *v3.DataSource `protobuf:"bytes,7,opt,name=crl,proto3" json:"crl,omitempty"`
 	// If specified, Envoy will not reject expired certificates.
 	AllowExpiredCertificate bool `protobuf:"varint,8,opt,name=allow_expired_certificate,json=allowExpiredCertificate,proto3" json:"allow_expired_certificate,omitempty"`
@@ -984,12 +1001,10 @@ type CertificateValidationContext struct {
 	// certificate chain will be subject to validation by :ref:`CRL <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.crl>`.
 	OnlyVerifyLeafCertCrl bool `protobuf:"varint,14,opt,name=only_verify_leaf_cert_crl,json=onlyVerifyLeafCertCrl,proto3" json:"only_verify_leaf_cert_crl,omitempty"`
 	// Defines maximum depth of a certificate chain accepted in verification, the default limit is 100, though this can be system-dependent.
-	// This number does not include the leaf, so a depth of 1 allows the leaf and one CA certificate. If a trusted issuer appears in the chain,
-	// but in a depth larger than configured, the certificate validation will fail.
-	// See `BoringSSL SSL_CTX_set_verify_depth <https://commondatastorage.googleapis.com/chromium-boringssl-docs/ssl.h.html#SSL_CTX_set_verify_depth>`
-	// If you use OpenSSL, its behavior is different from BoringSSL, this will define a limit on the number of certificates between the end-entity and trust-anchor certificates.
-	// Neither the end-entity nor the trust-anchor certificates count against depth.
-	// See `OpenSSL SSL set_verify_depth <https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_verify_depth.html>`_.
+	// This number does not include the leaf but includes the trust anchor, so a depth of 1 allows the leaf and one CA certificate. If a trusted issuer
+	// appears in the chain, but in a depth larger than configured, the certificate validation will fail.
+	// This matches the semantics of “SSL_CTX_set_verify_depth“ in OpenSSL 1.0.x and older versions of BoringSSL. It differs from “SSL_CTX_set_verify_depth“
+	// in OpenSSL 1.1.x and newer versions of BoringSSL in that the trust anchor is included.
 	// Trusted issues are specified by setting :ref:`trusted_ca <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`
 	MaxVerifyDepth *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=max_verify_depth,json=maxVerifyDepth,proto3" json:"max_verify_depth,omitempty"`
 }
@@ -1068,7 +1083,7 @@ func (x *CertificateValidationContext) GetMatchTypedSubjectAltNames() []*Subject
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/common.proto.
 func (x *CertificateValidationContext) GetMatchSubjectAltNames() []*v31.StringMatcher {
 	if x != nil {
 		return x.MatchSubjectAltNames
@@ -1191,7 +1206,7 @@ var file_envoy_extensions_transport_sockets_tls_v3_common_proto_rawDesc = []byte
 	0x0a, 0x07, 0x54, 0x4c, 0x53, 0x76, 0x31, 0x5f, 0x33, 0x10, 0x04, 0x3a, 0x26, 0x9a, 0xc5, 0x88,
 	0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
 	0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-	0x65, 0x72, 0x73, 0x22, 0xcf, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b,
+	0x65, 0x72, 0x73, 0x22, 0xeb, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b,
 	0x65, 0x79, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x0d, 0x70, 0x72,
 	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x76,
@@ -1199,199 +1214,201 @@ var file_envoy_extensions_transport_sockets_tls_v3_common_proto_rawDesc = []byte
 	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
 	0x2e, 0x41, 0x6e, 0x79, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x48, 0x00, 0x52, 0x0b,
-	0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2b, 0x9a, 0xc5, 0x88,
-	0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xc8, 0x05, 0x0a, 0x0e, 0x54, 0x6c, 0x73, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x4d, 0x0a, 0x11, 0x63, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x10, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x49, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06,
-	0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b,
-	0x65, 0x79, 0x12, 0x40, 0x0a, 0x06, 0x70, 0x6b, 0x63, 0x73, 0x31, 0x32, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x06, 0x70, 0x6b,
-	0x63, 0x73, 0x31, 0x32, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64,
-	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x6f, 0x0a, 0x14, 0x70, 0x72, 0x69,
-	0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73,
-	0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x12, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b,
-	0x65, 0x79, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x08, 0x70, 0x61,
-	0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06,
-	0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x12, 0x41, 0x0a, 0x0b, 0x6f, 0x63, 0x73, 0x70, 0x5f, 0x73, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0a, 0x6f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61,
-	0x70, 0x6c, 0x65, 0x12, 0x62, 0x0a, 0x1c, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x1a, 0x73, 0x69, 0x67,
-	0x6e, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20,
+	0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x66,
+	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x66,
+	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74,
-	0x68, 0x2e, 0x54, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x22, 0x8b, 0x01, 0x0a, 0x14, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x44, 0x0a, 0x04, 0x6b, 0x65, 0x79,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44,
-	0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0e, 0xfa, 0x42, 0x05, 0x92, 0x01,
-	0x02, 0x08, 0x01, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x3a,
-	0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x22, 0x73,
-	0x0a, 0x21, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e,
-	0x61, 0x6d, 0x65, 0x22, 0xa4, 0x02, 0x0a, 0x15, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41,
-	0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6f, 0x0a,
-	0x08, 0x73, 0x61, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x48, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x6a,
-	0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x53, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x82, 0x01,
-	0x04, 0x10, 0x01, 0x20, 0x00, 0x52, 0x07, 0x73, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x48,
-	0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x22, 0x50, 0x0a, 0x07, 0x53, 0x61, 0x6e, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x41, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a,
-	0x05, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4e, 0x53, 0x10,
-	0x02, 0x12, 0x07, 0x0a, 0x03, 0x55, 0x52, 0x49, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x50,
-	0x5f, 0x41, 0x44, 0x44, 0x52, 0x45, 0x53, 0x53, 0x10, 0x04, 0x22, 0x90, 0x0c, 0x0a, 0x1c, 0x43,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x57, 0x0a, 0x0a, 0x74,
-	0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x68, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x22, 0xc8, 0x05, 0x0a, 0x0e, 0x54, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x12, 0x4d, 0x0a, 0x11, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
 	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x42, 0x16, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x10, 0x12, 0x0e, 0x63, 0x61, 0x5f, 0x63, 0x65,
-	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x74, 0x72, 0x75, 0x73, 0x74,
-	0x65, 0x64, 0x43, 0x61, 0x12, 0xad, 0x01, 0x0a, 0x20, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x4c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x50,
-	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x42, 0x16, 0xf2,
+	0x65, 0x52, 0x10, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x68,
+	0x61, 0x69, 0x6e, 0x12, 0x49, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b,
+	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4,
+	0x02, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x40,
+	0x0a, 0x06, 0x70, 0x6b, 0x63, 0x73, 0x31, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x06, 0x70, 0x6b, 0x63, 0x73, 0x31, 0x32,
+	0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x6f, 0x0a, 0x14, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
+	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e,
+	0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x52, 0x12, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f,
+	0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4,
+	0x02, 0x01, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x41, 0x0a, 0x0b,
+	0x6f, 0x63, 0x73, 0x70, 0x5f, 0x73, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x52, 0x0a, 0x6f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x12,
+	0x62, 0x0a, 0x1c, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74,
+	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x1a, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x54, 0x6c,
+	0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x22, 0x8b, 0x01, 0x0a,
+	0x14, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x44, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0e, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0xb8,
+	0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x3a, 0x2d, 0x9a, 0xc5, 0x88,
+	0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
+	0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x22, 0x73, 0x0a, 0x21, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12,
+	0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22,
+	0xa4, 0x02, 0x0a, 0x15, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61,
+	0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6f, 0x0a, 0x08, 0x73, 0x61, 0x6e,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x48, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
+	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41,
+	0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53, 0x61,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x82, 0x01, 0x04, 0x10, 0x01, 0x20,
+	0x00, 0x52, 0x07, 0x73, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x48, 0x0a, 0x07, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x22, 0x50, 0x0a, 0x07, 0x53, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x18, 0x0a, 0x14, 0x53, 0x41, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x4d, 0x41,
+	0x49, 0x4c, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4e, 0x53, 0x10, 0x02, 0x12, 0x07, 0x0a,
+	0x03, 0x55, 0x52, 0x49, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x50, 0x5f, 0x41, 0x44, 0x44,
+	0x52, 0x45, 0x53, 0x53, 0x10, 0x04, 0x22, 0x90, 0x0c, 0x0a, 0x1c, 0x43, 0x65, 0x72, 0x74, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x57, 0x0a, 0x0a, 0x74, 0x72, 0x75, 0x73, 0x74,
+	0x65, 0x64, 0x5f, 0x63, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x16, 0xf2,
 	0x98, 0xfe, 0x8f, 0x05, 0x10, 0x12, 0x0e, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x1d, 0x63, 0x61, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64,
-	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x17, 0x76, 0x65, 0x72,
-	0x69, 0x66, 0x79, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f,
-	0x73, 0x70, 0x6b, 0x69, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x92,
-	0x01, 0x08, 0x22, 0x06, 0x72, 0x04, 0x10, 0x2c, 0x28, 0x2c, 0x52, 0x15, 0x76, 0x65, 0x72, 0x69,
-	0x66, 0x79, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x53, 0x70, 0x6b,
-	0x69, 0x12, 0x46, 0x0a, 0x17, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x63, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x09, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x92, 0x01, 0x08, 0x22, 0x06, 0x72, 0x04, 0x10, 0x40,
-	0x28, 0x5f, 0x52, 0x15, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x82, 0x01, 0x0a, 0x1d, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63,
-	0x74, 0x5f, 0x61, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75,
-	0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x52, 0x19, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x64, 0x53,
-	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x68,
-	0x0a, 0x17, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f,
-	0x61, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
-	0x2e, 0x30, 0x52, 0x14, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
-	0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x6b, 0x0a, 0x24, 0x72, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x21, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x65,
-	0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x32, 0x0a, 0x03, 0x63, 0x72, 0x6c, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x52, 0x03, 0x63, 0x72, 0x6c, 0x12, 0x3a, 0x0a, 0x19, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0xa2, 0x01, 0x0a, 0x18, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f,
-	0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c,
-	0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x16, 0x74, 0x72, 0x75, 0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x56, 0x65,
-	0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x62, 0x0a, 0x17, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x43, 0x61,
+	0x12, 0xad, 0x01, 0x0a, 0x20, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
+	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69,
+	0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x42, 0x16, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x10, 0x12, 0x0e, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x52, 0x1d, 0x63, 0x61, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x15, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x56,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x38,
-	0x0a, 0x19, 0x6f, 0x6e, 0x6c, 0x79, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x6c, 0x65,
-	0x61, 0x66, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x63, 0x72, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x15, 0x6f, 0x6e, 0x6c, 0x79, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4c, 0x65, 0x61,
-	0x66, 0x43, 0x65, 0x72, 0x74, 0x43, 0x72, 0x6c, 0x12, 0x4f, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f,
-	0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x64, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x56, 0x65,
-	0x72, 0x69, 0x66, 0x79, 0x44, 0x65, 0x70, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x16, 0x54, 0x72, 0x75,
-	0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x12, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x54, 0x52,
-	0x55, 0x53, 0x54, 0x5f, 0x43, 0x48, 0x41, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x41,
-	0x43, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x55, 0x4e, 0x54, 0x52, 0x55, 0x53, 0x54, 0x45, 0x44, 0x10,
-	0x01, 0x3a, 0x35, 0x9a, 0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04,
-	0x08, 0x05, 0x10, 0x06, 0x52, 0x17, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x73, 0x75, 0x62,
-	0x6a, 0x65, 0x63, 0x74, 0x5f, 0x61, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0xa8, 0x01,
-	0x0a, 0x37, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x46, 0x0a, 0x17, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f,
+	0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x6b, 0x69,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x92, 0x01, 0x08, 0x22, 0x06,
+	0x72, 0x04, 0x10, 0x2c, 0x28, 0x2c, 0x52, 0x15, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x53, 0x70, 0x6b, 0x69, 0x12, 0x46, 0x0a,
+	0x17, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x0e,
+	0xfa, 0x42, 0x0b, 0x92, 0x01, 0x08, 0x22, 0x06, 0x72, 0x04, 0x10, 0x40, 0x28, 0x5f, 0x52, 0x15,
+	0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x82, 0x01, 0x0a, 0x1d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f,
+	0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x61, 0x6c,
+	0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
 	0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63,
+	0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52,
+	0x19, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65,
+	0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x68, 0x0a, 0x17, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x5f, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x61, 0x6c, 0x74, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x12, 0x6b, 0x0a, 0x24, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f,
+	0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x21,
+	0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x12, 0x32, 0x0a, 0x03, 0x63, 0x72, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x52, 0x03, 0x63, 0x72, 0x6c, 0x12, 0x3a, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x65,
+	0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x45,
+	0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x12, 0xa2, 0x01, 0x0a, 0x18, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69,
+	0x6e, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x5e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
+	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
+	0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x54, 0x72,
+	0x75, 0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x16,
+	0x74, 0x72, 0x75, 0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x62, 0x0a, 0x17, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54,
+	0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x52, 0x15, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x56, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x6f, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x38, 0x0a, 0x19, 0x6f, 0x6e,
+	0x6c, 0x79, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x63,
+	0x65, 0x72, 0x74, 0x5f, 0x63, 0x72, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x6f,
+	0x6e, 0x6c, 0x79, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72,
+	0x74, 0x43, 0x72, 0x6c, 0x12, 0x4f, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x76, 0x65, 0x72, 0x69,
+	0x66, 0x79, 0x5f, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42,
+	0x04, 0x2a, 0x02, 0x18, 0x64, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79,
+	0x44, 0x65, 0x70, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x16, 0x54, 0x72, 0x75, 0x73, 0x74, 0x43, 0x68,
+	0x61, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x16, 0x0a, 0x12, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x54, 0x52, 0x55, 0x53, 0x54, 0x5f,
+	0x43, 0x48, 0x41, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x43, 0x43, 0x45, 0x50,
+	0x54, 0x5f, 0x55, 0x4e, 0x54, 0x52, 0x55, 0x53, 0x54, 0x45, 0x44, 0x10, 0x01, 0x3a, 0x35, 0x9a,
+	0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
+	0x74, 0x65, 0x78, 0x74, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06,
+	0x52, 0x17, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
+	0x5f, 0x61, 0x6c, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0xa8, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x37, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x74,
+	0x6c, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go
index a9ddc8f57e4..83c576c1d77 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go
@@ -190,6 +190,8 @@ func (m *PrivateKeyProvider) validate(all bool) error {
 		errors = append(errors, err)
 	}
 
+	// no validation rules for Fallback
+
 	switch v := m.ConfigType.(type) {
 	case *PrivateKeyProvider_TypedConfig:
 		if v == nil {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/secret.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/secret.pb.go
index 9bf97896d96..c126f0de7ad 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/secret.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/secret.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/transport_sockets/tls/v3/secret.proto
 
 package tlsv3
@@ -138,6 +138,7 @@ type Secret struct {
 	// Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Types that are assignable to Type:
+	//
 	//	*Secret_TlsCertificate
 	//	*Secret_SessionTicketKeys
 	//	*Secret_ValidationContext
@@ -321,18 +322,18 @@ var file_envoy_extensions_transport_sockets_tls_v3_secret_proto_rawDesc = []byte
 	0x48, 0x00, 0x52, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x63, 0x72, 0x65,
 	0x74, 0x3a, 0x1f, 0x9a, 0xc5, 0x88, 0x1e, 0x1a, 0x0a, 0x18, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0xa8, 0x01, 0x0a, 0x37, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
-	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e,
-	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
-	0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0xa8, 0x01, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x37, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x0b,
+	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
+	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b,
+	0x74, 0x6c, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.go
index d6a43aaaf19..8602c2670d4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/transport_sockets/tls/v3/tls.proto
 
 package tlsv3
@@ -89,6 +89,7 @@ func (DownstreamTlsContext_OcspStaplePolicy) EnumDescriptor() ([]byte, []int) {
 	return file_envoy_extensions_transport_sockets_tls_v3_tls_proto_rawDescGZIP(), []int{1, 0}
 }
 
+// [#next-free-field: 6]
 type UpstreamTlsContext struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -98,9 +99,9 @@ type UpstreamTlsContext struct {
 	//
 	// .. attention::
 	//
-	//   Server certificate verification is not enabled by default. Configure
-	//   :ref:`trusted_ca<envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>` to enable
-	//   verification.
+	//	Server certificate verification is not enabled by default. Configure
+	//	:ref:`trusted_ca<envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>` to enable
+	//	verification.
 	CommonTlsContext *CommonTlsContext `protobuf:"bytes,1,opt,name=common_tls_context,json=commonTlsContext,proto3" json:"common_tls_context,omitempty"`
 	// SNI string to use when creating TLS backend connections.
 	Sni string `protobuf:"bytes,2,opt,name=sni,proto3" json:"sni,omitempty"`
@@ -108,13 +109,19 @@ type UpstreamTlsContext struct {
 	//
 	// .. attention::
 	//
-	//   TLS renegotiation is considered insecure and shouldn't be used unless absolutely necessary.
+	//	TLS renegotiation is considered insecure and shouldn't be used unless absolutely necessary.
 	AllowRenegotiation bool `protobuf:"varint,3,opt,name=allow_renegotiation,json=allowRenegotiation,proto3" json:"allow_renegotiation,omitempty"`
 	// Maximum number of session keys (Pre-Shared Keys for TLSv1.3+, Session IDs and Session Tickets
 	// for TLSv1.2 and older) to store for the purpose of session resumption.
 	//
 	// Defaults to 1, setting this to 0 disables session resumption.
 	MaxSessionKeys *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_session_keys,json=maxSessionKeys,proto3" json:"max_session_keys,omitempty"`
+	// This field is used to control the enforcement, whereby the handshake will fail if the keyUsage extension
+	// is present and incompatible with the TLS usage. Currently, the default value is false (i.e., enforcement off)
+	// but it is expected to be changed to true by default in a future release.
+	// “ssl.was_key_usage_invalid“ in :ref:`listener metrics <config_listener_stats>` will be set for certificate
+	// configurations that would fail if this option were set to true.
+	EnforceRsaKeyUsage *wrappers.BoolValue `protobuf:"bytes,5,opt,name=enforce_rsa_key_usage,json=enforceRsaKeyUsage,proto3" json:"enforce_rsa_key_usage,omitempty"`
 }
 
 func (x *UpstreamTlsContext) Reset() {
@@ -177,7 +184,14 @@ func (x *UpstreamTlsContext) GetMaxSessionKeys() *wrappers.UInt32Value {
 	return nil
 }
 
-// [#next-free-field: 10]
+func (x *UpstreamTlsContext) GetEnforceRsaKeyUsage() *wrappers.BoolValue {
+	if x != nil {
+		return x.EnforceRsaKeyUsage
+	}
+	return nil
+}
+
+// [#next-free-field: 11]
 type DownstreamTlsContext struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -192,11 +206,15 @@ type DownstreamTlsContext struct {
 	// [#not-implemented-hide:]
 	RequireSni *wrappers.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"`
 	// Types that are assignable to SessionTicketKeysType:
+	//
 	//	*DownstreamTlsContext_SessionTicketKeys
 	//	*DownstreamTlsContext_SessionTicketKeysSdsSecretConfig
 	//	*DownstreamTlsContext_DisableStatelessSessionResumption
 	SessionTicketKeysType isDownstreamTlsContext_SessionTicketKeysType `protobuf_oneof:"session_ticket_keys_type"`
-	// If specified, ``session_timeout`` will change the maximum lifetime (in seconds) of the TLS session.
+	// If set to true, the TLS server will not maintain a session cache of TLS sessions. (This is
+	// relevant only for TLSv1.2 and earlier.)
+	DisableStatefulSessionResumption bool `protobuf:"varint,10,opt,name=disable_stateful_session_resumption,json=disableStatefulSessionResumption,proto3" json:"disable_stateful_session_resumption,omitempty"`
+	// If specified, “session_timeout“ will change the maximum lifetime (in seconds) of the TLS session.
 	// Currently this value is used as a hint for the `TLS session ticket lifetime (for TLSv1.2) <https://tools.ietf.org/html/rfc5077#section-5.6>`_.
 	// Only seconds can be specified (fractional seconds are ignored).
 	SessionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"`
@@ -291,6 +309,13 @@ func (x *DownstreamTlsContext) GetDisableStatelessSessionResumption() bool {
 	return false
 }
 
+func (x *DownstreamTlsContext) GetDisableStatefulSessionResumption() bool {
+	if x != nil {
+		return x.DisableStatefulSessionResumption
+	}
+	return false
+}
+
 func (x *DownstreamTlsContext) GetSessionTimeout() *duration.Duration {
 	if x != nil {
 		return x.SessionTimeout
@@ -429,8 +454,8 @@ type CommonTlsContext struct {
 	// :ref:`Multiple TLS certificates <arch_overview_ssl_cert_select>` can be associated with the
 	// same context to allow both RSA and ECDSA certificates and support SNI-based selection.
 	//
-	// Only one of ``tls_certificates``, ``tls_certificate_sds_secret_configs``,
-	// and ``tls_certificate_provider_instance`` may be used.
+	// Only one of “tls_certificates“, “tls_certificate_sds_secret_configs“,
+	// and “tls_certificate_provider_instance“ may be used.
 	// [#next-major-version: These mutually exclusive fields should ideally be in a oneof, but it's
 	// not legal to put a repeated field in a oneof. In the next major version, we should rework
 	// this to avoid this problem.]
@@ -441,29 +466,30 @@ type CommonTlsContext struct {
 	// The same number and types of certificates as :ref:`tls_certificates <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificates>`
 	// are valid in the the certificates fetched through this setting.
 	//
-	// Only one of ``tls_certificates``, ``tls_certificate_sds_secret_configs``,
-	// and ``tls_certificate_provider_instance`` may be used.
+	// Only one of “tls_certificates“, “tls_certificate_sds_secret_configs“,
+	// and “tls_certificate_provider_instance“ may be used.
 	// [#next-major-version: These mutually exclusive fields should ideally be in a oneof, but it's
 	// not legal to put a repeated field in a oneof. In the next major version, we should rework
 	// this to avoid this problem.]
 	TlsCertificateSdsSecretConfigs []*SdsSecretConfig `protobuf:"bytes,6,rep,name=tls_certificate_sds_secret_configs,json=tlsCertificateSdsSecretConfigs,proto3" json:"tls_certificate_sds_secret_configs,omitempty"`
 	// Certificate provider instance for fetching TLS certs.
 	//
-	// Only one of ``tls_certificates``, ``tls_certificate_sds_secret_configs``,
-	// and ``tls_certificate_provider_instance`` may be used.
+	// Only one of “tls_certificates“, “tls_certificate_sds_secret_configs“,
+	// and “tls_certificate_provider_instance“ may be used.
 	// [#not-implemented-hide:]
 	TlsCertificateProviderInstance *CertificateProviderPluginInstance `protobuf:"bytes,14,opt,name=tls_certificate_provider_instance,json=tlsCertificateProviderInstance,proto3" json:"tls_certificate_provider_instance,omitempty"`
 	// Certificate provider for fetching TLS certificates.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	TlsCertificateCertificateProvider *CommonTlsContext_CertificateProvider `protobuf:"bytes,9,opt,name=tls_certificate_certificate_provider,json=tlsCertificateCertificateProvider,proto3" json:"tls_certificate_certificate_provider,omitempty"`
 	// Certificate provider instance for fetching TLS certificates.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	TlsCertificateCertificateProviderInstance *CommonTlsContext_CertificateProviderInstance `protobuf:"bytes,11,opt,name=tls_certificate_certificate_provider_instance,json=tlsCertificateCertificateProviderInstance,proto3" json:"tls_certificate_certificate_provider_instance,omitempty"`
 	// Types that are assignable to ValidationContextType:
+	//
 	//	*CommonTlsContext_ValidationContext
 	//	*CommonTlsContext_ValidationContextSdsSecretConfig
 	//	*CommonTlsContext_CombinedValidationContext
@@ -548,7 +574,7 @@ func (x *CommonTlsContext) GetTlsCertificateProviderInstance() *CertificateProvi
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext) GetTlsCertificateCertificateProvider() *CommonTlsContext_CertificateProvider {
 	if x != nil {
 		return x.TlsCertificateCertificateProvider
@@ -556,7 +582,7 @@ func (x *CommonTlsContext) GetTlsCertificateCertificateProvider() *CommonTlsCont
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext) GetTlsCertificateCertificateProviderInstance() *CommonTlsContext_CertificateProviderInstance {
 	if x != nil {
 		return x.TlsCertificateCertificateProviderInstance
@@ -592,7 +618,7 @@ func (x *CommonTlsContext) GetCombinedValidationContext() *CommonTlsContext_Comb
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext) GetValidationContextCertificateProvider() *CommonTlsContext_CertificateProvider {
 	if x, ok := x.GetValidationContextType().(*CommonTlsContext_ValidationContextCertificateProvider); ok {
 		return x.ValidationContextCertificateProvider
@@ -600,7 +626,7 @@ func (x *CommonTlsContext) GetValidationContextCertificateProvider() *CommonTlsC
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext) GetValidationContextCertificateProviderInstance() *CommonTlsContext_CertificateProviderInstance {
 	if x, ok := x.GetValidationContextType().(*CommonTlsContext_ValidationContextCertificateProviderInstance); ok {
 		return x.ValidationContextCertificateProviderInstance
@@ -659,7 +685,7 @@ type CommonTlsContext_ValidationContextCertificateProvider struct {
 	// Certificate provider for fetching validation context.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	ValidationContextCertificateProvider *CommonTlsContext_CertificateProvider `protobuf:"bytes,10,opt,name=validation_context_certificate_provider,json=validationContextCertificateProvider,proto3,oneof"`
 }
 
@@ -667,7 +693,7 @@ type CommonTlsContext_ValidationContextCertificateProviderInstance struct {
 	// Certificate provider instance for fetching validation context.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	ValidationContextCertificateProviderInstance *CommonTlsContext_CertificateProviderInstance `protobuf:"bytes,12,opt,name=validation_context_certificate_provider_instance,json=validationContextCertificateProviderInstance,proto3,oneof"`
 }
 
@@ -708,6 +734,7 @@ type CommonTlsContext_CertificateProvider struct {
 	// This config could be supplied inline or (in future) a named xDS resource.
 	//
 	// Types that are assignable to Config:
+	//
 	//	*CommonTlsContext_CertificateProvider_TypedConfig
 	Config isCommonTlsContext_CertificateProvider_Config `protobuf_oneof:"config"`
 }
@@ -861,16 +888,16 @@ type CommonTlsContext_CombinedCertificateValidationContext struct {
 	// fetched/refreshed over the network asynchronously with respect to the TLS handshake.
 	ValidationContextSdsSecretConfig *SdsSecretConfig `protobuf:"bytes,2,opt,name=validation_context_sds_secret_config,json=validationContextSdsSecretConfig,proto3" json:"validation_context_sds_secret_config,omitempty"`
 	// Certificate provider for fetching CA certs. This will populate the
-	// ``default_validation_context.trusted_ca`` field.
+	// “default_validation_context.trusted_ca“ field.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	ValidationContextCertificateProvider *CommonTlsContext_CertificateProvider `protobuf:"bytes,3,opt,name=validation_context_certificate_provider,json=validationContextCertificateProvider,proto3" json:"validation_context_certificate_provider,omitempty"`
 	// Certificate provider instance for fetching CA certs. This will populate the
-	// ``default_validation_context.trusted_ca`` field.
+	// “default_validation_context.trusted_ca“ field.
 	// [#not-implemented-hide:]
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 	ValidationContextCertificateProviderInstance *CommonTlsContext_CertificateProviderInstance `protobuf:"bytes,4,opt,name=validation_context_certificate_provider_instance,json=validationContextCertificateProviderInstance,proto3" json:"validation_context_certificate_provider_instance,omitempty"`
 }
 
@@ -920,7 +947,7 @@ func (x *CommonTlsContext_CombinedCertificateValidationContext) GetValidationCon
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext_CombinedCertificateValidationContext) GetValidationContextCertificateProvider() *CommonTlsContext_CertificateProvider {
 	if x != nil {
 		return x.ValidationContextCertificateProvider
@@ -928,7 +955,7 @@ func (x *CommonTlsContext_CombinedCertificateValidationContext) GetValidationCon
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/tls.proto.
 func (x *CommonTlsContext_CombinedCertificateValidationContext) GetValidationContextCertificateProviderInstance() *CommonTlsContext_CertificateProviderInstance {
 	if x != nil {
 		return x.ValidationContextCertificateProviderInstance
@@ -968,7 +995,7 @@ var file_envoy_extensions_transport_sockets_tls_v3_tls_proto_rawDesc = []byte{
 	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
 	0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc1, 0x02, 0x0a, 0x12, 0x55,
+	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x03, 0x0a, 0x12, 0x55,
 	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
 	0x74, 0x12, 0x69, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x74, 0x6c, 0x73, 0x5f,
 	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e,
@@ -986,293 +1013,303 @@ var file_envoy_extensions_transport_sockets_tls_v3_tls_proto_rawDesc = []byte{
 	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
 	0x65, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79,
-	0x73, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x70, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0xcb,
-	0x08, 0x0a, 0x14, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x69, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
-	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x52, 0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65,
-	0x78, 0x74, 0x12, 0x58, 0x0a, 0x1a, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x63, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x18, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6c, 0x69, 0x65, 0x6e,
-	0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x3b, 0x0a, 0x0b,
-	0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x73, 0x6e, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x72,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x53, 0x6e, 0x69, 0x12, 0x71, 0x0a, 0x13, 0x73, 0x65, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
-	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e,
-	0x76, 0x33, 0x2e, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x48, 0x00, 0x52, 0x11, 0x73, 0x65, 0x73, 0x73, 0x69,
-	0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x8d, 0x01, 0x0a,
-	0x25, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x5f,
-	0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x20, 0x73, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x53, 0x64, 0x73,
-	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x51, 0x0a, 0x24,
-	0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 0x73,
-	0x73, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x21, 0x64, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 0x73, 0x73, 0x53, 0x65,
-	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x54, 0x0a, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0xaa, 0x01, 0x0a, 0x1a, 0x06, 0x08, 0x80, 0x80,
-	0x80, 0x80, 0x10, 0x32, 0x00, 0x52, 0x0e, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x88, 0x01, 0x0a, 0x12, 0x6f, 0x63, 0x73, 0x70, 0x5f, 0x73,
-	0x74, 0x61, 0x70, 0x6c, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x50, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x12, 0x4d, 0x0a, 0x15, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x72, 0x73, 0x61,
+	0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x65, 0x6e,
+	0x66, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x73, 0x61, 0x4b, 0x65, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65,
+	0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x9a, 0x09,
+	0x0a, 0x14, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43,
+	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x69, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
 	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
-	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x44,
-	0x6f, 0x77, 0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74,
-	0x65, 0x78, 0x74, 0x2e, 0x4f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x10,
-	0x6f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x12, 0x5f, 0x0a, 0x1f, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x63, 0x65,
-	0x72, 0x74, 0x73, 0x5f, 0x6f, 0x6e, 0x5f, 0x73, 0x6e, 0x69, 0x5f, 0x6d, 0x69, 0x73, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1a, 0x66, 0x75, 0x6c, 0x6c, 0x53, 0x63, 0x61, 0x6e, 0x43,
-	0x65, 0x72, 0x74, 0x73, 0x4f, 0x6e, 0x53, 0x6e, 0x69, 0x4d, 0x69, 0x73, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x22, 0x4e, 0x0a, 0x10, 0x4f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x45, 0x4e, 0x49, 0x45, 0x4e, 0x54,
-	0x5f, 0x53, 0x54, 0x41, 0x50, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x53,
-	0x54, 0x52, 0x49, 0x43, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x50, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x01,
-	0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x55, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x50, 0x4c, 0x45, 0x10,
-	0x02, 0x3a, 0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x44, 0x6f, 0x77, 0x6e,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x42, 0x1a, 0x0a, 0x18, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0xcc, 0x01, 0x0a,
-	0x09, 0x54, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x12, 0x1b, 0x0a, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x4f, 0x0a, 0x13, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
-	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52,
+	0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+	0x74, 0x12, 0x58, 0x0a, 0x1a, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x63, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x52, 0x18, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x3b, 0x0a, 0x0b, 0x72,
+	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x73, 0x6e, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x72, 0x65,
+	0x71, 0x75, 0x69, 0x72, 0x65, 0x53, 0x6e, 0x69, 0x12, 0x71, 0x0a, 0x13, 0x73, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76,
+	0x33, 0x2e, 0x54, 0x6c, 0x73, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x48, 0x00, 0x52, 0x11, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f,
+	0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x8d, 0x01, 0x0a, 0x25,
+	0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x6b,
+	0x65, 0x79, 0x73, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
+	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65,
+	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x20, 0x73, 0x65, 0x73, 0x73, 0x69,
+	0x6f, 0x6e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x53, 0x64, 0x73, 0x53,
+	0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x51, 0x0a, 0x24, 0x64,
+	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 0x73, 0x73,
+	0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x21, 0x64, 0x69, 0x73,
+	0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 0x73, 0x73, 0x53, 0x65, 0x73,
+	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4d,
+	0x0a, 0x23, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66,
+	0x75, 0x6c, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6d,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x64, 0x69, 0x73,
+	0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x53, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x54, 0x0a,
+	0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x10, 0xfa, 0x42, 0x0d, 0xaa, 0x01, 0x0a, 0x1a, 0x06, 0x08, 0x80, 0x80, 0x80, 0x80,
+	0x10, 0x32, 0x00, 0x52, 0x0e, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x12, 0x88, 0x01, 0x0a, 0x12, 0x6f, 0x63, 0x73, 0x70, 0x5f, 0x73, 0x74, 0x61,
+	0x70, 0x6c, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x50, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f,
+	0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x6f, 0x77,
+	0x6e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+	0x74, 0x2e, 0x4f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x10, 0x6f, 0x63,
+	0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5f,
+	0x0a, 0x1f, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x63, 0x65, 0x72, 0x74,
+	0x73, 0x5f, 0x6f, 0x6e, 0x5f, 0x73, 0x6e, 0x69, 0x5f, 0x6d, 0x69, 0x73, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x52, 0x1a, 0x66, 0x75, 0x6c, 0x6c, 0x53, 0x63, 0x61, 0x6e, 0x43, 0x65, 0x72,
+	0x74, 0x73, 0x4f, 0x6e, 0x53, 0x6e, 0x69, 0x4d, 0x69, 0x73, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22,
+	0x4e, 0x0a, 0x10, 0x4f, 0x63, 0x73, 0x70, 0x53, 0x74, 0x61, 0x70, 0x6c, 0x65, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x45, 0x4e, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x53,
+	0x54, 0x41, 0x50, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x54, 0x52,
+	0x49, 0x43, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x50, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0f,
+	0x0a, 0x0b, 0x4d, 0x55, 0x53, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x50, 0x4c, 0x45, 0x10, 0x02, 0x3a,
+	0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x1a,
+	0x0a, 0x18, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0xcc, 0x01, 0x0a, 0x09, 0x54,
+	0x6c, 0x73, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x12, 0x1b, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52,
+	0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x4f, 0x0a, 0x13, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x52, 0x11, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x51, 0x0a, 0x14, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x03,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x64, 0x72,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x11, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x51, 0x0a, 0x14, 0x72, 0x65, 0x6d, 0x6f,
-	0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69,
-	0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x12, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x22, 0xea, 0x17, 0x0a, 0x10,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x12, 0x57, 0x0a, 0x0a, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
-	0x2e, 0x54, 0x6c, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x09,
-	0x74, 0x6c, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x64, 0x0a, 0x10, 0x74, 0x6c, 0x73,
-	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
-	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e,
-	0x54, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x0f,
-	0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12,
-	0x86, 0x01, 0x0a, 0x22, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x1e, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x97, 0x01, 0x0a, 0x21, 0x74, 0x6c, 0x73,
-	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0e,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x1e, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x12, 0xad, 0x01, 0x0a, 0x24, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x12, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x22, 0xea, 0x17, 0x0a, 0x10, 0x43, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x57,
+	0x0a, 0x0a, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x54,
+	0x6c, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x09, 0x74, 0x6c,
+	0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x64, 0x0a, 0x10, 0x74, 0x6c, 0x73, 0x5f, 0x63,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
 	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52,
-	0x21, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x12, 0xc6, 0x01, 0x0a, 0x2d, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
-	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e,
-	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
-	0x52, 0x29, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x78, 0x0a, 0x12, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73,
-	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x48, 0x00, 0x52, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
-	0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x8c, 0x01, 0x0a, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x64, 0x73,
-	0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33,
-	0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x48, 0x00, 0x52, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
-	0x6e, 0x74, 0x65, 0x78, 0x74, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x1b, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65,
-	0x64, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e,
-	0x74, 0x65, 0x78, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x60, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x6c,
+	0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x0f, 0x74, 0x6c,
+	0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x86, 0x01,
+	0x0a, 0x22, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
 	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e,
-	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64,
-	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x48, 0x00, 0x52, 0x19,
-	0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0xb5, 0x01, 0x0a, 0x27, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
-	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c,
-	0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x0b, 0x18, 0x01,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x24, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x12, 0xce, 0x01, 0x0a, 0x30, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54,
-	0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33,
-	0x2e, 0x30, 0x48, 0x00, 0x52, 0x2c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x70, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x6c, 0x70, 0x6e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x12, 0x57, 0x0a, 0x11, 0x63, 0x75, 0x73,
-	0x74, 0x6f, 0x6d, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x72, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x10, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b,
-	0x65, 0x72, 0x12, 0x4d, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x0f, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
-	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e,
-	0x54, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x06, 0x6b, 0x65, 0x79, 0x4c, 0x6f,
-	0x67, 0x1a, 0x92, 0x01, 0x0a, 0x13, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4f, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65,
-	0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0x6d, 0x0a, 0x1b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0xa4, 0x06, 0x0a, 0x24, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e,
-	0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x8f,
-	0x01, 0x0a, 0x1a, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
-	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x18, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x12, 0x94, 0x01, 0x0a, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0xb3, 0x01, 0x0a, 0x27, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63,
+	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x1e, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x97, 0x01, 0x0a, 0x21, 0x74, 0x6c, 0x73, 0x5f, 0x63,
 	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74,
-	0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7,
-	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0xcc, 0x01,
-	0x0a, 0x30, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e,
-	0x74, 0x65, 0x78, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0e, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x1e, 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x12, 0xad, 0x01, 0x0a, 0x24, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x21, 0x74,
+	0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x12, 0xc6, 0x01, 0x0a, 0x2d, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
 	0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
 	0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c,
 	0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f,
 	0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
 	0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x2c,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x4e, 0x9a, 0xc5,
-	0x88, 0x1e, 0x49, 0x0a, 0x47, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64,
-	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x3a, 0x29, 0x9a, 0xc5,
-	0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76,
-	0x32, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x19, 0x0a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x42, 0xa5, 0x01, 0x0a, 0x37, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x29,
+	0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x78, 0x0a, 0x12, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76,
+	0x33, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x48, 0x00,
+	0x52, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x12, 0x8c, 0x01, 0x0a, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73,
+	0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f,
+	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53,
+	0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00,
+	0x52, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x1b, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64, 0x5f,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x60, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e,
 	0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c,
-	0x73, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x54, 0x6c, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
-	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f,
-	0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x48, 0x00, 0x52, 0x19, 0x63, 0x6f,
+	0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0xb5, 0x01, 0x0a, 0x27, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74,
+	0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43,
+	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8,
+	0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65, 0x72, 0x74,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12,
+	0xce, 0x01, 0x0a, 0x30, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63,
+	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e,
+	0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x48, 0x00, 0x52, 0x2c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x70, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x6c, 0x70, 0x6e, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x12, 0x57, 0x0a, 0x11, 0x63, 0x75, 0x73, 0x74, 0x6f,
+	0x6d, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x72,
+	0x12, 0x4d, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x6c,
+	0x73, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x06, 0x6b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x1a,
+	0x92, 0x01, 0x0a, 0x13, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4f, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
+	0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x03, 0xf8, 0x42, 0x01, 0x1a, 0x6d, 0x0a, 0x1b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x65, 0x72, 0x74,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e,
+	0x61, 0x6d, 0x65, 0x1a, 0xa4, 0x06, 0x0a, 0x24, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64,
+	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x8f, 0x01, 0x0a,
+	0x1a, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x47, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a,
+	0x01, 0x02, 0x10, 0x01, 0x52, 0x18, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x94,
+	0x01, 0x0a, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x64, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65,
+	0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
+	0x02, 0x10, 0x01, 0x52, 0x20, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x53, 0x64, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0xb3, 0x01, 0x0a, 0x27, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e,
+	0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03,
+	0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x24, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0xcc, 0x01, 0x0a, 0x30,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x57, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e,
+	0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x2e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x42,
+	0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x2c, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x3a, 0x4e, 0x9a, 0xc5, 0x88, 0x1e,
+	0x49, 0x0a, 0x47, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x64, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e,
+	0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x61, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x6c, 0x73, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x19, 0x0a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x42, 0xa5, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x37, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x54, 0x6c, 0x73, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1313,39 +1350,40 @@ var file_envoy_extensions_transport_sockets_tls_v3_tls_proto_goTypes = []interfa
 var file_envoy_extensions_transport_sockets_tls_v3_tls_proto_depIdxs = []int32{
 	4,  // 0: envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext.common_tls_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext
 	8,  // 1: envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext.max_session_keys:type_name -> google.protobuf.UInt32Value
-	4,  // 2: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.common_tls_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext
-	9,  // 3: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_client_certificate:type_name -> google.protobuf.BoolValue
-	9,  // 4: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_sni:type_name -> google.protobuf.BoolValue
-	10, // 5: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys
-	11, // 6: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
-	12, // 7: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_timeout:type_name -> google.protobuf.Duration
-	0,  // 8: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.ocsp_staple_policy:type_name -> envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.OcspStaplePolicy
-	9,  // 9: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.full_scan_certs_on_sni_mismatch:type_name -> google.protobuf.BoolValue
-	13, // 10: envoy.extensions.transport_sockets.tls.v3.TlsKeyLog.local_address_range:type_name -> envoy.config.core.v3.CidrRange
-	13, // 11: envoy.extensions.transport_sockets.tls.v3.TlsKeyLog.remote_address_range:type_name -> envoy.config.core.v3.CidrRange
-	14, // 12: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_params:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsParameters
-	15, // 13: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificates:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsCertificate
-	11, // 14: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_sds_secret_configs:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
-	16, // 15: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance
-	5,  // 16: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
-	6,  // 17: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
-	17, // 18: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
-	11, // 19: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
-	7,  // 20: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.combined_validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext
-	5,  // 21: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
-	6,  // 22: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
-	18, // 23: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.custom_handshaker:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	3,  // 24: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.key_log:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsKeyLog
-	18, // 25: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider.typed_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	17, // 26: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.default_validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
-	11, // 27: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
-	5,  // 28: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
-	6,  // 29: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
-	30, // [30:30] is the sub-list for method output_type
-	30, // [30:30] is the sub-list for method input_type
-	30, // [30:30] is the sub-list for extension type_name
-	30, // [30:30] is the sub-list for extension extendee
-	0,  // [0:30] is the sub-list for field type_name
+	9,  // 2: envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext.enforce_rsa_key_usage:type_name -> google.protobuf.BoolValue
+	4,  // 3: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.common_tls_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext
+	9,  // 4: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_client_certificate:type_name -> google.protobuf.BoolValue
+	9,  // 5: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_sni:type_name -> google.protobuf.BoolValue
+	10, // 6: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys
+	11, // 7: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
+	12, // 8: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_timeout:type_name -> google.protobuf.Duration
+	0,  // 9: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.ocsp_staple_policy:type_name -> envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.OcspStaplePolicy
+	9,  // 10: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.full_scan_certs_on_sni_mismatch:type_name -> google.protobuf.BoolValue
+	13, // 11: envoy.extensions.transport_sockets.tls.v3.TlsKeyLog.local_address_range:type_name -> envoy.config.core.v3.CidrRange
+	13, // 12: envoy.extensions.transport_sockets.tls.v3.TlsKeyLog.remote_address_range:type_name -> envoy.config.core.v3.CidrRange
+	14, // 13: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_params:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsParameters
+	15, // 14: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificates:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsCertificate
+	11, // 15: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_sds_secret_configs:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
+	16, // 16: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance
+	5,  // 17: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
+	6,  // 18: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.tls_certificate_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
+	17, // 19: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
+	11, // 20: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
+	7,  // 21: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.combined_validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext
+	5,  // 22: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
+	6,  // 23: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.validation_context_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
+	18, // 24: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.custom_handshaker:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	3,  // 25: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.key_log:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsKeyLog
+	18, // 26: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider.typed_config:type_name -> envoy.config.core.v3.TypedExtensionConfig
+	17, // 27: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.default_validation_context:type_name -> envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
+	11, // 28: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_sds_secret_config:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig
+	5,  // 29: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_certificate_provider:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider
+	6,  // 30: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext.validation_context_certificate_provider_instance:type_name -> envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance
+	31, // [31:31] is the sub-list for method output_type
+	31, // [31:31] is the sub-list for method input_type
+	31, // [31:31] is the sub-list for extension type_name
+	31, // [31:31] is the sub-list for extension extendee
+	0,  // [0:31] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_transport_sockets_tls_v3_tls_proto_init() }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go
index 8fdde476587..89b8fd11e8c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go
@@ -128,6 +128,35 @@ func (m *UpstreamTlsContext) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetEnforceRsaKeyUsage()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, UpstreamTlsContextValidationError{
+					field:  "EnforceRsaKeyUsage",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, UpstreamTlsContextValidationError{
+					field:  "EnforceRsaKeyUsage",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetEnforceRsaKeyUsage()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return UpstreamTlsContextValidationError{
+				field:  "EnforceRsaKeyUsage",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return UpstreamTlsContextMultiError(errors)
 	}
@@ -317,6 +346,8 @@ func (m *DownstreamTlsContext) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for DisableStatefulSessionResumption
+
 	if d := m.GetSessionTimeout(); d != nil {
 		dur, err := d.AsDuration(), d.CheckValid()
 		if err != nil {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.go
index 4e9cfbea301..4af07522895 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
 
 package tlsv3
@@ -28,30 +28,30 @@ const (
 // Example:
 //
 // .. validated-code-block:: yaml
-//   :type-name: envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
 //
-//   custom_validator_config:
-//     name: envoy.tls.cert_validator.spiffe
-//     typed_config:
-//       "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig
-//       trust_domains:
-//       - name: foo.com
-//         trust_bundle:
-//           filename: "foo.pem"
-//       - name: envoy.com
-//         trust_bundle:
-//           filename: "envoy.pem"
+//	:type-name: envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext
 //
-// In this example, a presented peer certificate whose SAN matches ``spiffe://foo.com/**`` is validated against
+//	custom_validator_config:
+//	  name: envoy.tls.cert_validator.spiffe
+//	  typed_config:
+//	    "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig
+//	    trust_domains:
+//	    - name: foo.com
+//	      trust_bundle:
+//	        filename: "foo.pem"
+//	    - name: envoy.com
+//	      trust_bundle:
+//	        filename: "envoy.pem"
+//
+// In this example, a presented peer certificate whose SAN matches “spiffe://foo.com/**“ is validated against
 // the "foo.pem" x.509 certificate. All the trust bundles are isolated from each other, so no trust domain can mint
-// a SVID belonging to another trust domain. That means, in this example, a SVID signed by ``envoy.com``'s CA with ``spiffe://foo.com/**``
+// a SVID belonging to another trust domain. That means, in this example, a SVID signed by “envoy.com“'s CA with “spiffe://foo.com/**“
 // SAN would be rejected since Envoy selects the trust bundle according to the presented SAN before validate the certificate.
 //
 // Note that SPIFFE validator inherits and uses the following options from :ref:`CertificateValidationContext <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.CertificateValidationContext>`.
 //
 // - :ref:`allow_expired_certificate <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.allow_expired_certificate>` to allow expired certificates.
 // - :ref:`match_typed_subject_alt_names <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_typed_subject_alt_names>` to match **URI** SAN of certificates. Unlike the default validator, SPIFFE validator only matches **URI** SAN (which equals to SVID in SPIFFE terminology) and ignore other SAN types.
-//
 type SPIFFECertValidatorConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -105,7 +105,7 @@ type SPIFFECertValidatorConfig_TrustDomain struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Name of the trust domain, ``example.com``, ``foo.bar.gov`` for example.
+	// Name of the trust domain, “example.com“, “foo.bar.gov“ for example.
 	// Note that this must *not* have "spiffe://" prefix.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Specify a data source holding x.509 trust bundle used for validating incoming SVID(s) in this trust domain.
@@ -191,18 +191,18 @@ var file_envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_p
 	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
 	0x75, 0x72, 0x63, 0x65, 0x52, 0x0b, 0x74, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c,
-	0x65, 0x42, 0xba, 0x01, 0x0a, 0x37, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x1d, 0x54,
-	0x6c, 0x73, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
-	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72,
-	0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33,
-	0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06,
+	0x65, 0x42, 0xba, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x37, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74,
+	0x6c, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x1d, 0x54, 0x6c, 0x73, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65,
+	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x73, 0x2f, 0x74, 0x6c, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x76, 0x33, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3/cds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3/cds.pb.go
index c9a8769c3a7..d54f108c3b0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3/cds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3/cds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/cluster/v3/cds.proto
 
 package clusterv3
@@ -88,7 +88,7 @@ var file_envoy_service_cluster_v3_cds_proto_rawDesc = []byte{
 	0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x08,
 	0x43, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e, 0x17, 0x0a,
 	0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x64,
-	0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xcd, 0x03, 0x0a, 0x17, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xc7, 0x03, 0x0a, 0x17, 0x43, 0x6c, 0x75, 0x73, 0x74,
 	0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x12, 0x73, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6c, 0x75, 0x73,
 	0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
@@ -105,28 +105,28 @@ var file_envoy_service_cluster_v3_cds_proto_rawDesc = []byte{
 	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69,
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x95, 0x01, 0x0a, 0x0d, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43,
+	0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x8f, 0x01, 0x0a, 0x0d, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43,
 	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e,
 	0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x22, 0x16, 0x2f, 0x76,
-	0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x27, 0x8a,
-	0xa4, 0x96, 0xf3, 0x07, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x87, 0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76,
-	0x33, 0x42, 0x08, 0x43, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x01, 0x2a, 0x22,
+	0x16, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x27, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x21, 0x0a,
+	0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x42, 0x87, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x42, 0x08, 0x43, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33,
+	0x3b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/ads.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/ads.pb.go
index 72cbf33d4ed..65abb236d33 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/ads.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/ads.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/discovery/v3/ads.proto
 
 package discoveryv3
@@ -101,16 +101,16 @@ var file_envoy_service_discovery_v3_ads_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
 	0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30,
-	0x01, 0x42, 0x8d, 0x01, 0x0a, 0x28, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x08,
-	0x41, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x69,
-	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x42, 0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x28, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
+	0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x41, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
+	0x72, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/discovery.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/discovery.pb.go
index 9586ffd58dc..a39aac288ad 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/discovery.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3/discovery.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/discovery/v3/discovery.proto
 
 package discoveryv3
@@ -171,12 +171,12 @@ type DiscoveryRequest struct {
 	// which will be explicitly enumerated in resource_names.
 	ResourceNames []string `protobuf:"bytes,3,rep,name=resource_names,json=resourceNames,proto3" json:"resource_names,omitempty"`
 	// [#not-implemented-hide:]
-	// Alternative to ``resource_names`` field that allows specifying dynamic
+	// Alternative to “resource_names“ field that allows specifying dynamic
 	// parameters along with each resource name. Clients that populate this
 	// field must be able to handle responses from the server where resources
 	// are wrapped in a Resource message.
 	// Note that it is legal for a request to have some resources listed
-	// in ``resource_names`` and others in ``resource_locators``.
+	// in “resource_names“ and others in “resource_locators“.
 	ResourceLocators []*ResourceLocator `protobuf:"bytes,7,rep,name=resource_locators,json=resourceLocators,proto3" json:"resource_locators,omitempty"`
 	// Type of the resource that is being requested, e.g.
 	// "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment". This is implicit
@@ -190,7 +190,7 @@ type DiscoveryRequest struct {
 	// delta, where it is populated only for new explicit ACKs).
 	ResponseNonce string `protobuf:"bytes,5,opt,name=response_nonce,json=responseNonce,proto3" json:"response_nonce,omitempty"`
 	// This is populated when the previous :ref:`DiscoveryResponse <envoy_v3_api_msg_service.discovery.v3.DiscoveryResponse>`
-	// failed to update configuration. The ``message`` field in ``error_details`` provides the Envoy
+	// failed to update configuration. The “message“ field in “error_details“ provides the Envoy
 	// internal exception related to the failure. It is only intended for consumption during manual
 	// debugging, the string provided is not guaranteed to be stable across Envoy versions.
 	ErrorDetail *status.Status `protobuf:"bytes,6,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"`
@@ -290,17 +290,17 @@ type DiscoveryResponse struct {
 	// [#not-implemented-hide:]
 	// Canary is used to support two Envoy command line flags:
 	//
-	// * --terminate-on-canary-transition-failure. When set, Envoy is able to
-	//   terminate if it detects that configuration is stuck at canary. Consider
-	//   this example sequence of updates:
+	//   - --terminate-on-canary-transition-failure. When set, Envoy is able to
+	//     terminate if it detects that configuration is stuck at canary. Consider
+	//     this example sequence of updates:
 	//   - Management server applies a canary config successfully.
 	//   - Management server rolls back to a production config.
 	//   - Envoy rejects the new production config.
-	//   Since there is no sensible way to continue receiving configuration
-	//   updates, Envoy will then terminate and apply production config from a
-	//   clean slate.
-	// * --dry-run-canary. When set, a canary response will never be applied, only
-	//   validated via a dry run.
+	//     Since there is no sensible way to continue receiving configuration
+	//     updates, Envoy will then terminate and apply production config from a
+	//     clean slate.
+	//   - --dry-run-canary. When set, a canary response will never be applied, only
+	//     validated via a dry run.
 	Canary bool `protobuf:"varint,3,opt,name=canary,proto3" json:"canary,omitempty"`
 	// Type URL for resources. Identifies the xDS API when muxing over ADS.
 	// Must be consistent with the type_url in the 'resources' repeated Any (if non-empty).
@@ -433,9 +433,9 @@ type DeltaDiscoveryRequest struct {
 	// The node making the request.
 	Node *v3.Node `protobuf:"bytes,1,opt,name=node,proto3" json:"node,omitempty"`
 	// Type of the resource that is being requested, e.g.
-	// ``type.googleapis.com/envoy.api.v2.ClusterLoadAssignment``. This does not need to be set if
-	// resources are only referenced via ``xds_resource_subscribe`` and
-	// ``xds_resources_unsubscribe``.
+	// “type.googleapis.com/envoy.api.v2.ClusterLoadAssignment“. This does not need to be set if
+	// resources are only referenced via “xds_resource_subscribe“ and
+	// “xds_resources_unsubscribe“.
 	TypeUrl string `protobuf:"bytes,2,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"`
 	// DeltaDiscoveryRequests allow the client to add or remove individual
 	// resources to the set of tracked resources in the context of a stream.
@@ -462,16 +462,16 @@ type DeltaDiscoveryRequest struct {
 	// A list of Resource names to remove from the list of tracked resources.
 	ResourceNamesUnsubscribe []string `protobuf:"bytes,4,rep,name=resource_names_unsubscribe,json=resourceNamesUnsubscribe,proto3" json:"resource_names_unsubscribe,omitempty"`
 	// [#not-implemented-hide:]
-	// Alternative to ``resource_names_subscribe`` field that allows specifying dynamic parameters
+	// Alternative to “resource_names_subscribe“ field that allows specifying dynamic parameters
 	// along with each resource name.
 	// Note that it is legal for a request to have some resources listed
-	// in ``resource_names_subscribe`` and others in ``resource_locators_subscribe``.
+	// in “resource_names_subscribe“ and others in “resource_locators_subscribe“.
 	ResourceLocatorsSubscribe []*ResourceLocator `protobuf:"bytes,8,rep,name=resource_locators_subscribe,json=resourceLocatorsSubscribe,proto3" json:"resource_locators_subscribe,omitempty"`
 	// [#not-implemented-hide:]
-	// Alternative to ``resource_names_unsubscribe`` field that allows specifying dynamic parameters
+	// Alternative to “resource_names_unsubscribe“ field that allows specifying dynamic parameters
 	// along with each resource name.
 	// Note that it is legal for a request to have some resources listed
-	// in ``resource_names_unsubscribe`` and others in ``resource_locators_unsubscribe``.
+	// in “resource_names_unsubscribe“ and others in “resource_locators_unsubscribe“.
 	ResourceLocatorsUnsubscribe []*ResourceLocator `protobuf:"bytes,9,rep,name=resource_locators_unsubscribe,json=resourceLocatorsUnsubscribe,proto3" json:"resource_locators_unsubscribe,omitempty"`
 	// Informs the server of the versions of the resources the xDS client knows of, to enable the
 	// client to continue the same logical xDS session even in the face of gRPC stream reconnection.
@@ -488,7 +488,7 @@ type DeltaDiscoveryRequest struct {
 	// Otherwise (unlike in DiscoveryRequest) response_nonce must be omitted.
 	ResponseNonce string `protobuf:"bytes,6,opt,name=response_nonce,json=responseNonce,proto3" json:"response_nonce,omitempty"`
 	// This is populated when the previous :ref:`DiscoveryResponse <envoy_v3_api_msg_service.discovery.v3.DiscoveryResponse>`
-	// failed to update configuration. The ``message`` field in ``error_details``
+	// failed to update configuration. The “message“ field in “error_details“
 	// provides the Envoy internal exception related to the failure.
 	ErrorDetail *status.Status `protobuf:"bytes,7,opt,name=error_detail,json=errorDetail,proto3" json:"error_detail,omitempty"`
 }
@@ -710,6 +710,7 @@ type DynamicParameterConstraints struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Type:
+	//
 	//	*DynamicParameterConstraints_Constraint
 	//	*DynamicParameterConstraints_OrConstraints
 	//	*DynamicParameterConstraints_AndConstraints
@@ -824,12 +825,12 @@ type Resource struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The resource's name, to distinguish it from others of the same type of resource.
-	// Only one of ``name`` or ``resource_name`` may be set.
+	// Only one of “name“ or “resource_name“ may be set.
 	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	// Alternative to the ``name`` field, to be used when the server supports
+	// Alternative to the “name“ field, to be used when the server supports
 	// multiple variants of the named resource that are differentiated by
 	// dynamic parameter constraints.
-	// Only one of ``name`` or ``resource_name`` may be set.
+	// Only one of “name“ or “resource_name“ may be set.
 	ResourceName *ResourceName `protobuf:"bytes,8,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
 	// The aliases are a list of other names that this resource can go by.
 	Aliases []string `protobuf:"bytes,4,rep,name=aliases,proto3" json:"aliases,omitempty"`
@@ -957,6 +958,7 @@ type DynamicParameterConstraints_SingleConstraint struct {
 	// The key to match against.
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Types that are assignable to ConstraintType:
+	//
 	//	*DynamicParameterConstraints_SingleConstraint_Value
 	//	*DynamicParameterConstraints_SingleConstraint_Exists_
 	ConstraintType isDynamicParameterConstraints_SingleConstraint_ConstraintType `protobuf_oneof:"constraint_type"`
@@ -1427,16 +1429,16 @@ var file_envoy_service_discovery_v3_discovery_proto_rawDesc = []byte{
 	0x61, 0x63, 0x68, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x6f, 0x4e, 0x6f,
 	0x74, 0x43, 0x61, 0x63, 0x68, 0x65, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e, 0x17, 0x0a, 0x15, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x42, 0x93, 0x01, 0x0a, 0x28, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76,
-	0x33, 0x42, 0x0e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x75, 0x72, 0x63, 0x65, 0x42, 0x93, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x28, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x44, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x64,
+	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/eds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/eds.pb.go
index 8104097d8ac..659208e723e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/eds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/eds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/endpoint/v3/eds.proto
 
 package endpointv3
@@ -88,7 +88,7 @@ var file_envoy_service_endpoint_v3_eds_proto_rawDesc = []byte{
 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28,
 	0x0a, 0x08, 0x45, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e,
 	0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x45, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xe1, 0x03, 0x0a, 0x18, 0x45, 0x6e, 0x64,
+	0x45, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xdb, 0x03, 0x0a, 0x18, 0x45, 0x6e, 0x64,
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x74, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x45,
 	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
@@ -105,30 +105,29 @@ var file_envoy_service_endpoint_v3_eds_proto_rawDesc = []byte{
 	0x1a, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
 	0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65,
 	0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x97, 0x01, 0x0a, 0x0e, 0x46,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x91, 0x01, 0x0a, 0x0e, 0x46,
 	0x65, 0x74, 0x63, 0x68, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x2c, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69,
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
 	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x19, 0x22, 0x17, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x3a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x36, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x30, 0x0a, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f,
-	0x61, 0x64, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x8a, 0x01, 0x0a,
-	0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x45, 0x64, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x3a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x1a, 0x36,
+	0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33,
+	0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x8a, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65,
+	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x45, 0x64, 0x73, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/leds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/leds.pb.go
index 51e080a7308..f6a9d9ff5eb 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/leds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3/leds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/endpoint/v3/leds.proto
 
 package endpointv3
@@ -95,16 +95,16 @@ var file_envoy_service_endpoint_v3_leds_proto_rawDesc = []byte{
 	0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x1a, 0x2b, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x25,
 	0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x65,
 	0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x62, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x8b, 0x01, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76,
-	0x33, 0x42, 0x09, 0x4c, 0x65, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33,
-	0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x8b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x6e,
+	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x4c, 0x65, 0x64, 0x73, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x6e, 0x64,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/extension/v3/config_discovery.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/extension/v3/config_discovery.pb.go
index 6dc70388753..e29482a024e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/extension/v3/config_discovery.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/extension/v3/config_discovery.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/extension/v3/config_discovery.proto
 
 package extensionv3
@@ -86,7 +86,7 @@ var file_envoy_service_extension_v3_config_discovery_proto_rawDesc = []byte{
 	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70,
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74,
 	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x63,
-	0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0x81, 0x04, 0x0a, 0x1f, 0x45, 0x78, 0x74, 0x65,
+	0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xfb, 0x03, 0x0a, 0x1f, 0x45, 0x78, 0x74, 0x65,
 	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69, 0x73, 0x63, 0x6f,
 	0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7b, 0x0a, 0x16, 0x53,
 	0x74, 0x72, 0x65, 0x61, 0x6d, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
@@ -105,30 +105,30 @@ var file_envoy_service_extension_v3_config_discovery_proto_rawDesc = []byte{
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e,
 	0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12,
-	0xa6, 0x01, 0x0a, 0x15, 0x46, 0x65, 0x74, 0x63, 0x68, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0xa0, 0x01, 0x0a, 0x15, 0x46, 0x65, 0x74, 0x63, 0x68, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
 	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
 	0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
 	0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1f,
-	0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x31, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x2b,
-	0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x99, 0x01, 0x0a, 0x28,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x14, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x2f, 0x76, 0x33, 0x3b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01,
+	0x2a, 0x22, 0x1f, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x3a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x73, 0x1a, 0x31, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x99, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x28, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x14, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/listener/v3/lds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/listener/v3/lds.pb.go
index 01d76faddb8..263a4699130 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/listener/v3/lds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/listener/v3/lds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/listener/v3/lds.proto
 
 package listenerv3
@@ -88,7 +88,7 @@ var file_envoy_service_listener_v3_lds_proto_rawDesc = []byte{
 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28,
 	0x0a, 0x08, 0x4c, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e,
 	0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x4c, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xd4, 0x03, 0x0a, 0x18, 0x4c, 0x69, 0x73,
+	0x4c, 0x64, 0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xce, 0x03, 0x0a, 0x18, 0x4c, 0x69, 0x73,
 	0x74, 0x65, 0x6e, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7d, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x4c, 0x69,
 	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
@@ -105,29 +105,28 @@ var file_envoy_service_listener_v3_lds_proto_rawDesc = []byte{
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
 	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e,
 	0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x97, 0x01, 0x0a, 0x0e, 0x46,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x91, 0x01, 0x0a, 0x0e, 0x46,
 	0x65, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69,
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
 	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x19, 0x22, 0x17, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x3a, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x29, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x23, 0x0a, 0x21, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42,
-	0x8a, 0x01, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x4c, 0x64, 0x73,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x3a, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x1a, 0x29,
+	0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x42, 0x8a, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x27, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x4c,
+	0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f,
+	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3/lrs.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3/lrs.pb.go
index 75cfaa0efce..d2465ee754d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3/lrs.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3/lrs.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/load_stats/v3/lrs.proto
 
 package load_statsv3
@@ -94,7 +94,7 @@ type LoadStatsResponse struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Clusters to report stats for.
-	// Not populated if ``send_all_clusters`` is true.
+	// Not populated if “send_all_clusters“ is true.
 	Clusters []string `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// If true, the client should send all clusters it knows about.
 	// Only clients that advertise the "envoy.lrs.supports_send_all_clusters" capability in their
@@ -102,14 +102,14 @@ type LoadStatsResponse struct {
 	SendAllClusters bool `protobuf:"varint,4,opt,name=send_all_clusters,json=sendAllClusters,proto3" json:"send_all_clusters,omitempty"`
 	// The minimum interval of time to collect stats over. This is only a minimum for two reasons:
 	//
-	// 1. There may be some delay from when the timer fires until stats sampling occurs.
-	// 2. For clusters that were already feature in the previous ``LoadStatsResponse``, any traffic
-	//    that is observed in between the corresponding previous ``LoadStatsRequest`` and this
-	//    ``LoadStatsResponse`` will also be accumulated and billed to the cluster. This avoids a period
-	//    of inobservability that might otherwise exists between the messages. New clusters are not
-	//    subject to this consideration.
+	//  1. There may be some delay from when the timer fires until stats sampling occurs.
+	//  2. For clusters that were already feature in the previous “LoadStatsResponse“, any traffic
+	//     that is observed in between the corresponding previous “LoadStatsRequest“ and this
+	//     “LoadStatsResponse“ will also be accumulated and billed to the cluster. This avoids a period
+	//     of inobservability that might otherwise exists between the messages. New clusters are not
+	//     subject to this consideration.
 	LoadReportingInterval *duration.Duration `protobuf:"bytes,2,opt,name=load_reporting_interval,json=loadReportingInterval,proto3" json:"load_reporting_interval,omitempty"`
-	// Set to ``true`` if the management server supports endpoint granularity
+	// Set to “true“ if the management server supports endpoint granularity
 	// report.
 	ReportEndpointGranularity bool `protobuf:"varint,3,opt,name=report_endpoint_granularity,json=reportEndpointGranularity,proto3" json:"report_endpoint_granularity,omitempty"`
 }
@@ -232,16 +232,16 @@ var file_envoy_service_load_stats_v3_lrs_proto_rawDesc = []byte{
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x6c, 0x6f, 0x61,
 	0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53,
 	0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01,
-	0x30, 0x01, 0x42, 0x90, 0x01, 0x0a, 0x29, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x76, 0x33,
-	0x42, 0x08, 0x4c, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2f, 0x76, 0x33,
-	0x3b, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x30, 0x01, 0x42, 0x90, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x29, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x4c, 0x72, 0x73, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x74,
+	0x61, 0x74, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -343,31 +343,32 @@ type LoadReportingServiceClient interface {
 	// Advanced API to allow for multi-dimensional load balancing by remote
 	// server. For receiving LB assignments, the steps are:
 	// 1, The management server is configured with per cluster/zone/load metric
-	//    capacity configuration. The capacity configuration definition is
-	//    outside of the scope of this document.
-	// 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
-	//    to balance.
+	//
+	//	capacity configuration. The capacity configuration definition is
+	//	outside of the scope of this document.
+	//  2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
+	//     to balance.
 	//
 	// Independently, Envoy will initiate a StreamLoadStats bidi stream with a
 	// management server:
-	// 1. Once a connection establishes, the management server publishes a
-	//    LoadStatsResponse for all clusters it is interested in learning load
-	//    stats about.
-	// 2. For each cluster, Envoy load balances incoming traffic to upstream hosts
-	//    based on per-zone weights and/or per-instance weights (if specified)
-	//    based on intra-zone LbPolicy. This information comes from the above
-	//    {Stream,Fetch}Endpoints.
-	// 3. When upstream hosts reply, they optionally add header <define header
-	//    name> with ASCII representation of EndpointLoadMetricStats.
-	// 4. Envoy aggregates load reports over the period of time given to it in
-	//    LoadStatsResponse.load_reporting_interval. This includes aggregation
-	//    stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
-	//    well as load metrics from upstream hosts.
-	// 5. When the timer of load_reporting_interval expires, Envoy sends new
-	//    LoadStatsRequest filled with load reports for each cluster.
-	// 6. The management server uses the load reports from all reported Envoys
-	//    from around the world, computes global assignment and prepares traffic
-	//    assignment destined for each zone Envoys are located in. Goto 2.
+	//  1. Once a connection establishes, the management server publishes a
+	//     LoadStatsResponse for all clusters it is interested in learning load
+	//     stats about.
+	//  2. For each cluster, Envoy load balances incoming traffic to upstream hosts
+	//     based on per-zone weights and/or per-instance weights (if specified)
+	//     based on intra-zone LbPolicy. This information comes from the above
+	//     {Stream,Fetch}Endpoints.
+	//  3. When upstream hosts reply, they optionally add header <define header
+	//     name> with ASCII representation of EndpointLoadMetricStats.
+	//  4. Envoy aggregates load reports over the period of time given to it in
+	//     LoadStatsResponse.load_reporting_interval. This includes aggregation
+	//     stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
+	//     well as load metrics from upstream hosts.
+	//  5. When the timer of load_reporting_interval expires, Envoy sends new
+	//     LoadStatsRequest filled with load reports for each cluster.
+	//  6. The management server uses the load reports from all reported Envoys
+	//     from around the world, computes global assignment and prepares traffic
+	//     assignment destined for each zone Envoys are located in. Goto 2.
 	StreamLoadStats(ctx context.Context, opts ...grpc.CallOption) (LoadReportingService_StreamLoadStatsClient, error)
 }
 
@@ -415,31 +416,32 @@ type LoadReportingServiceServer interface {
 	// Advanced API to allow for multi-dimensional load balancing by remote
 	// server. For receiving LB assignments, the steps are:
 	// 1, The management server is configured with per cluster/zone/load metric
-	//    capacity configuration. The capacity configuration definition is
-	//    outside of the scope of this document.
-	// 2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
-	//    to balance.
+	//
+	//	capacity configuration. The capacity configuration definition is
+	//	outside of the scope of this document.
+	//  2. Envoy issues a standard {Stream,Fetch}Endpoints request for the clusters
+	//     to balance.
 	//
 	// Independently, Envoy will initiate a StreamLoadStats bidi stream with a
 	// management server:
-	// 1. Once a connection establishes, the management server publishes a
-	//    LoadStatsResponse for all clusters it is interested in learning load
-	//    stats about.
-	// 2. For each cluster, Envoy load balances incoming traffic to upstream hosts
-	//    based on per-zone weights and/or per-instance weights (if specified)
-	//    based on intra-zone LbPolicy. This information comes from the above
-	//    {Stream,Fetch}Endpoints.
-	// 3. When upstream hosts reply, they optionally add header <define header
-	//    name> with ASCII representation of EndpointLoadMetricStats.
-	// 4. Envoy aggregates load reports over the period of time given to it in
-	//    LoadStatsResponse.load_reporting_interval. This includes aggregation
-	//    stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
-	//    well as load metrics from upstream hosts.
-	// 5. When the timer of load_reporting_interval expires, Envoy sends new
-	//    LoadStatsRequest filled with load reports for each cluster.
-	// 6. The management server uses the load reports from all reported Envoys
-	//    from around the world, computes global assignment and prepares traffic
-	//    assignment destined for each zone Envoys are located in. Goto 2.
+	//  1. Once a connection establishes, the management server publishes a
+	//     LoadStatsResponse for all clusters it is interested in learning load
+	//     stats about.
+	//  2. For each cluster, Envoy load balances incoming traffic to upstream hosts
+	//     based on per-zone weights and/or per-instance weights (if specified)
+	//     based on intra-zone LbPolicy. This information comes from the above
+	//     {Stream,Fetch}Endpoints.
+	//  3. When upstream hosts reply, they optionally add header <define header
+	//     name> with ASCII representation of EndpointLoadMetricStats.
+	//  4. Envoy aggregates load reports over the period of time given to it in
+	//     LoadStatsResponse.load_reporting_interval. This includes aggregation
+	//     stats Envoy maintains by itself (total_requests, rpc_errors etc.) as
+	//     well as load metrics from upstream hosts.
+	//  5. When the timer of load_reporting_interval expires, Envoy sends new
+	//     LoadStatsRequest filled with load reports for each cluster.
+	//  6. The management server uses the load reports from all reported Envoys
+	//     from around the world, computes global assignment and prepares traffic
+	//     assignment destined for each zone Envoys are located in. Goto 2.
 	StreamLoadStats(LoadReportingService_StreamLoadStatsServer) error
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/rds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/rds.pb.go
index 1524db7bcb6..40fddf8a287 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/rds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/rds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/route/v3/rds.proto
 
 package routev3
@@ -88,7 +88,7 @@ var file_envoy_service_route_v3_rds_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x08, 0x52, 0x64, 0x73, 0x44,
 	0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e, 0x17, 0x0a, 0x15, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x64, 0x73, 0x44, 0x75, 0x6d,
-	0x6d, 0x79, 0x32, 0xcc, 0x03, 0x0a, 0x15, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x44, 0x69, 0x73, 0x63,
+	0x6d, 0x79, 0x32, 0xc6, 0x03, 0x0a, 0x15, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x44, 0x69, 0x73, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x71, 0x0a, 0x0c,
 	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73,
@@ -104,41 +104,41 @@ var file_envoy_service_route_v3_rds_proto_rawDesc = []byte{
 	0x74, 0x1a, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44,
 	0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x91, 0x01, 0x0a, 0x0b,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x8b, 0x01, 0x0a, 0x0b,
 	0x46, 0x65, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
 	0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16,
-	0x22, 0x14, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03, 0x3a, 0x01, 0x2a, 0x1a,
-	0x30, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x32, 0xcb, 0x01, 0x0a, 0x1b, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73,
-	0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x80, 0x01, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x56, 0x69, 0x72, 0x74, 0x75,
-	0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73,
-	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x28, 0x01, 0x30, 0x01, 0x1a, 0x29, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x23, 0x0a, 0x21, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2e, 0x76, 0x33, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x42,
-	0x81, 0x01, 0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x52, 0x64, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65,
-	0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19,
+	0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
+	0x72, 0x79, 0x3a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x30, 0x8a, 0xa4, 0x96, 0xf3, 0x07,
+	0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xcb, 0x01, 0x0a, 0x1b,
+	0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x11,
+	0x44, 0x65, 0x6c, 0x74, 0x61, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74,
+	0x73, 0x12, 0x31, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44,
+	0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76,
+	0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x1a, 0x29,
+	0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x56, 0x69,
+	0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x42, 0x81, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x52, 0x64, 0x73, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72, 0x6f, 0x75,
+	0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/srds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/srds.pb.go
index d9c194bdd3c..52798e9ebfd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/srds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/route/v3/srds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/route/v3/srds.proto
 
 package routev3
@@ -88,7 +88,7 @@ var file_envoy_service_route_v3_srds_proto_rawDesc = []byte{
 	0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2a, 0x0a, 0x09, 0x53, 0x72, 0x64,
 	0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x1d, 0x9a, 0xc5, 0x88, 0x1e, 0x18, 0x0a, 0x16, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x72, 0x64, 0x73,
-	0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xf3, 0x03, 0x0a, 0x1c, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64,
+	0x44, 0x75, 0x6d, 0x6d, 0x79, 0x32, 0xed, 0x03, 0x0a, 0x1c, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64,
 	0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
 	0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x65,
@@ -106,29 +106,29 @@ var file_envoy_service_route_v3_srds_proto_rawDesc = []byte{
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f,
 	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01,
-	0x30, 0x01, 0x12, 0x9e, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x53, 0x63, 0x6f, 0x70,
+	0x30, 0x01, 0x12, 0x98, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x53, 0x63, 0x6f, 0x70,
 	0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
 	0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
 	0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x1b, 0x2f,
-	0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x73, 0x63, 0x6f,
-	0x70, 0x65, 0x64, 0x2d, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03,
-	0x3a, 0x01, 0x2a, 0x1a, 0x36, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x82, 0x01, 0x0a, 0x24,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x53, 0x72, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a,
+	0x22, 0x1b, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a,
+	0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x2d, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x36, 0x8a,
+	0xa4, 0x96, 0xf3, 0x07, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f,
+	0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x82, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
+	0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x6f,
+	0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x53, 0x72, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f,
+	0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3/rtds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3/rtds.pb.go
index 6ef3a8dd307..2048220a5ba 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3/rtds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3/rtds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/runtime/v3/rtds.proto
 
 package runtimev3
@@ -161,7 +161,7 @@ var file_envoy_service_runtime_v3_rtds_proto_rawDesc = []byte{
 	0x05, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x32, 0xca, 0x03, 0x0a, 0x17, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x69, 0x73,
+	0x65, 0x32, 0xc4, 0x03, 0x0a, 0x17, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x72, 0x0a,
 	0x0d, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2c,
 	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64,
@@ -177,29 +177,28 @@ var file_envoy_service_runtime_v3_rtds_proto_rawDesc = []byte{
 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
 	0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76,
 	0x33, 0x2e, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x93,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x8d,
 	0x01, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12,
 	0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
 	0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69,
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x17, 0x22, 0x15, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x3a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x28, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x22, 0x0a, 0x20, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x88,
-	0x01, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x52, 0x74, 0x64, 0x73, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x76,
-	0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x28,
+	0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x88, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x26, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x52, 0x74, 0x64,
+	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/secret/v3/sds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/secret/v3/sds.pb.go
index acb4506b383..498cdc0804a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/secret/v3/sds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/secret/v3/sds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/secret/v3/sds.proto
 
 package secretv3
@@ -89,7 +89,7 @@ var file_envoy_service_secret_v3_sds_proto_rawDesc = []byte{
 	0x73, 0x44, 0x75, 0x6d, 0x6d, 0x79, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x64, 0x73, 0x44, 0x75, 0x6d,
-	0x6d, 0x79, 0x32, 0xd9, 0x03, 0x0a, 0x16, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6d, 0x79, 0x32, 0xd3, 0x03, 0x0a, 0x16, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7b, 0x0a,
 	0x0c, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x12, 0x31, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69,
@@ -105,29 +105,29 @@ var file_envoy_service_secret_v3_sds_proto_rawDesc = []byte{
 	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
 	0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x93,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x8d,
 	0x01, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x63, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x12,
 	0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
 	0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73,
 	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x64, 0x69,
 	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x17, 0x22, 0x15, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x3a, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x03, 0x3a, 0x01, 0x2a, 0x1a, 0x38, 0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x32, 0x0a, 0x30, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73,
-	0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x42, 0x84,
-	0x01, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x53, 0x64, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x76, 0x33, 0x2f, 0x64, 0x69, 0x73,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x1a, 0x38,
+	0x8a, 0xa4, 0x96, 0xf3, 0x07, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x2e, 0x74, 0x6c, 0x73, 0x2e, 0x76,
+	0x33, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x42, 0x84, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x53, 0x64, 0x73, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x76, 0x33, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.go
index b41fd658037..849aef09472 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/service/status/v3/csds.proto
 
 package statusv3
@@ -167,6 +167,10 @@ type ClientStatusRequest struct {
 	NodeMatchers []*v3.NodeMatcher `protobuf:"bytes,1,rep,name=node_matchers,json=nodeMatchers,proto3" json:"node_matchers,omitempty"`
 	// The node making the csds request.
 	Node *v31.Node `protobuf:"bytes,2,opt,name=node,proto3" json:"node,omitempty"`
+	// If true, the server will not include the resource contents in the response
+	// (i.e., the generic_xds_configs.xds_config field will not be populated).
+	// [#not-implemented-hide:]
+	ExcludeResourceContents bool `protobuf:"varint,3,opt,name=exclude_resource_contents,json=excludeResourceContents,proto3" json:"exclude_resource_contents,omitempty"`
 }
 
 func (x *ClientStatusRequest) Reset() {
@@ -215,6 +219,13 @@ func (x *ClientStatusRequest) GetNode() *v31.Node {
 	return nil
 }
 
+func (x *ClientStatusRequest) GetExcludeResourceContents() bool {
+	if x != nil {
+		return x.ExcludeResourceContents
+	}
+	return false
+}
+
 // Detailed config (per xDS) with status.
 // [#next-free-field: 8]
 type PerXdsConfig struct {
@@ -230,13 +241,15 @@ type PerXdsConfig struct {
 	// is, xDS clients should always dump the most recent accepted xDS config.
 	//
 	// .. attention::
-	//   This field is deprecated. Use :ref:`ClientResourceStatus
-	//   <envoy_v3_api_enum_admin.v3.ClientResourceStatus>` for per-resource
-	//   config status instead.
 	//
-	// Deprecated: Do not use.
+	//	This field is deprecated. Use :ref:`ClientResourceStatus
+	//	<envoy_v3_api_enum_admin.v3.ClientResourceStatus>` for per-resource
+	//	config status instead.
+	//
+	// Deprecated: Marked as deprecated in envoy/service/status/v3/csds.proto.
 	ClientStatus ClientConfigStatus `protobuf:"varint,7,opt,name=client_status,json=clientStatus,proto3,enum=envoy.service.status.v3.ClientConfigStatus" json:"client_status,omitempty"`
 	// Types that are assignable to PerXdsConfig:
+	//
 	//	*PerXdsConfig_ListenerConfig
 	//	*PerXdsConfig_ClusterConfig
 	//	*PerXdsConfig_RouteConfig
@@ -284,7 +297,7 @@ func (x *PerXdsConfig) GetStatus() ConfigStatus {
 	return ConfigStatus_UNKNOWN
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/service/status/v3/csds.proto.
 func (x *PerXdsConfig) GetClientStatus() ClientConfigStatus {
 	if x != nil {
 		return x.ClientStatus
@@ -379,7 +392,7 @@ type ClientConfig struct {
 	// This field is deprecated in favor of generic_xds_configs which is
 	// much simpler and uniform in structure.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/service/status/v3/csds.proto.
 	XdsConfig []*PerXdsConfig `protobuf:"bytes,2,rep,name=xds_config,json=xdsConfig,proto3" json:"xds_config,omitempty"`
 	// Represents generic xDS config and the exact config structure depends on
 	// the type URL (like Cluster if it is CDS)
@@ -425,7 +438,7 @@ func (x *ClientConfig) GetNode() *v31.Node {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/service/status/v3/csds.proto.
 func (x *ClientConfig) GetXdsConfig() []*PerXdsConfig {
 	if x != nil {
 		return x.XdsConfig
@@ -647,7 +660,7 @@ var file_envoy_service_status_v3_csds_proto_rawDesc = []byte{
 	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
 	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
 	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc2, 0x01, 0x0a, 0x13, 0x43,
+	0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, 0x13, 0x43,
 	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x12, 0x47, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
 	0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
@@ -656,148 +669,151 @@ var file_envoy_service_status_v3_csds_proto_rawDesc = []byte{
 	0x6f, 0x64, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x04, 0x6e,
 	0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
-	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x3a, 0x32, 0x9a, 0xc5, 0x88,
-	0x1e, 0x2d, 0x0a, 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
-	0xf9, 0x04, 0x0a, 0x0c, 0x50, 0x65, 0x72, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x3d, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
-	0x5d, 0x0a, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
-	0x52, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x4e,
-	0x0a, 0x0f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0e,
-	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4b,
-	0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x0c, 0x72,
-	0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44,
-	0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x58, 0x0a, 0x13, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33,
-	0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x11, 0x73, 0x63, 0x6f, 0x70, 0x65,
-	0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4e, 0x0a, 0x0f,
-	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64,
-	0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2b, 0x9a, 0xc5,
-	0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x65, 0x72,
-	0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x10, 0x0a, 0x0e, 0x70, 0x65, 0x72,
-	0x5f, 0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x8b, 0x06, 0x0a, 0x0c,
-	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2e, 0x0a, 0x04,
-	0x6e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x51, 0x0a, 0x0a,
-	0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x58, 0x64,
-	0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b, 0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04,
-	0x03, 0x33, 0x2e, 0x30, 0x52, 0x09, 0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x66, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x78, 0x64, 0x73, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65,
+	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x3a, 0x0a, 0x19, 0x65,
+	0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
+	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17,
+	0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43,
+	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, 0x2b,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xf9, 0x04, 0x0a, 0x0c,
+	0x50, 0x65, 0x72, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3d, 0x0a, 0x06,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x58, 0x64, 0x73, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x58, 0x64, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x1a, 0xe2, 0x03, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x69, 0x63, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x19, 0x0a, 0x08,
-	0x74, 0x79, 0x70, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x74, 0x79, 0x70, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x33,
-	0x0a, 0x0a, 0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x3d, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x64, 0x12, 0x4a, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x49,
-	0x0a, 0x0d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64,
-	0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c, 0x63, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x52, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2c,
-	0x0a, 0x12, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x53, 0x74,
-	0x61, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x2b, 0x9a, 0xc5,
-	0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x8a, 0x01, 0x0a, 0x14, 0x43, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x3d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x5d, 0x0a, 0x0d, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76,
-	0x32, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x4b, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
-	0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x59, 0x4e, 0x43, 0x45, 0x44, 0x10, 0x01, 0x12,
-	0x0c, 0x0a, 0x08, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x12, 0x09, 0x0a,
-	0x05, 0x53, 0x54, 0x41, 0x4c, 0x45, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f,
-	0x52, 0x10, 0x04, 0x2a, 0x63, 0x0a, 0x12, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x4c, 0x49,
-	0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a,
-	0x10, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45,
-	0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x41, 0x43,
-	0x4b, 0x45, 0x44, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f,
-	0x4e, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x03, 0x32, 0xb8, 0x02, 0x0a, 0x1c, 0x43, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x12, 0x53, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
-	0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01,
-	0x30, 0x01, 0x12, 0x9e, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42,
+	0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0c, 0x63, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x4e, 0x0a, 0x0f, 0x6c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69,
+	0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x6c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x0c, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x52,
+	0x6f, 0x75, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48,
+	0x00, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x58,
+	0x0a, 0x13, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x63, 0x6f,
+	0x70, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44,
+	0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x11, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4e, 0x0a, 0x0f, 0x65, 0x6e, 0x64, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
+	0x76, 0x33, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x44, 0x75, 0x6d, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a,
+	0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x65, 0x72, 0x58, 0x64, 0x73, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x10, 0x0a, 0x0e, 0x70, 0x65, 0x72, 0x5f, 0x78, 0x64, 0x73,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x8b, 0x06, 0x0a, 0x0c, 0x43, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2e, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x51, 0x0a, 0x0a, 0x78, 0x64, 0x73, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x52, 0x09, 0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x66, 0x0a, 0x13, 0x67,
+	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x78, 0x64, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e,
-	0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33,
-	0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x1b, 0x2f,
-	0x76, 0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x03,
-	0x3a, 0x01, 0x2a, 0x42, 0x85, 0x01, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x43,
-	0x73, 0x64, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x58, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x73, 0x1a, 0xe2, 0x03, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x58,
+	0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65,
+	0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65,
+	0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x76,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x33, 0x0a, 0x0a, 0x78, 0x64,
+	0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x78, 0x64, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x3d, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x4a,
+	0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x49, 0x0a, 0x0d, 0x63, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e,
+	0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0a,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x73,
+	0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a,
+	0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x8a, 0x01, 0x0a, 0x14, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d,
+	0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x33, 0x9a,
+	0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x2a, 0x4b, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12,
+	0x0a, 0x0a, 0x06, 0x53, 0x59, 0x4e, 0x43, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4e,
+	0x4f, 0x54, 0x5f, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41,
+	0x4c, 0x45, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x2a,
+	0x63, 0x0a, 0x12, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f,
+	0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4c, 0x49,
+	0x45, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12,
+	0x10, 0x0a, 0x0c, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10,
+	0x02, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x4e, 0x41, 0x43, 0x4b,
+	0x45, 0x44, 0x10, 0x03, 0x32, 0xb2, 0x02, 0x0a, 0x1c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x98,
+	0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x76,
+	0x33, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x3a, 0x63, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x85, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x25, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x43, 0x73, 0x64,
+	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.validate.go
index 846934a5969..e0c078d4319 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/status/v3/csds.pb.validate.go
@@ -124,6 +124,8 @@ func (m *ClientStatusRequest) validate(all bool) error {
 		}
 	}
 
+	// no validation rules for ExcludeResourceContents
+
 	if len(errors) > 0 {
 		return ClientStatusRequestMultiError(errors)
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/hash_policy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/hash_policy.pb.go
index e283bb15d70..a79d5cf7a78 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/hash_policy.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/hash_policy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/hash_policy.proto
 
 package _type
@@ -29,6 +29,7 @@ type HashPolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PolicySpecifier:
+	//
 	//	*HashPolicy_SourceIp_
 	PolicySpecifier isHashPolicy_PolicySpecifier `protobuf_oneof:"policy_specifier"`
 }
@@ -145,13 +146,13 @@ var file_envoy_type_hash_policy_proto_rawDesc = []byte{
 	0x63, 0x65, 0x49, 0x70, 0x48, 0x00, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70,
 	0x1a, 0x0a, 0x0a, 0x08, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70, 0x42, 0x17, 0x0a, 0x10,
 	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x68, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
-	0x65, 0x42, 0x0f, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62,
+	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x68, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a,
+	0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0f, 0x48, 0x61, 0x73, 0x68, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http.pb.go
index 1edfaa2a298..5baf7d74b5e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/http.proto
 
 package _type
@@ -83,13 +83,13 @@ var file_envoy_type_http_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x2a, 0x32, 0x0a, 0x0f, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x43, 0x6c, 0x69, 0x65, 0x6e,
 	0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x31, 0x10, 0x00,
 	0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x32, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x48,
-	0x54, 0x54, 0x50, 0x33, 0x10, 0x02, 0x42, 0x62, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
-	0x70, 0x65, 0x42, 0x09, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
-	0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x54, 0x54, 0x50, 0x33, 0x10, 0x02, 0x42, 0x62, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x09, 0x48, 0x74, 0x74, 0x70,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/cookie.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/cookie.pb.go
index 19ebac57993..a76427d6c06 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/cookie.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/cookie.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/http/v3/cookie.proto
 
 package httpv3
@@ -112,14 +112,14 @@ var file_envoy_type_http_v3_cookie_proto_rawDesc = []byte{
 	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
 	0x05, 0xaa, 0x01, 0x02, 0x32, 0x00, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70,
 	0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x42,
-	0x7b, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70,
-	0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74,
-	0x74, 0x70, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x7b, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6f,
+	0x6b, 0x69, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x68, 0x74,
+	0x74, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/path_transformation.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/path_transformation.pb.go
index 71b820739f6..888f00dd1f7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/path_transformation.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http/v3/path_transformation.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/http/v3/path_transformation.proto
 
 package httpv3
@@ -77,6 +77,7 @@ type PathTransformation_Operation struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to OperationSpecifier:
+	//
 	//	*PathTransformation_Operation_NormalizePathRfc_3986
 	//	*PathTransformation_Operation_MergeSlashes_
 	OperationSpecifier isPathTransformation_Operation_OperationSpecifier `protobuf_oneof:"operation_specifier"`
@@ -201,10 +202,10 @@ func (*PathTransformation_Operation_NormalizePathRFC3986) Descriptor() ([]byte,
 }
 
 // Determines if adjacent slashes are merged into one. A common use case is for a request path
-// header. Using this option in ``:ref: PathNormalizationOptions
-// <envoy_v3_api_msg_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions>``
-// will allow incoming requests with path ``//dir///file`` to match against route with ``prefix``
-// match set to ``/dir``. When using for header transformations, note that slash merging is not
+// header. Using this option in “:ref: PathNormalizationOptions
+// <envoy_v3_api_msg_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions>“
+// will allow incoming requests with path “//dir///file“ to match against route with “prefix“
+// match set to “/dir“. When using for header transformations, note that slash merging is not
 // part of `HTTP spec <https://tools.ietf.org/html/rfc3986>`_ and is provided for convenience.
 type PathTransformation_Operation_MergeSlashes struct {
 	state         protoimpl.MessageState
@@ -280,16 +281,16 @@ var file_envoy_type_http_v3_path_transformation_proto_rawDesc = []byte{
 	0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x46, 0x43, 0x33, 0x39, 0x38, 0x36, 0x1a,
 	0x0e, 0x0a, 0x0c, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x73, 0x42,
 	0x1a, 0x0a, 0x13, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65,
-	0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0x0a, 0x20,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76, 0x33,
-	0x42, 0x17, 0x50, 0x61, 0x74, 0x68, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x68,
-	0x74, 0x74, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x50, 0x61, 0x74, 0x68, 0x54, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x76, 0x33, 0x3b, 0x68,
+	0x74, 0x74, 0x70, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go
index 49186f9eb0d..85aed08aca5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/http_status.proto
 
 package _type
@@ -375,13 +375,13 @@ var file_envoy_type_http_status_proto_rawDesc = []byte{
 	0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x10, 0xfe, 0x03, 0x12, 0x22, 0x0a, 0x1d,
 	0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0xff, 0x03,
-	0x42, 0x68, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0f, 0x48, 0x74,
-	0x74, 0x70, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
-	0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x42, 0x68, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x79, 0x70, 0x65, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go
index c4ecfed8765..73dd1900a4a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/metadata.proto
 
 package matcher
@@ -98,6 +98,7 @@ type MetadataMatcher_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*MetadataMatcher_PathSegment_Key
 	Segment isMetadataMatcher_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -187,14 +188,14 @@ var file_envoy_type_matcher_metadata_proto_rawDesc = []byte{
 	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x03, 0x6b, 0x65,
 	0x79, 0x42, 0x0e, 0x0a, 0x07, 0x73, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x03, 0xf8, 0x42,
-	0x01, 0x42, 0x76, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x01, 0x42, 0x76, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0d, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70,
+	0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/node.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/node.pb.go
index 317c8cfbeaf..707c281d67a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/node.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/node.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/node.proto
 
 package matcher
@@ -101,14 +101,14 @@ var file_envoy_type_matcher_node_proto_rawDesc = []byte{
 	0x61, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53, 0x74,
 	0x72, 0x75, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x0d, 0x6e, 0x6f, 0x64,
-	0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x73, 0x42, 0x72, 0x0a, 0x20, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x09,
-	0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06,
+	0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x73, 0x42, 0x72, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go
index 79e43bb9a88..43e99b5da60 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/number.proto
 
 package matcher
@@ -30,6 +30,7 @@ type DoubleMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*DoubleMatcher_Range
 	//	*DoubleMatcher_Exact
 	MatchPattern isDoubleMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
@@ -125,14 +126,14 @@ var file_envoy_type_matcher_number_proto_rawDesc = []byte{
 	0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x05, 0x65, 0x78, 0x61, 0x63, 0x74,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x05, 0x65, 0x78, 0x61, 0x63, 0x74, 0x42,
 	0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e,
-	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x74, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
-	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x4e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x74, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a,
+	0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x42, 0x0b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
+	0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/path.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/path.pb.go
index faeb33c40d8..260cd6338e8 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/path.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/path.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/path.proto
 
 package matcher
@@ -29,6 +29,7 @@ type PathMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*PathMatcher_Path
 	Rule isPathMatcher_Rule `protobuf_oneof:"rule"`
 }
@@ -109,14 +110,14 @@ var file_envoy_type_matcher_path_proto_rawDesc = []byte{
 	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53,
 	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42,
 	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x42, 0x0b,
-	0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x72, 0x0a, 0x20, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42,
-	0x09, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62,
+	0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x72, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x09, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/regex.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/regex.pb.go
index c990d4ce11c..20558d5e2a7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/regex.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/regex.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/regex.proto
 
 package matcher
@@ -30,6 +30,7 @@ type RegexMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to EngineType:
+	//
 	//	*RegexMatcher_GoogleRe2
 	EngineType isRegexMatcher_EngineType `protobuf_oneof:"engine_type"`
 	// The regex match string. The string must be supported by the configured engine.
@@ -124,7 +125,7 @@ type RegexMatchAndSubstitute struct {
 	// defined by the chosen regular expression engine. Google's `RE2
 	// <https://github.com/google/re2>`_ regular expression engine uses a
 	// backslash followed by the capture group number to denote a numbered
-	// capture group. E.g., ``\1`` refers to capture group 1, and ``\2`` refers
+	// capture group. E.g., “\1“ refers to capture group 1, and “\2“ refers
 	// to capture group 2.
 	Substitution string `protobuf:"bytes,2,opt,name=substitution,proto3" json:"substitution,omitempty"`
 }
@@ -179,11 +180,11 @@ func (x *RegexMatchAndSubstitute) GetSubstitution() string {
 // the documented `syntax <https://github.com/google/re2/wiki/Syntax>`_. The engine is designed
 // to complete execution in linear time as well as limit the amount of memory used.
 //
-// Envoy supports program size checking via runtime. The runtime keys ``re2.max_program_size.error_level``
-// and ``re2.max_program_size.warn_level`` can be set to integers as the maximum program size or
+// Envoy supports program size checking via runtime. The runtime keys “re2.max_program_size.error_level“
+// and “re2.max_program_size.warn_level“ can be set to integers as the maximum program size or
 // complexity that a compiled regex can have before an exception is thrown or a warning is
-// logged, respectively. ``re2.max_program_size.error_level`` defaults to 100, and
-// ``re2.max_program_size.warn_level`` has no default if unset (will not check/log a warning).
+// logged, respectively. “re2.max_program_size.error_level“ defaults to 100, and
+// “re2.max_program_size.warn_level“ has no default if unset (will not check/log a warning).
 //
 // Envoy emits two stats for tracking the program size of regexes: the histogram `re2.program_size`,
 // which records the program size, and the counter `re2.exceeded_warn_level`, which is incremented
@@ -201,7 +202,7 @@ type RegexMatcher_GoogleRE2 struct {
 	// This field is deprecated; regexp validation should be performed on the management server
 	// instead of being done by each individual client.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/type/matcher/regex.proto.
 	MaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"`
 }
 
@@ -237,7 +238,7 @@ func (*RegexMatcher_GoogleRE2) Descriptor() ([]byte, []int) {
 	return file_envoy_type_matcher_regex_proto_rawDescGZIP(), []int{0, 0}
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/type/matcher/regex.proto.
 func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrappers.UInt32Value {
 	if x != nil {
 		return x.MaxProgramSize
@@ -279,14 +280,14 @@ var file_envoy_type_matcher_regex_proto_rawDesc = []byte{
 	0x72, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07,
 	0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x74,
 	0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73,
-	0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x73, 0x0a, 0x20, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42,
-	0x0a, 0x52, 0x65, 0x67, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65,
-	0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x73, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0a, 0x52, 0x65, 0x67, 0x65, 0x78, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go
index 7bbb607caf9..5a14ef77532 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/string.proto
 
 package matcher
@@ -31,6 +31,7 @@ type StringMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*StringMatcher_Exact
 	//	*StringMatcher_Prefix
 	//	*StringMatcher_Suffix
@@ -103,7 +104,7 @@ func (x *StringMatcher) GetSuffix() string {
 	return ""
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/type/matcher/string.proto.
 func (x *StringMatcher) GetRegex() string {
 	if x, ok := x.GetMatchPattern().(*StringMatcher_Regex); ok {
 		return x.Regex
@@ -165,15 +166,16 @@ type StringMatcher_Regex struct {
 	//
 	// Examples:
 	//
-	// * The regex ``\d{3}`` matches the value *123*
-	// * The regex ``\d{3}`` does not match the value *1234*
-	// * The regex ``\d{3}`` does not match the value *123.456*
+	// * The regex “\d{3}“ matches the value *123*
+	// * The regex “\d{3}“ does not match the value *1234*
+	// * The regex “\d{3}“ does not match the value *123.456*
 	//
 	// .. attention::
-	//   This field has been deprecated in favor of `safe_regex` as it is not safe for use with
-	//   untrusted input in all cases.
 	//
-	// Deprecated: Do not use.
+	//	This field has been deprecated in favor of `safe_regex` as it is not safe for use with
+	//	untrusted input in all cases.
+	//
+	// Deprecated: Marked as deprecated in envoy/type/matcher/string.proto.
 	Regex string `protobuf:"bytes,4,opt,name=regex,proto3,oneof"`
 }
 
@@ -262,8 +264,8 @@ var file_envoy_type_matcher_string_proto_rawDesc = []byte{
 	0x21, 0x0a, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42,
 	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x06, 0x73, 0x75, 0x66, 0x66,
 	0x69, 0x78, 0x12, 0x28, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x10, 0x18, 0x01, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2,
-	0xd2, 0x05, 0x01, 0x48, 0x00, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x4b, 0x0a, 0x0a,
+	0x09, 0x42, 0x10, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x28, 0x80, 0x08, 0xb8, 0xee, 0xf2, 0xd2, 0x05,
+	0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x4b, 0x0a, 0x0a,
 	0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68,
@@ -278,14 +280,14 @@ var file_envoy_type_matcher_string_proto_rawDesc = []byte{
 	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53, 0x74, 0x72,
 	0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92,
 	0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x42, 0x74,
-	0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x69,
+	0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/struct.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/struct.pb.go
index 53cdbbda737..0946042182d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/struct.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/struct.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/struct.proto
 
 package matcher
@@ -30,47 +30,47 @@ const (
 //
 // .. code-block:: yaml
 //
-//        fields:
-//          a:
-//            struct_value:
-//              fields:
-//                b:
-//                  struct_value:
-//                    fields:
-//                      c:
-//                        string_value: pro
-//                t:
-//                  list_value:
-//                    values:
-//                      - string_value: m
-//                      - string_value: n
+//	fields:
+//	  a:
+//	    struct_value:
+//	      fields:
+//	        b:
+//	          struct_value:
+//	            fields:
+//	              c:
+//	                string_value: pro
+//	        t:
+//	          list_value:
+//	            values:
+//	              - string_value: m
+//	              - string_value: n
 //
 // The following MetadataMatcher is matched as the path [a, b, c] will retrieve a string value "pro"
 // from the Metadata which is matched to the specified prefix match.
 //
 // .. code-block:: yaml
 //
-//    path:
-//    - key: a
-//    - key: b
-//    - key: c
-//    value:
-//      string_match:
-//        prefix: pr
+//	path:
+//	- key: a
+//	- key: b
+//	- key: c
+//	value:
+//	  string_match:
+//	    prefix: pr
 //
 // The following StructMatcher is matched as the code will match one of the string values in the
 // list at the path [a, t].
 //
 // .. code-block:: yaml
 //
-//    path:
-//    - key: a
-//    - key: t
-//    value:
-//      list_match:
-//        one_of:
-//          string_match:
-//            exact: m
+//	path:
+//	- key: a
+//	- key: t
+//	value:
+//	  list_match:
+//	    one_of:
+//	      string_match:
+//	        exact: m
 //
 // An example use of StructMatcher is to match metadata in envoy.v*.core.Node.
 type StructMatcher struct {
@@ -137,6 +137,7 @@ type StructMatcher_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*StructMatcher_PathSegment_Key
 	Segment isStructMatcher_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -223,14 +224,14 @@ var file_envoy_type_matcher_struct_proto_rawDesc = []byte{
 	0x0a, 0x0b, 0x50, 0x61, 0x74, 0x68, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x0a,
 	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
 	0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x42, 0x0e, 0x0a, 0x07, 0x73, 0x65,
-	0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x74, 0x0a, 0x20, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b,
-	0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65,
-	0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x74, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/filter_state.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/filter_state.pb.go
index 4ad1d1ce3f0..65948905376 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/filter_state.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/filter_state.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/filter_state.proto
 
 package matcherv3
@@ -31,6 +31,7 @@ type FilterStateMatcher struct {
 	// The filter state key to retrieve the object.
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Types that are assignable to Matcher:
+	//
 	//	*FilterStateMatcher_StringMatch
 	Matcher isFilterStateMatcher_Matcher `protobuf_oneof:"matcher"`
 }
@@ -120,16 +121,16 @@ var file_envoy_type_matcher_v3_filter_state_proto_rawDesc = []byte{
 	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74,
 	0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0b, 0x73,
 	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x07, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x89, 0x01, 0x0a, 0x23, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x42, 0x10, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x89, 0x01, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70,
+	0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/http_inputs.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/http_inputs.pb.go
index be7272b47ef..01bf97506a3 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/http_inputs.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/http_inputs.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/http_inputs.proto
 
 package matcherv3
@@ -304,36 +304,36 @@ var file_envoy_type_matcher_v3_http_inputs_proto_rawDesc = []byte{
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74,
 	0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42,
-	0x08, 0x72, 0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65,
+	0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65,
 	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x4c, 0x0a, 0x1c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
 	0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
 	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72,
-	0x06, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e,
+	0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e,
 	0x61, 0x6d, 0x65, 0x22, 0x4c, 0x0a, 0x1c, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e,
 	0x70, 0x75, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0,
-	0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8,
+	0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d,
 	0x65, 0x22, 0x4d, 0x0a, 0x1d, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70,
 	0x75, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01,
-	0x01, 0xc8, 0x01, 0x00, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
 	0x22, 0x4b, 0x0a, 0x1f, 0x48, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x51,
 	0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e,
 	0x70, 0x75, 0x74, 0x12, 0x28, 0x0a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72,
 	0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
 	0x01, 0x52, 0x0a, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x42, 0x88, 0x01,
-	0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x49, 0x6e, 0x70, 0x75, 0x74,
-	0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48,
+	0x74, 0x74, 0x70, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
+	0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/metadata.pb.go
index ef57a33bdcd..91534f4b126 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/metadata.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/metadata.proto
 
 package matcherv3
@@ -107,6 +107,7 @@ type MetadataMatcher_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*MetadataMatcher_PathSegment_Key
 	Segment isMetadataMatcher_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -207,15 +208,15 @@ var file_envoy_type_matcher_v3_metadata_proto_rawDesc = []byte{
 	0x42, 0x01, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x65,
 	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x86, 0x01,
-	0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70,
+	0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/node.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/node.pb.go
index b2e12c84a88..1274f799c8e 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/node.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/node.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/node.proto
 
 package matcherv3
@@ -107,15 +107,15 @@ var file_envoy_type_matcher_v3_node_proto_rawDesc = []byte{
 	0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x73, 0x3a,
 	0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
 	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x82, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
-	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09,
-	0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x82, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76,
+	0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/number.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/number.pb.go
index 251d139a120..99733ecf4b7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/number.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/number.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/number.proto
 
 package matcherv3
@@ -30,6 +30,7 @@ type DoubleMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*DoubleMatcher_Range
 	//	*DoubleMatcher_Exact
 	MatchPattern isDoubleMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
@@ -131,15 +132,15 @@ var file_envoy_type_matcher_v3_number_proto_rawDesc = []byte{
 	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c,
 	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63,
 	0x68, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x84,
-	0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
+	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b,
+	0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/path.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/path.pb.go
index ddadfb0cadb..8854b2c485b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/path.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/path.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/path.proto
 
 package matcherv3
@@ -29,6 +29,7 @@ type PathMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Rule:
+	//
 	//	*PathMatcher_Path
 	Rule isPathMatcher_Rule `protobuf_oneof:"rule"`
 }
@@ -84,9 +85,9 @@ type isPathMatcher_Rule interface {
 }
 
 type PathMatcher_Path struct {
-	// The ``path`` must match the URL path portion of the :path header. The query and fragment
+	// The “path“ must match the URL path portion of the :path header. The query and fragment
 	// string (if present) are removed in the URL path portion.
-	// For example, the path ``/data`` will match the ``:path`` header ``/data#fragment?param=value``.
+	// For example, the path “/data“ will match the “:path“ header “/data#fragment?param=value“.
 	Path *StringMatcher `protobuf:"bytes,1,opt,name=path,proto3,oneof"`
 }
 
@@ -115,15 +116,15 @@ var file_envoy_type_matcher_v3_path_proto_rawDesc = []byte{
 	0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
 	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8,
-	0x42, 0x01, 0x42, 0x82, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x50, 0x61, 0x74, 0x68,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x42, 0x01, 0x42, 0x82, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0x42, 0x09, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
+	0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/regex.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/regex.pb.go
index 38a3bce81c9..c95338e39e8 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/regex.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/regex.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/regex.proto
 
 package matcherv3
@@ -31,6 +31,7 @@ type RegexMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to EngineType:
+	//
 	//	*RegexMatcher_GoogleRe2
 	EngineType isRegexMatcher_EngineType `protobuf_oneof:"engine_type"`
 	// The regex match string. The string must be supported by the configured engine. The regex is matched
@@ -77,7 +78,7 @@ func (m *RegexMatcher) GetEngineType() isRegexMatcher_EngineType {
 	return nil
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto.
 func (x *RegexMatcher) GetGoogleRe2() *RegexMatcher_GoogleRE2 {
 	if x, ok := x.GetEngineType().(*RegexMatcher_GoogleRe2); ok {
 		return x.GoogleRe2
@@ -99,7 +100,7 @@ type isRegexMatcher_EngineType interface {
 type RegexMatcher_GoogleRe2 struct {
 	// Google's RE2 regex engine.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto.
 	GoogleRe2 *RegexMatcher_GoogleRE2 `protobuf:"bytes,1,opt,name=google_re2,json=googleRe2,proto3,oneof"`
 }
 
@@ -129,7 +130,7 @@ type RegexMatchAndSubstitute struct {
 	// defined by the chosen regular expression engine. Google's `RE2
 	// <https://github.com/google/re2>`_ regular expression engine uses a
 	// backslash followed by the capture group number to denote a numbered
-	// capture group. E.g., ``\1`` refers to capture group 1, and ``\2`` refers
+	// capture group. E.g., “\1“ refers to capture group 1, and “\2“ refers
 	// to capture group 2.
 	Substitution string `protobuf:"bytes,2,opt,name=substitution,proto3" json:"substitution,omitempty"`
 }
@@ -184,14 +185,14 @@ func (x *RegexMatchAndSubstitute) GetSubstitution() string {
 // the documented `syntax <https://github.com/google/re2/wiki/Syntax>`_. The engine is designed
 // to complete execution in linear time as well as limit the amount of memory used.
 //
-// Envoy supports program size checking via runtime. The runtime keys ``re2.max_program_size.error_level``
-// and ``re2.max_program_size.warn_level`` can be set to integers as the maximum program size or
+// Envoy supports program size checking via runtime. The runtime keys “re2.max_program_size.error_level“
+// and “re2.max_program_size.warn_level“ can be set to integers as the maximum program size or
 // complexity that a compiled regex can have before an exception is thrown or a warning is
-// logged, respectively. ``re2.max_program_size.error_level`` defaults to 100, and
-// ``re2.max_program_size.warn_level`` has no default if unset (will not check/log a warning).
+// logged, respectively. “re2.max_program_size.error_level“ defaults to 100, and
+// “re2.max_program_size.warn_level“ has no default if unset (will not check/log a warning).
 //
-// Envoy emits two stats for tracking the program size of regexes: the histogram ``re2.program_size``,
-// which records the program size, and the counter ``re2.exceeded_warn_level``, which is incremented
+// Envoy emits two stats for tracking the program size of regexes: the histogram “re2.program_size“,
+// which records the program size, and the counter “re2.exceeded_warn_level“, which is incremented
 // each time the program size exceeds the warn level threshold.
 type RegexMatcher_GoogleRE2 struct {
 	state         protoimpl.MessageState
@@ -208,11 +209,10 @@ type RegexMatcher_GoogleRE2 struct {
 	//
 	// .. note::
 	//
-	//  Although this field is deprecated, the program size will still be checked against the
-	//  global ``re2.max_program_size.error_level`` runtime value.
-	//
+	//	Although this field is deprecated, the program size will still be checked against the
+	//	global ``re2.max_program_size.error_level`` runtime value.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto.
 	MaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"`
 }
 
@@ -248,7 +248,7 @@ func (*RegexMatcher_GoogleRE2) Descriptor() ([]byte, []int) {
 	return file_envoy_type_matcher_v3_regex_proto_rawDescGZIP(), []int{0, 0}
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto.
 func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrappers.UInt32Value {
 	if x != nil {
 		return x.MaxProgramSize
@@ -278,15 +278,15 @@ var file_envoy_type_matcher_v3_regex_proto_rawDesc = []byte{
 	0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
 	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74,
 	0x63, 0x68, 0x65, 0x72, 0x2e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x52, 0x45, 0x32, 0x42, 0x0b,
-	0x18, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x48, 0x00, 0x52, 0x09, 0x67,
+	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x09, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x52, 0x65, 0x32, 0x12, 0x1d, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65,
 	0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01,
 	0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x1a, 0x92, 0x01, 0x0a, 0x09, 0x47, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x52, 0x45, 0x32, 0x12, 0x53, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x6f,
 	0x67, 0x72, 0x61, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x18,
-	0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x50,
+	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92,
+	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x50,
 	0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e,
 	0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68,
@@ -302,20 +302,20 @@ var file_envoy_type_matcher_v3_regex_proto_rawDesc = []byte{
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
 	0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x2f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73,
 	0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b,
-	0xfa, 0x42, 0x08, 0x72, 0x06, 0xc0, 0x01, 0x02, 0xc8, 0x01, 0x00, 0x52, 0x0c, 0x73, 0x75, 0x62,
+	0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0c, 0x73, 0x75, 0x62,
 	0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c,
 	0x0a, 0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74,
 	0x63, 0x68, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41,
-	0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x42, 0x83, 0x01, 0x0a,
-	0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x52, 0x65, 0x67, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33,
-	0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x42, 0x83, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x52, 0x65,
+	0x67, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/status_code_input.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/status_code_input.pb.go
index 2209a7d5c62..618f84d5961 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/status_code_input.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/status_code_input.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/status_code_input.proto
 
 package matcherv3
@@ -115,16 +115,16 @@ var file_envoy_type_matcher_v3_status_code_input_proto_rawDesc = []byte{
 	0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x27, 0x0a, 0x25, 0x48, 0x74, 0x74,
 	0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43,
 	0x6f, 0x64, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x42, 0x8d, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x14, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33,
-	0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x74, 0x42, 0x8d, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69,
+	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0x42, 0x14, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e,
+	0x70, 0x75, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/string.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/string.pb.go
index 65d589aa6a5..3fec38decc7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/string.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/string.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/string.proto
 
 package matcherv3
@@ -30,6 +30,7 @@ type StringMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*StringMatcher_Exact
 	//	*StringMatcher_Prefix
 	//	*StringMatcher_Suffix
@@ -38,7 +39,7 @@ type StringMatcher struct {
 	MatchPattern isStringMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
 	// If true, indicates the exact/prefix/suffix/contains matching should be case insensitive. This
 	// has no effect for the safe_regex match.
-	// For example, the matcher ``data`` will match both input string ``Data`` and ``data`` if set to true.
+	// For example, the matcher “data“ will match both input string “Data“ and “data“ if set to true.
 	IgnoreCase bool `protobuf:"varint,6,opt,name=ignore_case,json=ignoreCase,proto3" json:"ignore_case,omitempty"`
 }
 
@@ -132,7 +133,7 @@ type StringMatcher_Exact struct {
 	//
 	// Examples:
 	//
-	// * ``abc`` only matches the value ``abc``.
+	// * “abc“ only matches the value “abc“.
 	Exact string `protobuf:"bytes,1,opt,name=exact,proto3,oneof"`
 }
 
@@ -142,7 +143,7 @@ type StringMatcher_Prefix struct {
 	//
 	// Examples:
 	//
-	// * ``abc`` matches the value ``abc.xyz``
+	// * “abc“ matches the value “abc.xyz“
 	Prefix string `protobuf:"bytes,2,opt,name=prefix,proto3,oneof"`
 }
 
@@ -152,7 +153,7 @@ type StringMatcher_Suffix struct {
 	//
 	// Examples:
 	//
-	// * ``abc`` matches the value ``xyz.abc``
+	// * “abc“ matches the value “xyz.abc“
 	Suffix string `protobuf:"bytes,3,opt,name=suffix,proto3,oneof"`
 }
 
@@ -167,7 +168,7 @@ type StringMatcher_Contains struct {
 	//
 	// Examples:
 	//
-	// * ``abc`` matches the value ``xyz.abc.def``
+	// * “abc“ matches the value “xyz.abc.def“
 	Contains string `protobuf:"bytes,7,opt,name=contains,proto3,oneof"`
 }
 
@@ -273,16 +274,16 @@ var file_envoy_type_matcher_v3_string_proto_rawDesc = []byte{
 	0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x3a,
 	0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
 	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x84, 0x01, 0x0a,
-	0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76,
-	0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x84, 0x01, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/struct.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/struct.pb.go
index 294fa99d84e..1ecb4ce095d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/struct.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/struct.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/struct.proto
 
 package matcherv3
@@ -23,54 +23,54 @@ const (
 )
 
 // StructMatcher provides a general interface to check if a given value is matched in
-// google.protobuf.Struct. It uses ``path`` to retrieve the value
+// google.protobuf.Struct. It uses “path“ to retrieve the value
 // from the struct and then check if it's matched to the specified value.
 //
 // For example, for the following Struct:
 //
 // .. code-block:: yaml
 //
-//        fields:
-//          a:
-//            struct_value:
-//              fields:
-//                b:
-//                  struct_value:
-//                    fields:
-//                      c:
-//                        string_value: pro
-//                t:
-//                  list_value:
-//                    values:
-//                      - string_value: m
-//                      - string_value: n
+//	fields:
+//	  a:
+//	    struct_value:
+//	      fields:
+//	        b:
+//	          struct_value:
+//	            fields:
+//	              c:
+//	                string_value: pro
+//	        t:
+//	          list_value:
+//	            values:
+//	              - string_value: m
+//	              - string_value: n
 //
 // The following MetadataMatcher is matched as the path [a, b, c] will retrieve a string value "pro"
 // from the Metadata which is matched to the specified prefix match.
 //
 // .. code-block:: yaml
 //
-//    path:
-//    - key: a
-//    - key: b
-//    - key: c
-//    value:
-//      string_match:
-//        prefix: pr
+//	path:
+//	- key: a
+//	- key: b
+//	- key: c
+//	value:
+//	  string_match:
+//	    prefix: pr
 //
 // The following StructMatcher is matched as the code will match one of the string values in the
 // list at the path [a, t].
 //
 // .. code-block:: yaml
 //
-//    path:
-//    - key: a
-//    - key: t
-//    value:
-//      list_match:
-//        one_of:
-//          string_match:
-//            exact: m
+//	path:
+//	- key: a
+//	- key: t
+//	value:
+//	  list_match:
+//	    one_of:
+//	      string_match:
+//	        exact: m
 //
 // An example use of StructMatcher is to match metadata in envoy.v*.core.Node.
 type StructMatcher struct {
@@ -137,6 +137,7 @@ type StructMatcher_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*StructMatcher_PathSegment_Key
 	Segment isStructMatcher_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -232,16 +233,16 @@ var file_envoy_type_matcher_v3_struct_proto_rawDesc = []byte{
 	0x74, 0x42, 0x0e, 0x0a, 0x07, 0x73, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x03, 0xf8, 0x42,
 	0x01, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x53, 0x74, 0x72,
-	0x75, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x84, 0x01, 0x0a, 0x23, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x84, 0x01, 0xba, 0x80, 0xc8,
+	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x53, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.go
index 0a694d08539..851261eb6c7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/v3/value.proto
 
 package matcherv3
@@ -24,7 +24,7 @@ const (
 
 // Specifies the way to match a ProtobufWkt::Value. Primitive values and ListValue are supported.
 // StructValue is not supported and is always not matched.
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 type ValueMatcher struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -33,12 +33,14 @@ type ValueMatcher struct {
 	// Specifies how to match a value.
 	//
 	// Types that are assignable to MatchPattern:
+	//
 	//	*ValueMatcher_NullMatch_
 	//	*ValueMatcher_DoubleMatch
 	//	*ValueMatcher_StringMatch
 	//	*ValueMatcher_BoolMatch
 	//	*ValueMatcher_PresentMatch
 	//	*ValueMatcher_ListMatch
+	//	*ValueMatcher_OrMatch
 	MatchPattern isValueMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
 }
 
@@ -123,6 +125,13 @@ func (x *ValueMatcher) GetListMatch() *ListMatcher {
 	return nil
 }
 
+func (x *ValueMatcher) GetOrMatch() *OrMatcher {
+	if x, ok := x.GetMatchPattern().(*ValueMatcher_OrMatch); ok {
+		return x.OrMatch
+	}
+	return nil
+}
+
 type isValueMatcher_MatchPattern interface {
 	isValueMatcher_MatchPattern()
 }
@@ -163,6 +172,11 @@ type ValueMatcher_ListMatch struct {
 	ListMatch *ListMatcher `protobuf:"bytes,6,opt,name=list_match,json=listMatch,proto3,oneof"`
 }
 
+type ValueMatcher_OrMatch struct {
+	// If specified, a match occurs if and only if any of the alternatives in the match accept the value.
+	OrMatch *OrMatcher `protobuf:"bytes,7,opt,name=or_match,json=orMatch,proto3,oneof"`
+}
+
 func (*ValueMatcher_NullMatch_) isValueMatcher_MatchPattern() {}
 
 func (*ValueMatcher_DoubleMatch) isValueMatcher_MatchPattern() {}
@@ -175,6 +189,8 @@ func (*ValueMatcher_PresentMatch) isValueMatcher_MatchPattern() {}
 
 func (*ValueMatcher_ListMatch) isValueMatcher_MatchPattern() {}
 
+func (*ValueMatcher_OrMatch) isValueMatcher_MatchPattern() {}
+
 // Specifies the way to match a list value.
 type ListMatcher struct {
 	state         protoimpl.MessageState
@@ -182,6 +198,7 @@ type ListMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*ListMatcher_OneOf
 	MatchPattern isListMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
 }
@@ -243,6 +260,54 @@ type ListMatcher_OneOf struct {
 
 func (*ListMatcher_OneOf) isListMatcher_MatchPattern() {}
 
+// Specifies a list of alternatives for the match.
+type OrMatcher struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ValueMatchers []*ValueMatcher `protobuf:"bytes,1,rep,name=value_matchers,json=valueMatchers,proto3" json:"value_matchers,omitempty"`
+}
+
+func (x *OrMatcher) Reset() {
+	*x = OrMatcher{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OrMatcher) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OrMatcher) ProtoMessage() {}
+
+func (x *OrMatcher) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OrMatcher.ProtoReflect.Descriptor instead.
+func (*OrMatcher) Descriptor() ([]byte, []int) {
+	return file_envoy_type_matcher_v3_value_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *OrMatcher) GetValueMatchers() []*ValueMatcher {
+	if x != nil {
+		return x.ValueMatchers
+	}
+	return nil
+}
+
 // NullMatch is an empty message to specify a null value.
 type ValueMatcher_NullMatch struct {
 	state         protoimpl.MessageState
@@ -253,7 +318,7 @@ type ValueMatcher_NullMatch struct {
 func (x *ValueMatcher_NullMatch) Reset() {
 	*x = ValueMatcher_NullMatch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[2]
+		mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -266,7 +331,7 @@ func (x *ValueMatcher_NullMatch) String() string {
 func (*ValueMatcher_NullMatch) ProtoMessage() {}
 
 func (x *ValueMatcher_NullMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[2]
+	mi := &file_envoy_type_matcher_v3_value_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -298,7 +363,7 @@ var file_envoy_type_matcher_v3_value_proto_rawDesc = []byte{
 	0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x03,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd, 0x04,
 	0x0a, 0x0c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4e,
 	0x0a, 0x0a, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
@@ -323,32 +388,42 @@ var file_envoy_type_matcher_v3_value_proto_rawDesc = []byte{
 	0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74,
 	0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x1a, 0x3d, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x3a, 0x30,
-	0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
-	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
-	0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x88,
-	0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x3c,
-	0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x5f, 0x6f, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x6e, 0x65, 0x4f, 0x66, 0x3a, 0x25, 0x9a, 0xc5,
-	0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x74,
-	0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x83, 0x01, 0x0a, 0x23, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
-	0x33, 0x42, 0x0a, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
-	0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x68, 0x12, 0x3d, 0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x72, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x1a, 0x3d, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x3a, 0x30, 0x9a,
+	0xc5, 0x88, 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x3a,
+	0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x88, 0x01,
+	0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x3c, 0x0a,
+	0x06, 0x6f, 0x6e, 0x65, 0x5f, 0x6f, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x6e, 0x65, 0x4f, 0x66, 0x3a, 0x25, 0x9a, 0xc5, 0x88,
+	0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x74, 0x74,
+	0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x61, 0x0a, 0x09, 0x4f, 0x72, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x0e, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02, 0x52, 0x0d, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x42, 0x83, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -363,25 +438,28 @@ func file_envoy_type_matcher_v3_value_proto_rawDescGZIP() []byte {
 	return file_envoy_type_matcher_v3_value_proto_rawDescData
 }
 
-var file_envoy_type_matcher_v3_value_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_envoy_type_matcher_v3_value_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_envoy_type_matcher_v3_value_proto_goTypes = []interface{}{
 	(*ValueMatcher)(nil),           // 0: envoy.type.matcher.v3.ValueMatcher
 	(*ListMatcher)(nil),            // 1: envoy.type.matcher.v3.ListMatcher
-	(*ValueMatcher_NullMatch)(nil), // 2: envoy.type.matcher.v3.ValueMatcher.NullMatch
-	(*DoubleMatcher)(nil),          // 3: envoy.type.matcher.v3.DoubleMatcher
-	(*StringMatcher)(nil),          // 4: envoy.type.matcher.v3.StringMatcher
+	(*OrMatcher)(nil),              // 2: envoy.type.matcher.v3.OrMatcher
+	(*ValueMatcher_NullMatch)(nil), // 3: envoy.type.matcher.v3.ValueMatcher.NullMatch
+	(*DoubleMatcher)(nil),          // 4: envoy.type.matcher.v3.DoubleMatcher
+	(*StringMatcher)(nil),          // 5: envoy.type.matcher.v3.StringMatcher
 }
 var file_envoy_type_matcher_v3_value_proto_depIdxs = []int32{
-	2, // 0: envoy.type.matcher.v3.ValueMatcher.null_match:type_name -> envoy.type.matcher.v3.ValueMatcher.NullMatch
-	3, // 1: envoy.type.matcher.v3.ValueMatcher.double_match:type_name -> envoy.type.matcher.v3.DoubleMatcher
-	4, // 2: envoy.type.matcher.v3.ValueMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
+	3, // 0: envoy.type.matcher.v3.ValueMatcher.null_match:type_name -> envoy.type.matcher.v3.ValueMatcher.NullMatch
+	4, // 1: envoy.type.matcher.v3.ValueMatcher.double_match:type_name -> envoy.type.matcher.v3.DoubleMatcher
+	5, // 2: envoy.type.matcher.v3.ValueMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher
 	1, // 3: envoy.type.matcher.v3.ValueMatcher.list_match:type_name -> envoy.type.matcher.v3.ListMatcher
-	0, // 4: envoy.type.matcher.v3.ListMatcher.one_of:type_name -> envoy.type.matcher.v3.ValueMatcher
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	2, // 4: envoy.type.matcher.v3.ValueMatcher.or_match:type_name -> envoy.type.matcher.v3.OrMatcher
+	0, // 5: envoy.type.matcher.v3.ListMatcher.one_of:type_name -> envoy.type.matcher.v3.ValueMatcher
+	0, // 6: envoy.type.matcher.v3.OrMatcher.value_matchers:type_name -> envoy.type.matcher.v3.ValueMatcher
+	7, // [7:7] is the sub-list for method output_type
+	7, // [7:7] is the sub-list for method input_type
+	7, // [7:7] is the sub-list for extension type_name
+	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_envoy_type_matcher_v3_value_proto_init() }
@@ -417,6 +495,18 @@ func file_envoy_type_matcher_v3_value_proto_init() {
 			}
 		}
 		file_envoy_type_matcher_v3_value_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OrMatcher); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_type_matcher_v3_value_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ValueMatcher_NullMatch); i {
 			case 0:
 				return &v.state
@@ -436,6 +526,7 @@ func file_envoy_type_matcher_v3_value_proto_init() {
 		(*ValueMatcher_BoolMatch)(nil),
 		(*ValueMatcher_PresentMatch)(nil),
 		(*ValueMatcher_ListMatch)(nil),
+		(*ValueMatcher_OrMatch)(nil),
 	}
 	file_envoy_type_matcher_v3_value_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*ListMatcher_OneOf)(nil),
@@ -446,7 +537,7 @@ func file_envoy_type_matcher_v3_value_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_type_matcher_v3_value_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.validate.go
index cff13d9b993..5bbf95eba26 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.validate.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3/value.pb.validate.go
@@ -253,6 +253,48 @@ func (m *ValueMatcher) validate(all bool) error {
 			}
 		}
 
+	case *ValueMatcher_OrMatch:
+		if v == nil {
+			err := ValueMatcherValidationError{
+				field:  "MatchPattern",
+				reason: "oneof value cannot be a typed-nil",
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		}
+		oneofMatchPatternPresent = true
+
+		if all {
+			switch v := interface{}(m.GetOrMatch()).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, ValueMatcherValidationError{
+						field:  "OrMatch",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, ValueMatcherValidationError{
+						field:  "OrMatch",
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(m.GetOrMatch()).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return ValueMatcherValidationError{
+					field:  "OrMatch",
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
 	default:
 		_ = v // ensures v is used
 	}
@@ -501,6 +543,150 @@ var _ interface {
 	ErrorName() string
 } = ListMatcherValidationError{}
 
+// Validate checks the field values on OrMatcher with the rules defined in the
+// proto definition for this message. If any rules are violated, the first
+// error encountered is returned, or nil if there are no violations.
+func (m *OrMatcher) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on OrMatcher with the rules defined in
+// the proto definition for this message. If any rules are violated, the
+// result is a list of violation errors wrapped in OrMatcherMultiError, or nil
+// if none found.
+func (m *OrMatcher) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *OrMatcher) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if len(m.GetValueMatchers()) < 2 {
+		err := OrMatcherValidationError{
+			field:  "ValueMatchers",
+			reason: "value must contain at least 2 item(s)",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
+
+	for idx, item := range m.GetValueMatchers() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, OrMatcherValidationError{
+						field:  fmt.Sprintf("ValueMatchers[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, OrMatcherValidationError{
+						field:  fmt.Sprintf("ValueMatchers[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return OrMatcherValidationError{
+					field:  fmt.Sprintf("ValueMatchers[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
+	if len(errors) > 0 {
+		return OrMatcherMultiError(errors)
+	}
+
+	return nil
+}
+
+// OrMatcherMultiError is an error wrapping multiple validation errors returned
+// by OrMatcher.ValidateAll() if the designated constraints aren't met.
+type OrMatcherMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m OrMatcherMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m OrMatcherMultiError) AllErrors() []error { return m }
+
+// OrMatcherValidationError is the validation error returned by
+// OrMatcher.Validate if the designated constraints aren't met.
+type OrMatcherValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e OrMatcherValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e OrMatcherValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e OrMatcherValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e OrMatcherValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e OrMatcherValidationError) ErrorName() string { return "OrMatcherValidationError" }
+
+// Error satisfies the builtin error interface
+func (e OrMatcherValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sOrMatcher.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = OrMatcherValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = OrMatcherValidationError{}
+
 // Validate checks the field values on ValueMatcher_NullMatch with the rules
 // defined in the proto definition for this message. If any rules are
 // violated, the first error encountered is returned, or nil if there are no violations.
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go
index 08e254c9335..09f57dd65fd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/matcher/value.proto
 
 package matcher
@@ -33,6 +33,7 @@ type ValueMatcher struct {
 	// Specifies how to match a value.
 	//
 	// Types that are assignable to MatchPattern:
+	//
 	//	*ValueMatcher_NullMatch_
 	//	*ValueMatcher_DoubleMatch
 	//	*ValueMatcher_StringMatch
@@ -182,6 +183,7 @@ type ListMatcher struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to MatchPattern:
+	//
 	//	*ListMatcher_OneOf
 	MatchPattern isListMatcher_MatchPattern `protobuf_oneof:"match_pattern"`
 }
@@ -327,14 +329,14 @@ var file_envoy_type_matcher_value_proto_rawDesc = []byte{
 	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x56, 0x61,
 	0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x6e,
 	0x65, 0x4f, 0x66, 0x42, 0x14, 0x0a, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x74,
-	0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x73, 0x0a, 0x20, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0a, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06,
+	0x74, 0x65, 0x72, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x73, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x01, 0x0a, 0x20, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0a, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/ya.make b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/ya.make
index 9b957dc43dc..c1b0a3168e7 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/ya.make
@@ -23,4 +23,6 @@ SRCS(
 
 END()
 
-RECURSE(v3)
+RECURSE(
+    v3
+)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2/metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2/metadata.pb.go
index 5daaeb94ab3..2ff3e3ab72c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2/metadata.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/metadata/v2/metadata.proto
 
 package metadatav2
@@ -29,22 +29,21 @@ const (
 //
 // .. code-block:: yaml
 //
-//    filter_metadata:
-//      envoy.xxx:
-//        prop:
-//          foo: bar
-//          xyz:
-//            hello: envoy
+//	filter_metadata:
+//	  envoy.xxx:
+//	    prop:
+//	      foo: bar
+//	      xyz:
+//	        hello: envoy
 //
 // The following MetadataKey will retrieve a string value "bar" from the Metadata.
 //
 // .. code-block:: yaml
 //
-//    key: envoy.xxx
-//    path:
-//    - key: prop
-//    - key: foo
-//
+//	key: envoy.xxx
+//	path:
+//	- key: prop
+//	- key: foo
 type MetadataKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -54,7 +53,7 @@ type MetadataKey struct {
 	// Typically, it represents a builtin subsystem or custom extension.
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The path to retrieve the Value from the Struct. It can be a prefix or a full path,
-	// e.g. ``[prop, xyz]`` for a struct or ``[prop, foo]`` for a string in the example,
+	// e.g. “[prop, xyz]“ for a struct or “[prop, foo]“ for a string in the example,
 	// which depends on the particular scenario.
 	//
 	// Note: Due to that only the key type segment is supported, the path can not specify a list
@@ -115,6 +114,7 @@ type MetadataKind struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Kind:
+	//
 	//	*MetadataKind_Request_
 	//	*MetadataKind_Route_
 	//	*MetadataKind_Cluster_
@@ -229,6 +229,7 @@ type MetadataKey_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*MetadataKey_PathSegment_Key
 	Segment isMetadataKey_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -492,18 +493,18 @@ var file_envoy_type_metadata_v2_metadata_proto_rawDesc = []byte{
 	0x00, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x1a, 0x09, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x1a, 0x07, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x1a, 0x09, 0x0a, 0x07, 0x43,
 	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x06, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x42, 0x0b,
-	0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0xa7, 0x01, 0x0a, 0x24,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x76, 0x32, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x2f, 0x76, 0x32, 0x3b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x76, 0x32, 0xf2,
-	0x98, 0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
-	0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0xa7, 0x01, 0xf2, 0x98,
+	0xfe, 0x8f, 0x05, 0x18, 0x12, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x01, 0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x32, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x32, 0x3b, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3/metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3/metadata.pb.go
index a1eafc3cbd9..84f7cfe7ccf 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3/metadata.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/metadata/v3/metadata.proto
 
 package metadatav3
@@ -22,29 +22,28 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// MetadataKey provides a general interface using ``key`` and ``path`` to retrieve value from
+// MetadataKey provides a general interface using “key“ and “path“ to retrieve value from
 // :ref:`Metadata <envoy_v3_api_msg_config.core.v3.Metadata>`.
 //
 // For example, for the following Metadata:
 //
 // .. code-block:: yaml
 //
-//    filter_metadata:
-//      envoy.xxx:
-//        prop:
-//          foo: bar
-//          xyz:
-//            hello: envoy
+//	filter_metadata:
+//	  envoy.xxx:
+//	    prop:
+//	      foo: bar
+//	      xyz:
+//	        hello: envoy
 //
 // The following MetadataKey will retrieve a string value "bar" from the Metadata.
 //
 // .. code-block:: yaml
 //
-//    key: envoy.xxx
-//    path:
-//    - key: prop
-//    - key: foo
-//
+//	key: envoy.xxx
+//	path:
+//	- key: prop
+//	- key: foo
 type MetadataKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -54,7 +53,7 @@ type MetadataKey struct {
 	// Typically, it represents a builtin subsystem or custom extension.
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The path to retrieve the Value from the Struct. It can be a prefix or a full path,
-	// e.g. ``[prop, xyz]`` for a struct or ``[prop, foo]`` for a string in the example,
+	// e.g. “[prop, xyz]“ for a struct or “[prop, foo]“ for a string in the example,
 	// which depends on the particular scenario.
 	//
 	// Note: Due to that only the key type segment is supported, the path can not specify a list
@@ -115,6 +114,7 @@ type MetadataKind struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Kind:
+	//
 	//	*MetadataKind_Request_
 	//	*MetadataKind_Route_
 	//	*MetadataKind_Cluster_
@@ -229,6 +229,7 @@ type MetadataKey_PathSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Segment:
+	//
 	//	*MetadataKey_PathSegment_Key
 	Segment isMetadataKey_PathSegment_Segment `protobuf_oneof:"segment"`
 }
@@ -514,16 +515,16 @@ var file_envoy_type_metadata_v3_metadata_proto_rawDesc = []byte{
 	0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
 	0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x65,
 	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x69, 0x6e, 0x64, 0x42, 0x0b, 0x0a, 0x04, 0x6b, 0x69,
-	0x6e, 0x64, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x89, 0x01, 0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33,
-	0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x33,
-	0x3b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x64, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x89, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
+	0x10, 0x02, 0x0a, 0x24, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go
index 5e4364c1cc7..3e3cbbdeca4 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/percent.proto
 
 package _type
@@ -218,13 +218,13 @@ var file_envoy_type_percent_proto_rawDesc = []byte{
 	0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x55,
 	0x4e, 0x44, 0x52, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x45, 0x4e, 0x5f, 0x54,
 	0x48, 0x4f, 0x55, 0x53, 0x41, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4d, 0x49, 0x4c,
-	0x4c, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x42, 0x65, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
-	0x70, 0x65, 0x42, 0x0c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70,
+	0x4c, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x42, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0c, 0x50, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go
index 511ef4d128b..757e29b042f 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/range.proto
 
 package _type
@@ -215,13 +215,13 @@ var file_envoy_type_range_proto_rawDesc = []byte{
 	0x35, 0x0a, 0x0b, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14,
 	0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x73,
 	0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x42, 0x63, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
-	0x70, 0x65, 0x42, 0x0a, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
-	0x79, 0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x01, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x42, 0x63, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0a, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
+	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/semantic_version.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/semantic_version.pb.go
index c8400e1ac67..5da30d2d374 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/semantic_version.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/semantic_version.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/semantic_version.proto
 
 package _type
@@ -101,14 +101,14 @@ var file_envoy_type_semantic_version_proto_rawDesc = []byte{
 	0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x6e, 0x75,
 	0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x6d, 0x69, 0x6e, 0x6f,
 	0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x42, 0x6d, 0x0a,
-	0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x14, 0x53, 0x65, 0x6d, 0x61, 0x6e,
-	0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x62, 0x06, 0x70, 0x72,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x42, 0x6d, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x42, 0x14, 0x53, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/token_bucket.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/token_bucket.pb.go
index ae70c742ff9..ffee4401a18 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/token_bucket.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/token_bucket.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/token_bucket.proto
 
 package _type
@@ -121,14 +121,14 @@ var file_envoy_type_token_bucket_proto_rawDesc = []byte{
 	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42,
 	0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, 0x2a, 0x00, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x6c, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x42, 0x69, 0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
-	0x70, 0x65, 0x42, 0x10, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x42, 0x69, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x01,
+	0x0a, 0x18, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x42, 0x10, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70,
+	0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2/custom_tag.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2/custom_tag.pb.go
index 050338f6fd1..313d79d288b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2/custom_tag.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2/custom_tag.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/tracing/v2/custom_tag.proto
 
 package tracingv2
@@ -35,6 +35,7 @@ type CustomTag struct {
 	// Used to specify what kind of custom tag.
 	//
 	// Types that are assignable to Type:
+	//
 	//	*CustomTag_Literal_
 	//	*CustomTag_Environment_
 	//	*CustomTag_RequestHeader
@@ -434,7 +435,7 @@ var file_envoy_type_tracing_v2_custom_tag_proto_rawDesc = []byte{
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
 	0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x50, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12,
 	0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa,
-	0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc0, 0x01, 0x01, 0xc8, 0x01, 0x00, 0x52, 0x04, 0x6e, 0x61,
+	0x42, 0x0a, 0x72, 0x08, 0x20, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61,
 	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
 	0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xb1, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61,
@@ -449,16 +450,16 @@ var file_envoy_type_tracing_v2_custom_tag_proto_rawDesc = []byte{
 	0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
 	0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64,
 	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32,
-	0x42, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x32,
-	0x3b, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x76, 0x32, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72,
+	0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x74, 0x72,
+	0x61, 0x63, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
+	0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3/custom_tag.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3/custom_tag.pb.go
index ef150cd344a..ea64f091fd8 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3/custom_tag.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3/custom_tag.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/tracing/v3/custom_tag.proto
 
 package tracingv3
@@ -35,6 +35,7 @@ type CustomTag struct {
 	// Used to specify what kind of custom tag.
 	//
 	// Types that are assignable to Type:
+	//
 	//	*CustomTag_Literal_
 	//	*CustomTag_Environment_
 	//	*CustomTag_RequestHeader
@@ -442,8 +443,8 @@ var file_envoy_type_tracing_v3_custom_tag_proto_rawDesc = []byte{
 	0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61,
 	0x67, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x7f, 0x0a,
 	0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc0, 0x01,
-	0x01, 0xc8, 0x01, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01,
+	0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65,
 	0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x3a,
 	0x2d, 0x9a, 0xc5, 0x88, 0x1e, 0x28, 0x0a, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
@@ -466,16 +467,16 @@ var file_envoy_type_tracing_v3_custom_tag_proto_rawDesc = []byte{
 	0x61, 0x74, 0x61, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76,
 	0x32, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x42, 0x0b, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0x0a, 0x23, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33,
-	0x42, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x33,
-	0x3b, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x87, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72,
+	0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x74, 0x72,
+	0x61, 0x63, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/hash_policy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/hash_policy.pb.go
index c03381ddca7..2cda6f3dc1d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/hash_policy.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/hash_policy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/hash_policy.proto
 
 package typev3
@@ -29,6 +29,7 @@ type HashPolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to PolicySpecifier:
+	//
 	//	*HashPolicy_SourceIp_
 	//	*HashPolicy_FilterState_
 	PolicySpecifier isHashPolicy_PolicySpecifier `protobuf_oneof:"policy_specifier"`
@@ -225,15 +226,15 @@ var file_envoy_type_v3_hash_policy_proto_rawDesc = []byte{
 	0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x1c, 0x9a, 0xc5, 0x88, 0x1e, 0x17, 0x0a, 0x15, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f,
 	0x6c, 0x69, 0x63, 0x79, 0x42, 0x17, 0x0a, 0x10, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x75, 0x0a,
-	0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48, 0x61,
-	0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
-	0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x75, 0xba,
+	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
+	0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79,
+	0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http.pb.go
index 7d21a85f66a..c92aa2d6deb 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/http.proto
 
 package typev3
@@ -83,14 +83,14 @@ var file_envoy_type_v3_http_proto_rawDesc = []byte{
 	0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2a, 0x32, 0x0a, 0x0f, 0x43, 0x6f, 0x64, 0x65,
 	0x63, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x48,
 	0x54, 0x54, 0x50, 0x31, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x32, 0x10,
-	0x01, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x33, 0x10, 0x02, 0x42, 0x6f, 0x0a, 0x1b,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x48, 0x74, 0x74,
-	0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74,
-	0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70,
+	0x01, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x33, 0x10, 0x02, 0x42, 0x6f, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x76, 0x33, 0x42, 0x09, 0x48, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
+	0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http_status.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http_status.pb.go
index 52cd8b77dbf..6ca1677a18c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http_status.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/http_status.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/http_status.proto
 
 package typev3
@@ -379,15 +379,15 @@ var file_envoy_type_v3_http_status_proto_rawDesc = []byte{
 	0x64, 0x10, 0xfc, 0x03, 0x12, 0x10, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e,
 	0x64, 0x65, 0x64, 0x10, 0xfe, 0x03, 0x12, 0x22, 0x0a, 0x1d, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72,
 	0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0xff, 0x03, 0x42, 0x75, 0x0a, 0x1b, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f,
-	0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
-	0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0xff, 0x03, 0x42, 0x75, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
+	0x33, 0x42, 0x0f, 0x48, 0x74, 0x74, 0x70, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/percent.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/percent.pb.go
index 22f1ff49395..727374bb357 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/percent.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/percent.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/percent.proto
 
 package typev3
@@ -225,14 +225,14 @@ var file_envoy_type_v3_percent_proto_rawDesc = []byte{
 	0x12, 0x0b, 0x0a, 0x07, 0x4d, 0x49, 0x4c, 0x4c, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x3a, 0x23, 0x9a,
 	0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
 	0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65,
-	0x6e, 0x74, 0x42, 0x72, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
-	0x33, 0x42, 0x0c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x74, 0x42, 0x72, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x50, 0x65, 0x72, 0x63, 0x65,
+	0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b,
+	0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/range.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/range.pb.go
index 80323c86250..fa10eee0f10 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/range.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/range.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/range.proto
 
 package typev3
@@ -223,14 +223,14 @@ var file_envoy_type_v3_range_proto_rawDesc = []byte{
 	0x28, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x3a, 0x1d, 0x9a, 0xc5, 0x88,
 	0x1e, 0x18, 0x0a, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x44,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x70, 0x0a, 0x1b, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x52, 0x61, 0x6e, 0x67, 0x65,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79,
-	0x70, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x70, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
+	0x33, 0x42, 0x0a, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79,
+	0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_strategy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_strategy.pb.go
index adab81a8c9c..b342e22173a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_strategy.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_strategy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/ratelimit_strategy.proto
 
 package typev3
@@ -76,6 +76,7 @@ type RateLimitStrategy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Strategy:
+	//
 	//	*RateLimitStrategy_BlanketRule_
 	//	*RateLimitStrategy_RequestsPerTimeUnit_
 	//	*RateLimitStrategy_TokenBucket
@@ -177,14 +178,14 @@ func (*RateLimitStrategy_TokenBucket) isRateLimitStrategy_Strategy() {}
 // Allows to specify the desired requests per second (RPS, QPS), requests per minute (QPM, RPM),
 // etc., without specifying a rate limiting algorithm implementation.
 //
-// ``RequestsPerTimeUnit`` strategy does not demand any specific rate limiting algorithm to be
+// “RequestsPerTimeUnit“ strategy does not demand any specific rate limiting algorithm to be
 // used (in contrast to the :ref:`TokenBucket <envoy_v3_api_msg_type.v3.TokenBucket>`,
 // for example). It implies that the implementation details of rate limiting algorithm are
 // irrelevant as long as the configured number of "requests per time unit" is achieved.
 //
-// Note that the ``TokenBucket`` is still a valid implementation of the ``RequestsPerTimeUnit``
+// Note that the “TokenBucket“ is still a valid implementation of the “RequestsPerTimeUnit“
 // strategy, and may be chosen to enforce the rate limit. However, there's no guarantee it will be
-// the ``TokenBucket`` in particular, and not the Leaky Bucket, the Sliding Window, or any other
+// the “TokenBucket“ in particular, and not the Leaky Bucket, the Sliding Window, or any other
 // rate limiting algorithm that fulfills the requirements.
 type RateLimitStrategy_RequestsPerTimeUnit struct {
 	state         protoimpl.MessageState
@@ -193,18 +194,18 @@ type RateLimitStrategy_RequestsPerTimeUnit struct {
 
 	// The desired number of requests per :ref:`time_unit
 	// <envoy_v3_api_field_type.v3.RateLimitStrategy.RequestsPerTimeUnit.time_unit>` to allow.
-	// If set to ``0``, deny all (equivalent to ``BlanketRule.DENY_ALL``).
+	// If set to “0“, deny all (equivalent to “BlanketRule.DENY_ALL“).
 	//
 	// .. note::
-	//   Note that the algorithm implementation determines the course of action for the requests
-	//   over the limit. As long as the ``requests_per_time_unit`` converges on the desired value,
-	//   it's allowed to treat this field as a soft-limit: allow bursts, redistribute the allowance
-	//   over time, etc.
 	//
+	//	Note that the algorithm implementation determines the course of action for the requests
+	//	over the limit. As long as the ``requests_per_time_unit`` converges on the desired value,
+	//	it's allowed to treat this field as a soft-limit: allow bursts, redistribute the allowance
+	//	over time, etc.
 	RequestsPerTimeUnit uint64 `protobuf:"varint,1,opt,name=requests_per_time_unit,json=requestsPerTimeUnit,proto3" json:"requests_per_time_unit,omitempty"`
 	// The unit of time. Ignored when :ref:`requests_per_time_unit
 	// <envoy_v3_api_field_type.v3.RateLimitStrategy.RequestsPerTimeUnit.requests_per_time_unit>`
-	// is ``0`` (deny all).
+	// is “0“ (deny all).
 	TimeUnit RateLimitUnit `protobuf:"varint,2,opt,name=time_unit,json=timeUnit,proto3,enum=envoy.type.v3.RateLimitUnit" json:"time_unit,omitempty"`
 }
 
@@ -301,15 +302,15 @@ var file_envoy_type_v3_ratelimit_strategy_proto_rawDesc = []byte{
 	0x6e, 0x6b, 0x65, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x4c, 0x4c, 0x4f,
 	0x57, 0x5f, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x45, 0x4e, 0x59, 0x5f,
 	0x41, 0x4c, 0x4c, 0x10, 0x01, 0x42, 0x0f, 0x0a, 0x08, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67,
-	0x79, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x84, 0x01, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x79, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x84, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
 	0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x16, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69,
 	0x74, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
 	0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
 	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74,
-	0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70,
+	0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_unit.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_unit.pb.go
index e98d9c59895..6677a074aee 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_unit.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/ratelimit_unit.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/ratelimit_unit.proto
 
 package typev3
@@ -104,14 +104,14 @@ var file_envoy_type_v3_ratelimit_unit_proto_rawDesc = []byte{
 	0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x55, 0x52,
 	0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x41, 0x59, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x4d,
 	0x4f, 0x4e, 0x54, 0x48, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x59, 0x45, 0x41, 0x52, 0x10, 0x06,
-	0x42, 0x78, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42,
-	0x12, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65,
-	0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x42, 0x78, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x12, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/semantic_version.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/semantic_version.pb.go
index 1909162f830..10416e602cf 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/semantic_version.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/semantic_version.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/semantic_version.proto
 
 package typev3
@@ -106,15 +106,15 @@ var file_envoy_type_v3_semantic_version_proto_rawDesc = []byte{
 	0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d,
 	0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x3a, 0x21, 0x9a, 0xc5, 0x88, 0x1e, 0x1c, 0x0a, 0x1a,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x53, 0x65, 0x6d, 0x61, 0x6e,
-	0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x7a, 0x0a, 0x1b, 0x69, 0x6f,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x14, 0x53, 0x65, 0x6d, 0x61, 0x6e,
-	0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x7a, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
+	0x33, 0x42, 0x14, 0x53, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b,
+	0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/token_bucket.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/token_bucket.pb.go
index dd629581c42..5363e5abe08 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/token_bucket.pb.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/v3/token_bucket.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.30.0
+// 	protoc        v4.23.4
 // source: envoy/type/v3/token_bucket.proto
 
 package typev3
@@ -37,8 +37,8 @@ type TokenBucket struct {
 	// to a single token.
 	TokensPerFill *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"`
 	// The fill interval that tokens are added to the bucket. During each fill interval
-	// ``tokens_per_fill`` are added to the bucket. The bucket will never contain more than
-	// ``max_tokens`` tokens.
+	// “tokens_per_fill“ are added to the bucket. The bucket will never contain more than
+	// “max_tokens“ tokens.
 	FillInterval *duration.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"`
 }
 
@@ -126,14 +126,14 @@ var file_envoy_type_v3_token_bucket_proto_rawDesc = []byte{
 	0x00, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a,
 	0x1d, 0x9a, 0xc5, 0x88, 0x1e, 0x18, 0x0a, 0x16, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
 	0x70, 0x65, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x76,
-	0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0xba, 0x80,
-	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x1b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x10, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x63, 0x6b,
+	0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b,
+	0x74, 0x79, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/types.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/types.go
index b99aacb84fe..ffaf0a97743 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/types.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/types.go
@@ -38,13 +38,17 @@ func (e SkipFetchError) Error() string {
 // ResponseType enumeration of supported response types
 type ResponseType int
 
+// NOTE: The order of this enum MATTERS!
+// https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#aggregated-discovery-service
+// ADS expects things to be returned in a specific order.
+// See the following issue for details: https://github.com/envoyproxy/go-control-plane/issues/526
 const (
-	Endpoint ResponseType = iota
-	Cluster
+	Cluster ResponseType = iota
+	Endpoint
+	Listener
 	Route
 	ScopedRoute
 	VirtualHost
-	Listener
 	Secret
 	Runtime
 	ExtensionConfig
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/ya.make
index 293b3bb9fc1..c7d9e357f21 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/types/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(types.go)
+SRCS(
+    types.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/cache.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/cache.go
index 55f60e0d6a0..5ad8e241405 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/cache.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/cache.go
@@ -44,6 +44,10 @@ type DeltaRequest = discovery.DeltaDiscoveryRequest
 // ConfigWatcher implementation must be thread-safe.
 type ConfigWatcher interface {
 	// CreateWatch returns a new open watch from a non-empty request.
+	// This is the entrypoint to propagate configuration changes the
+	// provided Response channel. State from the gRPC server is utilized
+	// to make sure consuming cache implementations can see what the server has sent to clients.
+	//
 	// An individual consumer normally issues a single open watch by each type URL.
 	//
 	// The provided channel produces requested resources as responses, once they are available.
@@ -53,6 +57,9 @@ type ConfigWatcher interface {
 	CreateWatch(*Request, stream.StreamState, chan Response) (cancel func())
 
 	// CreateDeltaWatch returns a new open incremental xDS watch.
+	// This is the entrypoint to propagate configuration changes the
+	// provided DeltaResponse channel. State from the gRPC server is utilized
+	// to make sure consuming cache implementations can see what the server has sent to clients.
 	//
 	// The provided channel produces requested resources as responses, or spontaneous updates in accordance
 	// with the incremental xDS specification.
@@ -160,8 +167,10 @@ type RawDeltaResponse struct {
 	marshaledResponse atomic.Value
 }
 
-var _ Response = &RawResponse{}
-var _ DeltaResponse = &RawDeltaResponse{}
+var (
+	_ Response      = &RawResponse{}
+	_ DeltaResponse = &RawDeltaResponse{}
+)
 
 // PassthroughResponse is a pre constructed xDS response that need not go through marshaling transformations.
 type PassthroughResponse struct {
@@ -188,8 +197,10 @@ type DeltaPassthroughResponse struct {
 	ctx context.Context
 }
 
-var _ Response = &PassthroughResponse{}
-var _ DeltaResponse = &DeltaPassthroughResponse{}
+var (
+	_ Response      = &PassthroughResponse{}
+	_ DeltaResponse = &DeltaPassthroughResponse{}
+)
 
 // GetDiscoveryResponse performs the marshaling the first time its called and uses the cached response subsequently.
 // This is necessary because the marshaled response does not change across the calls.
@@ -218,7 +229,7 @@ func (r *RawResponse) GetDiscoveryResponse() (*discovery.DiscoveryResponse, erro
 		marshaledResponse = &discovery.DiscoveryResponse{
 			VersionInfo: r.Version,
 			Resources:   marshaledResources,
-			TypeUrl:     r.Request.TypeUrl,
+			TypeUrl:     r.GetRequest().GetTypeUrl(),
 		}
 
 		r.marshaledResponse.Store(marshaledResponse)
@@ -249,7 +260,7 @@ func (r *RawDeltaResponse) GetDeltaDiscoveryResponse() (*discovery.DeltaDiscover
 			marshaledResources[i] = &discovery.Resource{
 				Name: name,
 				Resource: &anypb.Any{
-					TypeUrl: r.DeltaRequest.TypeUrl,
+					TypeUrl: r.GetDeltaRequest().GetTypeUrl(),
 					Value:   marshaledResource,
 				},
 				Version: version,
@@ -259,7 +270,7 @@ func (r *RawDeltaResponse) GetDeltaDiscoveryResponse() (*discovery.DeltaDiscover
 		marshaledResponse = &discovery.DeltaDiscoveryResponse{
 			Resources:         marshaledResources,
 			RemovedResources:  r.RemovedResources,
-			TypeUrl:           r.DeltaRequest.TypeUrl,
+			TypeUrl:           r.GetDeltaRequest().GetTypeUrl(),
 			SystemVersionInfo: r.SystemVersionInfo,
 		}
 		r.marshaledResponse.Store(marshaledResponse)
@@ -315,14 +326,14 @@ func (r *RawResponse) maybeCreateTTLResource(resource types.ResourceWithTTL) (ty
 			if err != nil {
 				return nil, "", err
 			}
-			rsrc.TypeUrl = r.Request.TypeUrl
+			rsrc.TypeUrl = r.GetRequest().GetTypeUrl()
 			wrappedResource.Resource = rsrc
 		}
 
 		return wrappedResource, deltaResourceTypeURL, nil
 	}
 
-	return resource.Resource, r.Request.TypeUrl, nil
+	return resource.Resource, r.GetRequest().GetTypeUrl(), nil
 }
 
 // GetDiscoveryResponse returns the final passthrough Discovery Response.
@@ -347,19 +358,22 @@ func (r *DeltaPassthroughResponse) GetDeltaRequest() *discovery.DeltaDiscoveryRe
 
 // GetVersion returns the response version.
 func (r *PassthroughResponse) GetVersion() (string, error) {
-	if r.DiscoveryResponse != nil {
-		return r.DiscoveryResponse.VersionInfo, nil
+	discoveryResponse, _ := r.GetDiscoveryResponse()
+	if discoveryResponse != nil {
+		return discoveryResponse.GetVersionInfo(), nil
 	}
 	return "", fmt.Errorf("DiscoveryResponse is nil")
 }
+
 func (r *PassthroughResponse) GetContext() context.Context {
 	return r.ctx
 }
 
 // GetSystemVersion returns the response version.
 func (r *DeltaPassthroughResponse) GetSystemVersion() (string, error) {
-	if r.DeltaDiscoveryResponse != nil {
-		return r.DeltaDiscoveryResponse.SystemVersionInfo, nil
+	deltaDiscoveryResponse, _ := r.GetDeltaDiscoveryResponse()
+	if deltaDiscoveryResponse != nil {
+		return deltaDiscoveryResponse.GetSystemVersionInfo(), nil
 	}
 	return "", fmt.Errorf("DeltaDiscoveryResponse is nil")
 }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/linear.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/linear.go
index cf5ab7e268b..f7786ac4f9d 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/linear.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/linear.go
@@ -187,7 +187,7 @@ func (cache *LinearCache) respondDelta(request *DeltaRequest, value chan DeltaRe
 	if len(resp.Resources) > 0 || len(resp.RemovedResources) > 0 {
 		if cache.log != nil {
 			cache.log.Debugf("[linear cache] node: %s, sending delta response for typeURL %s with resources: %v removed resources: %v with wildcard: %t",
-				request.GetNode().GetId(), request.TypeUrl, GetResourceNames(resp.Resources), resp.RemovedResources, state.IsWildcard())
+				request.GetNode().GetId(), request.GetTypeUrl(), GetResourceNames(resp.Resources), resp.RemovedResources, state.IsWildcard())
 		}
 		value <- resp
 		return resp
@@ -299,7 +299,7 @@ func (cache *LinearCache) GetResources() map[string]types.Resource {
 }
 
 func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, value chan Response) func() {
-	if request.TypeUrl != cache.typeURL {
+	if request.GetTypeUrl() != cache.typeURL {
 		value <- nil
 		return nil
 	}
@@ -312,8 +312,8 @@ func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, va
 	// strip version prefix if it is present
 	var lastVersion uint64
 	var err error
-	if strings.HasPrefix(request.VersionInfo, cache.versionPrefix) {
-		lastVersion, err = strconv.ParseUint(request.VersionInfo[len(cache.versionPrefix):], 0, 64)
+	if strings.HasPrefix(request.GetVersionInfo(), cache.versionPrefix) {
+		lastVersion, err = strconv.ParseUint(request.GetVersionInfo()[len(cache.versionPrefix):], 0, 64)
 	} else {
 		err = errors.New("mis-matched version prefix")
 	}
@@ -321,13 +321,14 @@ func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, va
 	cache.mu.Lock()
 	defer cache.mu.Unlock()
 
-	if err != nil {
+	switch {
+	case err != nil:
 		stale = true
-		staleResources = request.ResourceNames
-	} else if len(request.ResourceNames) == 0 {
+		staleResources = request.GetResourceNames()
+	case len(request.GetResourceNames()) == 0:
 		stale = lastVersion != cache.version
-	} else {
-		for _, name := range request.ResourceNames {
+	default:
+		for _, name := range request.GetResourceNames() {
 			// When a resource is removed, its version defaults 0 and it is not considered stale.
 			if lastVersion < cache.versionVector[name] {
 				stale = true
@@ -340,7 +341,7 @@ func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, va
 		return nil
 	}
 	// Create open watches since versions are up to date.
-	if len(request.ResourceNames) == 0 {
+	if len(request.GetResourceNames()) == 0 {
 		cache.watchAll[value] = struct{}{}
 		return func() {
 			cache.mu.Lock()
@@ -348,7 +349,7 @@ func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, va
 			delete(cache.watchAll, value)
 		}
 	}
-	for _, name := range request.ResourceNames {
+	for _, name := range request.GetResourceNames() {
 		set, exists := cache.watches[name]
 		if !exists {
 			set = make(watches)
@@ -359,7 +360,7 @@ func (cache *LinearCache) CreateWatch(request *Request, _ stream.StreamState, va
 	return func() {
 		cache.mu.Lock()
 		defer cache.mu.Unlock()
-		for _, name := range request.ResourceNames {
+		for _, name := range request.GetResourceNames() {
 			set, exists := cache.watches[name]
 			if exists {
 				delete(set, value)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/order.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/order.go
new file mode 100644
index 00000000000..c416946e82b
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/order.go
@@ -0,0 +1,24 @@
+package cache
+
+// Key is an internal sorting data structure we can use to
+// order responses by Type and their associated watch IDs.
+type key struct {
+	ID      int64
+	TypeURL string
+}
+
+// Keys implements Go's sorting.Sort interface
+type keys []key
+
+func (k keys) Len() int {
+	return len(k)
+}
+
+// Less compares the typeURL and determines what order things should be sent.
+func (k keys) Less(i, j int) bool {
+	return GetResponseType(k[i].TypeURL) < GetResponseType(k[j].TypeURL)
+}
+
+func (k keys) Swap(i, j int) {
+	k[i], k[j] = k[j], k[i]
+}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/resource.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/resource.go
index ea57e4714ae..d4c25f2a117 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/resource.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/resource.go
@@ -22,15 +22,12 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	cluster "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	endpoint "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	route "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	auth "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
 	runtime "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/cache/types"
 	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
-	ratelimit "github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3"
 )
 
 // GetResponseType returns the enumeration for a valid xDS type URL.
@@ -93,24 +90,6 @@ func GetResourceName(res types.Resource) string {
 	switch v := res.(type) {
 	case *endpoint.ClusterLoadAssignment:
 		return v.GetClusterName()
-	case *cluster.Cluster:
-		return v.GetName()
-	case *route.RouteConfiguration:
-		return v.GetName()
-	case *route.ScopedRouteConfiguration:
-		return v.GetName()
-	case *route.VirtualHost:
-		return v.GetName()
-	case *listener.Listener:
-		return v.GetName()
-	case *auth.Secret:
-		return v.GetName()
-	case *runtime.Runtime:
-		return v.GetName()
-	case *core.TypedExtensionConfig:
-		return v.GetName()
-	case *ratelimit.RateLimitConfig:
-		return v.GetName()
 	case types.ResourceWithName:
 		return v.GetName()
 	default:
@@ -197,13 +176,13 @@ func mapMerge(dst map[string]bool, src map[string]bool) {
 func getClusterReferences(src *cluster.Cluster, out map[resource.Type]map[string]bool) {
 	endpoints := map[string]bool{}
 
-	switch typ := src.ClusterDiscoveryType.(type) {
+	switch typ := src.GetClusterDiscoveryType().(type) {
 	case *cluster.Cluster_Type:
 		if typ.Type == cluster.Cluster_EDS {
-			if src.EdsClusterConfig != nil && src.EdsClusterConfig.ServiceName != "" {
-				endpoints[src.EdsClusterConfig.ServiceName] = true
+			if src.GetEdsClusterConfig() != nil && src.GetEdsClusterConfig().GetServiceName() != "" {
+				endpoints[src.GetEdsClusterConfig().GetServiceName()] = true
 			} else {
-				endpoints[src.Name] = true
+				endpoints[src.GetName()] = true
 			}
 		}
 	}
@@ -222,8 +201,8 @@ func getListenerReferences(src *listener.Listener, out map[resource.Type]map[str
 	routes := map[string]bool{}
 
 	// Extract route configuration names from HTTP connection manager.
-	for _, chain := range src.FilterChains {
-		for _, filter := range chain.Filters {
+	for _, chain := range src.GetFilterChains() {
+		for _, filter := range chain.GetFilters() {
 			config := resource.GetHTTPConnectionManager(filter)
 			if config == nil {
 				continue
@@ -236,7 +215,7 @@ func getListenerReferences(src *listener.Listener, out map[resource.Type]map[str
 
 			// If the scoped route mapping is embedded, add the referenced route resource names.
 			for _, s := range config.GetScopedRoutes().GetScopedRouteConfigurationsList().GetScopedRouteConfigurations() {
-				routes[s.RouteConfigurationName] = true
+				routes[s.GetRouteConfigurationName()] = true
 			}
 		}
 	}
@@ -254,7 +233,7 @@ func getScopedRouteReferences(src *route.ScopedRouteConfiguration, out map[resou
 	routes := map[string]bool{}
 
 	// For a scoped route configuration, the dependent resource is the RouteConfigurationName.
-	routes[src.RouteConfigurationName] = true
+	routes[src.GetRouteConfigurationName()] = true
 
 	if len(routes) > 0 {
 		if _, ok := out[resource.RouteType]; !ok {
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/simple.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/simple.go
index 43fb6a24a67..ebf63f5b6f6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/simple.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/simple.go
@@ -193,8 +193,8 @@ func (cache *snapshotCache) sendHeartbeats(ctx context.Context, node string) {
 		info.mu.Lock()
 		for id, watch := range info.watches {
 			// Respond with the current version regardless of whether the version has changed.
-			version := snapshot.GetVersion(watch.Request.TypeUrl)
-			resources := snapshot.GetResourcesAndTTL(watch.Request.TypeUrl)
+			version := snapshot.GetVersion(watch.Request.GetTypeUrl())
+			resources := snapshot.GetResourcesAndTTL(watch.Request.GetTypeUrl())
 
 			// TODO(snowp): Construct this once per type instead of once per watch.
 			resourcesWithTTL := map[string]types.ResourceWithTTL{}
@@ -207,7 +207,7 @@ func (cache *snapshotCache) sendHeartbeats(ctx context.Context, node string) {
 			if len(resourcesWithTTL) == 0 {
 				continue
 			}
-			cache.log.Debugf("respond open watch %d%v with heartbeat for version %q", id, watch.Request.ResourceNames, version)
+			cache.log.Debugf("respond open watch %d%v with heartbeat for version %q", id, watch.Request.GetResourceNames(), version)
 			err := cache.respond(ctx, watch.Request, watch.Response, resourcesWithTTL, version, true)
 			if err != nil {
 				cache.log.Errorf("received error when attempting to respond to watches: %v", err)
@@ -220,7 +220,7 @@ func (cache *snapshotCache) sendHeartbeats(ctx context.Context, node string) {
 	}
 }
 
-// SetSnapshotCacheContext updates a snapshot for a node.
+// SetSnapshotCache updates a snapshot for a node.
 func (cache *snapshotCache) SetSnapshot(ctx context.Context, node string, snapshot ResourceSnapshot) error {
 	cache.mu.Lock()
 	defer cache.mu.Unlock()
@@ -232,33 +232,96 @@ func (cache *snapshotCache) SetSnapshot(ctx context.Context, node string, snapsh
 	if info, ok := cache.status[node]; ok {
 		info.mu.Lock()
 		defer info.mu.Unlock()
-		for id, watch := range info.watches {
-			version := snapshot.GetVersion(watch.Request.TypeUrl)
-			if version != watch.Request.VersionInfo {
-				cache.log.Debugf("respond open watch %d %s%v with new version %q", id, watch.Request.TypeUrl, watch.Request.ResourceNames, version)
-
-				resources := snapshot.GetResourcesAndTTL(watch.Request.TypeUrl)
-				err := cache.respond(ctx, watch.Request, watch.Response, resources, version, false)
-				if err != nil {
-					return err
-				}
 
-				// discard the watch
-				delete(info.watches, id)
+		// Respond to SOTW watches for the node.
+		if err := cache.respondSOTWWatches(ctx, info, snapshot); err != nil {
+			return err
+		}
+
+		// Respond to delta watches for the node.
+		return cache.respondDeltaWatches(ctx, info, snapshot)
+	}
+
+	return nil
+}
+
+func (cache *snapshotCache) respondSOTWWatches(ctx context.Context, info *statusInfo, snapshot ResourceSnapshot) error {
+	// responder callback for SOTW watches
+	respond := func(watch ResponseWatch, id int64) error {
+		version := snapshot.GetVersion(watch.Request.GetTypeUrl())
+		if version != watch.Request.GetVersionInfo() {
+			cache.log.Debugf("respond open watch %d %s%v with new version %q", id, watch.Request.GetTypeUrl(), watch.Request.GetResourceNames(), version)
+			resources := snapshot.GetResourcesAndTTL(watch.Request.GetTypeUrl())
+			err := cache.respond(ctx, watch.Request, watch.Response, resources, version, false)
+			if err != nil {
+				return err
 			}
+			// discard the watch
+			delete(info.watches, id)
 		}
+		return nil
+	}
 
-		// We only calculate version hashes when using delta. We don't
-		// want to do this when using SOTW so we can avoid unnecessary
-		// computational cost if not using delta.
-		if len(info.deltaWatches) > 0 {
-			err := snapshot.ConstructVersionMap()
+	// If ADS is enabled we need to order response watches so we guarantee
+	// sending them in the correct order. Go's default implementation
+	// of maps are randomized order when ranged over.
+	if cache.ads {
+		info.orderResponseWatches()
+		for _, key := range info.orderedWatches {
+			err := respond(info.watches[key.ID], key.ID)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		for id, watch := range info.watches {
+			err := respond(watch, id)
 			if err != nil {
 				return err
 			}
 		}
+	}
+
+	return nil
+}
 
-		// process our delta watches
+func (cache *snapshotCache) respondDeltaWatches(ctx context.Context, info *statusInfo, snapshot ResourceSnapshot) error {
+	// We only calculate version hashes when using delta. We don't
+	// want to do this when using SOTW so we can avoid unnecessary
+	// computational cost if not using delta.
+	if len(info.deltaWatches) == 0 {
+		return nil
+	}
+
+	err := snapshot.ConstructVersionMap()
+	if err != nil {
+		return err
+	}
+
+	// If ADS is enabled we need to order response delta watches so we guarantee
+	// sending them in the correct order. Go's default implementation
+	// of maps are randomized order when ranged over.
+	if cache.ads {
+		info.orderResponseDeltaWatches()
+		for _, key := range info.orderedDeltaWatches {
+			watch := info.deltaWatches[key.ID]
+			res, err := cache.respondDelta(
+				ctx,
+				snapshot,
+				watch.Request,
+				watch.Response,
+				watch.StreamState,
+			)
+			if err != nil {
+				return err
+			}
+			// If we detect a nil response here, that means there has been no state change
+			// so we don't want to respond or remove any existing resource watches
+			if res != nil {
+				delete(info.deltaWatches, key.ID)
+			}
+		}
+	} else {
 		for id, watch := range info.deltaWatches {
 			res, err := cache.respondDelta(
 				ctx,
@@ -277,11 +340,10 @@ func (cache *snapshotCache) SetSnapshot(ctx context.Context, node string, snapsh
 			}
 		}
 	}
-
 	return nil
 }
 
-// GetSnapshots gets the snapshot for a node, and returns an error if not found.
+// GetSnapshot gets the snapshot for a node, and returns an error if not found.
 func (cache *snapshotCache) GetSnapshot(node string) (ResourceSnapshot, error) {
 	cache.mu.RLock()
 	defer cache.mu.RUnlock()
@@ -324,14 +386,14 @@ func superset(names map[string]bool, resources map[string]types.ResourceWithTTL)
 // CreateWatch returns a watch for an xDS request.  A nil function may be
 // returned if an error occurs.
 func (cache *snapshotCache) CreateWatch(request *Request, streamState stream.StreamState, value chan Response) func() {
-	nodeID := cache.hash.ID(request.Node)
+	nodeID := cache.hash.ID(request.GetNode())
 
 	cache.mu.Lock()
 	defer cache.mu.Unlock()
 
 	info, ok := cache.status[nodeID]
 	if !ok {
-		info = newStatusInfo(request.Node)
+		info = newStatusInfo(request.GetNode())
 		cache.status[nodeID] = info
 	}
 
@@ -341,31 +403,30 @@ func (cache *snapshotCache) CreateWatch(request *Request, streamState stream.Str
 	info.mu.Unlock()
 
 	var version string
-
 	snapshot, exists := cache.snapshots[nodeID]
 	if exists {
-		version = snapshot.GetVersion(request.TypeUrl)
+		version = snapshot.GetVersion(request.GetTypeUrl())
 	}
 
 	if exists {
-		knownResourceNames := streamState.GetKnownResourceNames(request.TypeUrl)
+		knownResourceNames := streamState.GetKnownResourceNames(request.GetTypeUrl())
 		diff := []string{}
-		for _, r := range request.ResourceNames {
+		for _, r := range request.GetResourceNames() {
 			if _, ok := knownResourceNames[r]; !ok {
 				diff = append(diff, r)
 			}
 		}
 
 		cache.log.Debugf("nodeID %q requested %s%v and known %v. Diff %v", nodeID,
-			request.TypeUrl, request.ResourceNames, knownResourceNames, diff)
+			request.GetTypeUrl(), request.GetResourceNames(), knownResourceNames, diff)
 
 		if len(diff) > 0 {
-			resources := snapshot.GetResourcesAndTTL(request.TypeUrl)
+			resources := snapshot.GetResourcesAndTTL(request.GetTypeUrl())
 			for _, name := range diff {
 				if _, exists := resources[name]; exists {
 					if err := cache.respond(context.Background(), request, value, resources, version, false); err != nil {
-						cache.log.Errorf("failed to send a response for %s%v to nodeID %q: %s", request.TypeUrl,
-							request.ResourceNames, nodeID, err)
+						cache.log.Errorf("failed to send a response for %s%v to nodeID %q: %s", request.GetTypeUrl(),
+							request.GetResourceNames(), nodeID, err)
 						return nil
 					}
 					return func() {}
@@ -375,9 +436,9 @@ func (cache *snapshotCache) CreateWatch(request *Request, streamState stream.Str
 	}
 
 	// if the requested version is up-to-date or missing a response, leave an open watch
-	if !exists || request.VersionInfo == version {
+	if !exists || request.GetVersionInfo() == version {
 		watchID := cache.nextWatchID()
-		cache.log.Debugf("open watch %d for %s%v from nodeID %q, version %q", watchID, request.TypeUrl, request.ResourceNames, nodeID, request.VersionInfo)
+		cache.log.Debugf("open watch %d for %s%v from nodeID %q, version %q", watchID, request.GetTypeUrl(), request.GetResourceNames(), nodeID, request.GetVersionInfo())
 		info.mu.Lock()
 		info.watches[watchID] = ResponseWatch{Request: request, Response: value}
 		info.mu.Unlock()
@@ -385,10 +446,10 @@ func (cache *snapshotCache) CreateWatch(request *Request, streamState stream.Str
 	}
 
 	// otherwise, the watch may be responded immediately
-	resources := snapshot.GetResourcesAndTTL(request.TypeUrl)
+	resources := snapshot.GetResourcesAndTTL(request.GetTypeUrl())
 	if err := cache.respond(context.Background(), request, value, resources, version, false); err != nil {
-		cache.log.Errorf("failed to send a response for %s%v to nodeID %q: %s", request.TypeUrl,
-			request.ResourceNames, nodeID, err)
+		cache.log.Errorf("failed to send a response for %s%v to nodeID %q: %s", request.GetTypeUrl(),
+			request.GetResourceNames(), nodeID, err)
 		return nil
 	}
 
@@ -418,14 +479,14 @@ func (cache *snapshotCache) cancelWatch(nodeID string, watchID int64) func() {
 func (cache *snapshotCache) respond(ctx context.Context, request *Request, value chan Response, resources map[string]types.ResourceWithTTL, version string, heartbeat bool) error {
 	// for ADS, the request names must match the snapshot names
 	// if they do not, then the watch is never responded, and it is expected that envoy makes another request
-	if len(request.ResourceNames) != 0 && cache.ads {
-		if err := superset(nameSet(request.ResourceNames), resources); err != nil {
-			cache.log.Warnf("ADS mode: not responding to request: %v", err)
+	if len(request.GetResourceNames()) != 0 && cache.ads {
+		if err := superset(nameSet(request.GetResourceNames()), resources); err != nil {
+			cache.log.Warnf("ADS mode: not responding to request %s%v: %v", request.GetTypeUrl(), request.GetResourceNames(), err)
 			return nil
 		}
 	}
 
-	cache.log.Debugf("respond %s%v version %q with version %q", request.TypeUrl, request.ResourceNames, request.VersionInfo, version)
+	cache.log.Debugf("respond %s%v version %q with version %q", request.GetTypeUrl(), request.GetResourceNames(), request.GetVersionInfo(), version)
 
 	select {
 	case value <- createResponse(ctx, request, resources, version, heartbeat):
@@ -441,8 +502,8 @@ func createResponse(ctx context.Context, request *Request, resources map[string]
 	// Reply only with the requested resources. Envoy may ask each resource
 	// individually in a separate stream. It is ok to reply with the same version
 	// on separate streams since requests do not share their response versions.
-	if len(request.ResourceNames) != 0 {
-		set := nameSet(request.ResourceNames)
+	if len(request.GetResourceNames()) != 0 {
+		set := nameSet(request.GetResourceNames())
 		for name, resource := range resources {
 			if set[name] {
 				filtered = append(filtered, resource)
@@ -465,7 +526,7 @@ func createResponse(ctx context.Context, request *Request, resources map[string]
 
 // CreateDeltaWatch returns a watch for a delta xDS request which implements the Simple SnapshotCache.
 func (cache *snapshotCache) CreateDeltaWatch(request *DeltaRequest, state stream.StreamState, value chan DeltaResponse) func() {
-	nodeID := cache.hash.ID(request.Node)
+	nodeID := cache.hash.ID(request.GetNode())
 	t := request.GetTypeUrl()
 
 	cache.mu.Lock()
@@ -473,7 +534,7 @@ func (cache *snapshotCache) CreateDeltaWatch(request *DeltaRequest, state stream
 
 	info, ok := cache.status[nodeID]
 	if !ok {
-		info = newStatusInfo(request.Node)
+		info = newStatusInfo(request.GetNode())
 		cache.status[nodeID] = info
 	}
 
@@ -520,9 +581,9 @@ func (cache *snapshotCache) CreateDeltaWatch(request *DeltaRequest, state stream
 // Respond to a delta watch with the provided snapshot value. If the response is nil, there has been no state change.
 func (cache *snapshotCache) respondDelta(ctx context.Context, snapshot ResourceSnapshot, request *DeltaRequest, value chan DeltaResponse, state stream.StreamState) (*RawDeltaResponse, error) {
 	resp := createDeltaResponse(ctx, request, state, resourceContainer{
-		resourceMap:   snapshot.GetResources(request.TypeUrl),
-		versionMap:    snapshot.GetVersionMap(request.TypeUrl),
-		systemVersion: snapshot.GetVersion(request.TypeUrl),
+		resourceMap:   snapshot.GetResources(request.GetTypeUrl()),
+		versionMap:    snapshot.GetVersionMap(request.GetTypeUrl()),
+		systemVersion: snapshot.GetVersion(request.GetTypeUrl()),
 	})
 
 	// Only send a response if there were changes
@@ -531,7 +592,7 @@ func (cache *snapshotCache) respondDelta(ctx context.Context, snapshot ResourceS
 	if len(resp.Resources) > 0 || len(resp.RemovedResources) > 0 || (state.IsWildcard() && state.IsFirst()) {
 		if cache.log != nil {
 			cache.log.Debugf("node: %s, sending delta response for typeURL %s with resources: %v removed resources: %v with wildcard: %t",
-				request.GetNode().GetId(), request.TypeUrl, GetResourceNames(resp.Resources), resp.RemovedResources, state.IsWildcard())
+				request.GetNode().GetId(), request.GetTypeUrl(), GetResourceNames(resp.Resources), resp.RemovedResources, state.IsWildcard())
 		}
 		select {
 		case value <- resp:
@@ -563,7 +624,7 @@ func (cache *snapshotCache) cancelDeltaWatch(nodeID string, watchID int64) func(
 // Fetch implements the cache fetch function.
 // Fetch is called on multiple streams, so responding to individual names with the same version works.
 func (cache *snapshotCache) Fetch(ctx context.Context, request *Request) (Response, error) {
-	nodeID := cache.hash.ID(request.Node)
+	nodeID := cache.hash.ID(request.GetNode())
 
 	cache.mu.RLock()
 	defer cache.mu.RUnlock()
@@ -571,13 +632,13 @@ func (cache *snapshotCache) Fetch(ctx context.Context, request *Request) (Respon
 	if snapshot, exists := cache.snapshots[nodeID]; exists {
 		// Respond only if the request version is distinct from the current snapshot state.
 		// It might be beneficial to hold the request since Envoy will re-attempt the refresh.
-		version := snapshot.GetVersion(request.TypeUrl)
-		if request.VersionInfo == version {
+		version := snapshot.GetVersion(request.GetTypeUrl())
+		if request.GetVersionInfo() == version {
 			cache.log.Warnf("skip fetch: version up to date")
 			return nil, &types.SkipFetchError{}
 		}
 
-		resources := snapshot.GetResourcesAndTTL(request.TypeUrl)
+		resources := snapshot.GetResourcesAndTTL(request.GetTypeUrl())
 		out := createResponse(ctx, request, resources, version, false)
 		return out, nil
 	}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/status.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/status.go
index 84db1f98210..dca93e02ff5 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/status.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/status.go
@@ -15,6 +15,7 @@
 package cache
 
 import (
+	"sort"
 	"sync"
 	"time"
 
@@ -36,7 +37,7 @@ func (IDHash) ID(node *core.Node) string {
 	if node == nil {
 		return ""
 	}
-	return node.Id
+	return node.GetId()
 }
 
 var _ NodeHash = IDHash{}
@@ -65,10 +66,12 @@ type statusInfo struct {
 	node *core.Node
 
 	// watches are indexed channels for the response watches and the original requests.
-	watches map[int64]ResponseWatch
+	watches        map[int64]ResponseWatch
+	orderedWatches keys
 
 	// deltaWatches are indexed channels for the delta response watches and the original requests
-	deltaWatches map[int64]DeltaResponseWatch
+	deltaWatches        map[int64]DeltaResponseWatch
+	orderedDeltaWatches keys
 
 	// the timestamp of the last watch request
 	lastWatchRequestTime time.Time
@@ -105,9 +108,10 @@ type DeltaResponseWatch struct {
 // newStatusInfo initializes a status info data structure.
 func newStatusInfo(node *core.Node) *statusInfo {
 	out := statusInfo{
-		node:         node,
-		watches:      make(map[int64]ResponseWatch),
-		deltaWatches: make(map[int64]DeltaResponseWatch),
+		node:           node,
+		watches:        make(map[int64]ResponseWatch),
+		orderedWatches: make(keys, 0),
+		deltaWatches:   make(map[int64]DeltaResponseWatch),
 	}
 	return &out
 }
@@ -155,3 +159,41 @@ func (info *statusInfo) setDeltaResponseWatch(id int64, drw DeltaResponseWatch)
 	defer info.mu.Unlock()
 	info.deltaWatches[id] = drw
 }
+
+// orderResponseWatches will track a list of watch keys and order them if
+// true is passed.
+func (info *statusInfo) orderResponseWatches() {
+	info.orderedWatches = make(keys, len(info.watches))
+
+	var index int
+	for id, watch := range info.watches {
+		info.orderedWatches[index] = key{
+			ID:      id,
+			TypeURL: watch.Request.GetTypeUrl(),
+		}
+		index++
+	}
+
+	// Sort our list which we can use in the SetSnapshot functions.
+	// This is only run when we enable ADS on the cache.
+	sort.Sort(info.orderedWatches)
+}
+
+// orderResponseDeltaWatches will track a list of delta watch keys and order them if
+// true is passed.
+func (info *statusInfo) orderResponseDeltaWatches() {
+	info.orderedDeltaWatches = make(keys, len(info.deltaWatches))
+
+	var index int
+	for id, deltaWatch := range info.deltaWatches {
+		info.orderedDeltaWatches[index] = key{
+			ID:      id,
+			TypeURL: deltaWatch.Request.GetTypeUrl(),
+		}
+		index++
+	}
+
+	// Sort our list which we can use in the SetSnapshot functions.
+	// This is only run when we enable ADS on the cache.
+	sort.Sort(info.orderedDeltaWatches)
+}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/ya.make
index 4d64296a9ca..d3316316c08 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/cache/v3/ya.make
@@ -7,6 +7,7 @@ SRCS(
     delta.go
     linear.go
     mux.go
+    order.go
     resource.go
     resources.go
     simple.go
@@ -16,6 +17,7 @@ SRCS(
 
 GO_TEST_SRCS(
     linear_test.go
+    order_test.go
     status_test.go
 )
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/log/default.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/log/default.go
index a33bb633bca..2f52fed46b9 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/log/default.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/log/default.go
@@ -1,3 +1,4 @@
+//nolint:all
 package log
 
 // DefaultLogger is enabled when no consuming clients provide
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/log/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/log/ya.make
index 310b870e3b5..2edef489b5a 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/log/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/log/ya.make
@@ -11,4 +11,6 @@ GO_TEST_SRCS(log_test.go)
 
 END()
 
-RECURSE(gotest)
+RECURSE(
+    gotest
+)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/resource/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/resource/v3/ya.make
index c514bfd3b5e..345256af639 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/resource/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/resource/v3/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(resource.go)
+SRCS(
+    resource.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/config.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/config.go
new file mode 100644
index 00000000000..b746acfab9e
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/config.go
@@ -0,0 +1,25 @@
+package config
+
+// Opts for individual xDS implementations that can be
+// utilized through the functional opts pattern.
+type Opts struct {
+	// If true respond to ADS requests with a guaranteed resource ordering
+	Ordered bool
+}
+
+func NewOpts() Opts {
+	return Opts{
+		Ordered: false,
+	}
+}
+
+// Each xDS implementation should implement their own functional opts.
+// It is recommended that config values be added in this package specifically,
+// but the individual opts functions should be in their respective
+// implementation package so the import looks like the following:
+//
+// `sotw.WithOrderedADS()`
+// `delta.WithOrderedADS()`
+//
+// this allows for easy inference as to which opt applies to what implementation.
+type XDSOption func(*Opts)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/doc.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/doc.go
new file mode 100644
index 00000000000..2c85adfd5fa
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/doc.go
@@ -0,0 +1,22 @@
+/*
+Config abstracts xDS server options into a unified configuration package
+that allows for easy manipulation as well as unified passage of options
+to individual xDS server implementations.
+
+This enables code reduction as well as a unified source of config. Delta
+and SOTW might have similar ordered responses through ADS and rather than
+duplicating the logic across server implementations, we add the options
+in this package which are passed down to each individual spec.
+
+Each xDS implementation should implement their own functional opts.
+It is recommended that config values be added in this package specifically,
+but the individual opts functions should be in their respective
+implementation package so the import looks like the following:
+
+`sotw.WithOrderedADS()`
+`delta.WithOrderedADS()`
+
+this allows for easy inference as to which opt applies to what implementation.
+*/
+
+package config
diff --git a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/ya.make
index e91f99daa00..e44e5bff33c 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/config/ya.make
@@ -2,6 +2,9 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(rls_conf.pb.go)
+SRCS(
+    config.go
+    doc.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/server.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/server.go
index 5f10266aba0..b570b19b274 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/server.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/server.go
@@ -13,6 +13,7 @@ import (
 	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/server/config"
 	"github.com/envoyproxy/go-control-plane/pkg/server/stream/v3"
 )
 
@@ -30,7 +31,7 @@ type Callbacks interface {
 	// OnStreamDeltaRequest is called once a request is received on a stream.
 	// Returning an error will end processing and close the stream. OnStreamClosed will still be called.
 	OnStreamDeltaRequest(int64, *discovery.DeltaDiscoveryRequest) error
-	// OnStreamDelatResponse is called immediately prior to sending a response on a stream.
+	// OnStreamDeltaResponse is called immediately prior to sending a response on a stream.
 	OnStreamDeltaResponse(int64, *discovery.DeltaDiscoveryRequest, *discovery.DeltaDiscoveryResponse)
 }
 
@@ -43,15 +44,25 @@ type server struct {
 	// total stream count for counting bi-di streams
 	streamCount int64
 	ctx         context.Context
+
+	// Local configuration flags for individual xDS implementations.
+	opts config.Opts
 }
 
 // NewServer creates a delta xDS specific server which utilizes a ConfigWatcher and delta Callbacks.
-func NewServer(ctx context.Context, config cache.ConfigWatcher, callbacks Callbacks) Server {
-	return &server{
+func NewServer(ctx context.Context, config cache.ConfigWatcher, callbacks Callbacks, opts ...config.XDSOption) Server {
+	s := &server{
 		cache:     config,
 		callbacks: callbacks,
 		ctx:       ctx,
 	}
+
+	// Parse through our options
+	for _, opt := range opts {
+		opt(&s.opts)
+	}
+
+	return s
 }
 
 func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.DeltaDiscoveryRequest, defaultTypeURL string) error {
@@ -63,7 +74,7 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 	// a collection of stack allocated watches per request type
 	watches := newWatches()
 
-	var node = &core.Node{}
+	node := &core.Node{}
 
 	defer func() {
 		watches.Cancel()
@@ -72,7 +83,7 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 		}
 	}()
 
-	// Sends a response, returns the new stream nonce
+	// sends a response, returns the new stream nonce
 	send := func(resp cache.DeltaResponse) (string, error) {
 		if resp == nil {
 			return "", errors.New("missing response")
@@ -83,13 +94,51 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 			return "", err
 		}
 
-		streamNonce = streamNonce + 1
+		streamNonce++
 		response.Nonce = strconv.FormatInt(streamNonce, 10)
 		if s.callbacks != nil {
 			s.callbacks.OnStreamDeltaResponse(streamID, resp.GetDeltaRequest(), response)
 		}
 
-		return response.Nonce, str.Send(response)
+		return response.GetNonce(), str.Send(response)
+	}
+
+	// process a single delta response
+	process := func(resp cache.DeltaResponse) error {
+		typ := resp.GetDeltaRequest().GetTypeUrl()
+		if resp == deltaErrorResponse {
+			return status.Errorf(codes.Unavailable, typ+" watch failed")
+		}
+
+		nonce, err := send(resp)
+		if err != nil {
+			return err
+		}
+
+		watch := watches.deltaWatches[typ]
+		watch.nonce = nonce
+
+		watch.state.SetResourceVersions(resp.GetNextVersionMap())
+		watches.deltaWatches[typ] = watch
+		return nil
+	}
+
+	// processAll purges the deltaMuxedResponses channel
+	processAll := func() error {
+		for {
+			select {
+			// We watch the multiplexed channel for incoming responses.
+			case resp, more := <-watches.deltaMuxedResponses:
+				if !more {
+					break
+				}
+				if err := process(resp); err != nil {
+					return err
+				}
+			default:
+				return nil
+			}
+		}
 	}
 
 	if s.callbacks != nil {
@@ -102,35 +151,31 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 		select {
 		case <-s.ctx.Done():
 			return nil
+		// We watch the multiplexed channel for incoming responses.
 		case resp, more := <-watches.deltaMuxedResponses:
+			// input stream ended or errored out
 			if !more {
 				break
 			}
 
-			typ := resp.GetDeltaRequest().GetTypeUrl()
-			if resp == deltaErrorResponse {
-				return status.Errorf(codes.Unavailable, typ+" watch failed")
-			}
-
-			nonce, err := send(resp)
-			if err != nil {
+			if err := process(resp); err != nil {
 				return err
 			}
-
-			watch := watches.deltaWatches[typ]
-			watch.nonce = nonce
-
-			watch.state.SetResourceVersions(resp.GetNextVersionMap())
-			watches.deltaWatches[typ] = watch
 		case req, more := <-reqCh:
 			// input stream ended or errored out
 			if !more {
 				return nil
 			}
+
 			if req == nil {
 				return status.Errorf(codes.Unavailable, "empty request")
 			}
 
+			// make sure all existing responses are processed prior to new requests to avoid deadlock
+			if err := processAll(); err != nil {
+				return err
+			}
+
 			if s.callbacks != nil {
 				if err := s.callbacks.OnStreamDeltaRequest(streamID, req); err != nil {
 					return err
@@ -139,18 +184,18 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 
 			// The node information might only be set on the first incoming delta discovery request, so store it here so we can
 			// reset it on subsequent requests that omit it.
-			if req.Node != nil {
-				node = req.Node
+			if req.GetNode() != nil {
+				node = req.GetNode()
 			} else {
 				req.Node = node
 			}
 
 			// type URL is required for ADS but is implicit for any other xDS stream
 			if defaultTypeURL == resource.AnyType {
-				if req.TypeUrl == "" {
+				if req.GetTypeUrl() == "" {
 					return status.Errorf(codes.InvalidArgument, "type URL is required for ADS")
 				}
-			} else if req.TypeUrl == "" {
+			} else if req.GetTypeUrl() == "" {
 				req.TypeUrl = defaultTypeURL
 			}
 
@@ -173,16 +218,8 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 			s.subscribe(req.GetResourceNamesSubscribe(), &watch.state)
 			s.unsubscribe(req.GetResourceNamesUnsubscribe(), &watch.state)
 
-			watch.responses = make(chan cache.DeltaResponse, 1)
-			watch.cancel = s.cache.CreateDeltaWatch(req, watch.state, watch.responses)
+			watch.cancel = s.cache.CreateDeltaWatch(req, watch.state, watches.deltaMuxedResponses)
 			watches.deltaWatches[typeURL] = watch
-
-			go func() {
-				resp, more := <-watch.responses
-				if more {
-					watches.deltaMuxedResponses <- resp
-				}
-			}()
 		}
 	}
 }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/watches.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/watches.go
index c88548388ac..63c4c2d38df 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/watches.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/watches.go
@@ -17,9 +17,13 @@ type watches struct {
 // newWatches creates and initializes watches.
 func newWatches() watches {
 	// deltaMuxedResponses needs a buffer to release go-routines populating it
+	//
+	// because deltaMuxedResponses can be populated by an update from the cache
+	// and a request from the client, we need to create the channel with a buffer
+	// size of 2x the number of types to avoid deadlocks.
 	return watches{
 		deltaWatches:        make(map[string]watch, int(types.UnknownType)),
-		deltaMuxedResponses: make(chan cache.DeltaResponse, int(types.UnknownType)),
+		deltaMuxedResponses: make(chan cache.DeltaResponse, int(types.UnknownType)*2),
 	}
 }
 
@@ -28,13 +32,14 @@ func (w *watches) Cancel() {
 	for _, watch := range w.deltaWatches {
 		watch.Cancel()
 	}
+
+	close(w.deltaMuxedResponses)
 }
 
 // watch contains the necessary modifiables for receiving resource responses
 type watch struct {
-	responses chan cache.DeltaResponse
-	cancel    func()
-	nonce     string
+	cancel func()
+	nonce  string
 
 	state stream.StreamState
 }
@@ -44,9 +49,4 @@ func (w *watch) Cancel() {
 	if w.cancel != nil {
 		w.cancel()
 	}
-	if w.responses != nil {
-		// w.responses should never be used by a producer once cancel() has been closed, so we can safely close it here
-		// This is needed to release resources taken by goroutines watching this channel
-		close(w.responses)
-	}
 }
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/ya.make
index 7e3abbda25b..77c00272c47 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/delta/v3/ya.make
@@ -11,4 +11,6 @@ GO_TEST_SRCS(watches_test.go)
 
 END()
 
-RECURSE(gotest)
+RECURSE(
+    gotest
+)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/rest/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/rest/v3/ya.make
index d32b575a108..728337851d6 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/rest/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/rest/v3/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(server.go)
+SRCS(
+    server.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ads.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ads.go
new file mode 100644
index 00000000000..bbb6dd4b20c
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ads.go
@@ -0,0 +1,140 @@
+package sotw
+
+import (
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/cache/types"
+	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
+)
+
+// process handles a bi-di stream request
+func (s *server) processADS(sw *streamWrapper, reqCh chan *discovery.DiscoveryRequest, defaultTypeURL string) error {
+	// We make a responder channel here so we can multiplex responses from the dynamic channels.
+	sw.watches.addWatch(resource.AnyType, &watch{
+		// Create a buffered channel the size of the known resource types.
+		response: make(chan cache.Response, types.UnknownType),
+		cancel: func() {
+			close(sw.watches.responders[resource.AnyType].response)
+		},
+	})
+
+	process := func(resp cache.Response) error {
+		nonce, err := sw.send(resp)
+		if err != nil {
+			return err
+		}
+
+		sw.watches.responders[resp.GetRequest().GetTypeUrl()].nonce = nonce
+		return nil
+	}
+
+	// Instead of creating a separate channel for each incoming request and abandoning the old one
+	// This algorithm uses (and reuses) a single channel for all request types and guarantees
+	// the server will send updates over the wire in an ordered fashion.
+	// Downside is there is no longer back pressure per resource.
+	// There is potential for a dropped response from the cache but this is not impactful
+	// to the client since SOTW version handling is global and a new sequence will be
+	// initiated on a new request.
+	processAllExcept := func(typeURL string) error {
+		for {
+			select {
+			// We watch the multiplexed ADS channel for incoming responses.
+			case res := <-sw.watches.responders[resource.AnyType].response:
+				if res.GetRequest().GetTypeUrl() != typeURL {
+					if err := process(res); err != nil {
+						return err
+					}
+				}
+			default:
+				return nil
+			}
+		}
+	}
+
+	// This control loop strictly orders resources when running in ADS mode.
+	// It should be treated as a child process of the original process() loop
+	// and should return on close of stream or error. This will cause the
+	// cleanup routines in the parent process() loop to execute.
+	for {
+		select {
+		case <-s.ctx.Done():
+			return nil
+		// We only watch the multiplexed channel since all values will come through from process.
+		case res := <-sw.watches.responders[resource.AnyType].response:
+			if err := process(res); err != nil {
+				return status.Errorf(codes.Unavailable, err.Error())
+			}
+		case req, ok := <-reqCh:
+			// Input stream ended or failed.
+			if !ok {
+				return nil
+			}
+
+			// Received an empty request over the request channel. Can't respond.
+			if req == nil {
+				return status.Errorf(codes.Unavailable, "empty request")
+			}
+
+			// Only first request is guaranteed to hold node info so if it's missing, reassign.
+			if req.GetNode() != nil {
+				sw.node = req.GetNode()
+			} else {
+				req.Node = sw.node
+			}
+
+			// Nonces can be reused across streams; we verify nonce only if nonce is not initialized.
+			nonce := req.GetResponseNonce()
+
+			// type URL is required for ADS but is implicit for xDS
+			if defaultTypeURL == resource.AnyType {
+				if req.GetTypeUrl() == "" {
+					return status.Errorf(codes.InvalidArgument, "type URL is required for ADS")
+				}
+			}
+
+			if s.callbacks != nil {
+				if err := s.callbacks.OnStreamRequest(sw.ID, req); err != nil {
+					return err
+				}
+			}
+
+			if lastResponse, ok := sw.lastDiscoveryResponses[req.GetTypeUrl()]; ok {
+				if lastResponse.nonce == "" || lastResponse.nonce == nonce {
+					// Let's record Resource names that a client has received.
+					sw.streamState.SetKnownResourceNames(req.GetTypeUrl(), lastResponse.resources)
+				}
+			}
+
+			typeURL := req.GetTypeUrl()
+			// Use the multiplexed channel for new watches.
+			responder := sw.watches.responders[resource.AnyType].response
+			if w, ok := sw.watches.responders[typeURL]; ok {
+				// We've found a pre-existing watch, lets check and update if needed.
+				// If these requirements aren't satisfied, leave an open watch.
+				if w.nonce == "" || w.nonce == nonce {
+					w.close()
+
+					// Only process if we have an existing watch otherwise go ahead and create.
+					if err := processAllExcept(typeURL); err != nil {
+						return err
+					}
+
+					sw.watches.addWatch(typeURL, &watch{
+						cancel:   s.cache.CreateWatch(req, sw.streamState, responder),
+						response: responder,
+					})
+				}
+			} else {
+				// No pre-existing watch exists, let's create one.
+				// We need to precompute the watches first then open a watch in the cache.
+				sw.watches.addWatch(typeURL, &watch{
+					cancel:   s.cache.CreateWatch(req, sw.streamState, responder),
+					response: responder,
+				})
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/server.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/server.go
index 91681237c90..f5be0c57a9b 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/server.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/server.go
@@ -18,17 +18,13 @@ package sotw
 import (
 	"context"
 	"errors"
-	"reflect"
 	"strconv"
 	"sync/atomic"
 
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
 	core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
-	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/server/config"
 	"github.com/envoyproxy/go-control-plane/pkg/server/stream/v3"
 )
 
@@ -50,8 +46,23 @@ type Callbacks interface {
 }
 
 // NewServer creates handlers from a config watcher and callbacks.
-func NewServer(ctx context.Context, config cache.ConfigWatcher, callbacks Callbacks) Server {
-	return &server{cache: config, callbacks: callbacks, ctx: ctx}
+func NewServer(ctx context.Context, cw cache.ConfigWatcher, callbacks Callbacks, opts ...config.XDSOption) Server {
+	s := &server{cache: cw, callbacks: callbacks, ctx: ctx, opts: config.NewOpts()}
+
+	// Parse through our options
+	for _, opt := range opts {
+		opt(&s.opts)
+	}
+
+	return s
+}
+
+// WithOrderedADS enables the internal flag to order responses
+// strictly.
+func WithOrderedADS() config.XDSOption {
+	return func(o *config.Opts) {
+		o.Ordered = true
+	}
 }
 
 type server struct {
@@ -61,177 +72,78 @@ type server struct {
 
 	// streamCount for counting bi-di streams
 	streamCount int64
-}
 
-// Discovery response that is sent over GRPC stream
-// We need to record what resource names are already sent to a client
-// So if the client requests a new name we can respond back
-// regardless current snapshot version (even if it is not changed yet)
-type lastDiscoveryResponse struct {
-	nonce     string
-	resources map[string]struct{}
+	// Local configuration flags for individual xDS implementations.
+	opts config.Opts
 }
 
-// process handles a bi-di stream request
-func (s *server) process(str stream.Stream, reqCh <-chan *discovery.DiscoveryRequest, defaultTypeURL string) error {
-	// increment stream count
-	streamID := atomic.AddInt64(&s.streamCount, 1)
-
-	// unique nonce generator for req-resp pairs per xDS stream; the server
-	// ignores stale nonces. nonce is only modified within send() function.
-	var streamNonce int64
-
-	streamState := stream.NewStreamState(false, map[string]string{})
-	lastDiscoveryResponses := map[string]lastDiscoveryResponse{}
-
-	// a collection of stack allocated watches per request type
-	watches := newWatches()
-
-	// node may only be set on the first discovery request
-	var node = &core.Node{}
-
-	defer func() {
-		watches.close()
-		if s.callbacks != nil {
-			s.callbacks.OnStreamClosed(streamID, node)
-		}
-	}()
-
-	// sends a response by serializing to protobuf Any
-	send := func(resp cache.Response) (string, error) {
-		if resp == nil {
-			return "", errors.New("missing response")
-		}
+// streamWrapper abstracts critical data passed around a stream for to be accessed
+// through various code paths in the xDS lifecycle. This comes in handy when dealing
+// with varying implementation types such as ordered vs unordered resource handling.
+type streamWrapper struct {
+	stream    stream.Stream // parent stream object
+	ID        int64         // stream ID in relation to total stream count
+	nonce     int64         // nonce per stream
+	watches   watches       // collection of stack allocated watchers per request type
+	callbacks Callbacks     // callbacks for performing actions through stream lifecycle
+
+	node *core.Node // registered xDS client
+
+	// The below fields are used for tracking resource
+	// cache state and should be maintained per stream.
+	streamState            stream.StreamState
+	lastDiscoveryResponses map[string]lastDiscoveryResponse
+}
 
-		out, err := resp.GetDiscoveryResponse()
-		if err != nil {
-			return "", err
-		}
+// Send packages the necessary resources before sending on the gRPC stream,
+// and sets the current state of the world.
+func (s *streamWrapper) send(resp cache.Response) (string, error) {
+	if resp == nil {
+		return "", errors.New("missing response")
+	}
 
-		// increment nonce
-		streamNonce = streamNonce + 1
-		out.Nonce = strconv.FormatInt(streamNonce, 10)
+	out, err := resp.GetDiscoveryResponse()
+	if err != nil {
+		return "", err
+	}
 
-		lastResponse := lastDiscoveryResponse{
-			nonce:     out.Nonce,
-			resources: make(map[string]struct{}),
-		}
-		for _, r := range resp.GetRequest().ResourceNames {
-			lastResponse.resources[r] = struct{}{}
-		}
-		lastDiscoveryResponses[resp.GetRequest().TypeUrl] = lastResponse
+	// increment nonce and convert it to base10
+	out.Nonce = strconv.FormatInt(atomic.AddInt64(&s.nonce, 1), 10)
 
-		if s.callbacks != nil {
-			s.callbacks.OnStreamResponse(resp.GetContext(), streamID, resp.GetRequest(), out)
-		}
-		return out.Nonce, str.Send(out)
+	lastResponse := lastDiscoveryResponse{
+		nonce:     out.GetNonce(),
+		resources: make(map[string]struct{}),
 	}
+	for _, r := range resp.GetRequest().GetResourceNames() {
+		lastResponse.resources[r] = struct{}{}
+	}
+	s.lastDiscoveryResponses[resp.GetRequest().GetTypeUrl()] = lastResponse
 
+	// Register with the callbacks provided that we are sending the response.
 	if s.callbacks != nil {
-		if err := s.callbacks.OnStreamOpen(str.Context(), streamID, defaultTypeURL); err != nil {
-			return err
-		}
+		s.callbacks.OnStreamResponse(resp.GetContext(), s.ID, resp.GetRequest(), out)
 	}
 
-	// recompute dynamic channels for this stream
-	watches.recompute(s.ctx, reqCh)
-
-	for {
-		// The list of select cases looks like this:
-		// 0: <- ctx.Done
-		// 1: <- reqCh
-		// 2...: per type watches
-		index, value, ok := reflect.Select(watches.cases)
-		switch index {
-		// ctx.Done() -> if we receive a value here we return as no further computation is needed
-		case 0:
-			return nil
-		// Case 1 handles any request inbound on the stream and handles all initialization as needed
-		case 1:
-			// input stream ended or errored out
-			if !ok {
-				return nil
-			}
-
-			req := value.Interface().(*discovery.DiscoveryRequest)
-			if req == nil {
-				return status.Errorf(codes.Unavailable, "empty request")
-			}
-
-			// node field in discovery request is delta-compressed
-			if req.Node != nil {
-				node = req.Node
-			} else {
-				req.Node = node
-			}
-
-			// nonces can be reused across streams; we verify nonce only if nonce is not initialized
-			nonce := req.GetResponseNonce()
-
-			// type URL is required for ADS but is implicit for xDS
-			if defaultTypeURL == resource.AnyType {
-				if req.TypeUrl == "" {
-					return status.Errorf(codes.InvalidArgument, "type URL is required for ADS")
-				}
-			} else if req.TypeUrl == "" {
-				req.TypeUrl = defaultTypeURL
-			}
-
-			if s.callbacks != nil {
-				if err := s.callbacks.OnStreamRequest(streamID, req); err != nil {
-					return err
-				}
-			}
-
-			if lastResponse, ok := lastDiscoveryResponses[req.TypeUrl]; ok {
-				if lastResponse.nonce == "" || lastResponse.nonce == nonce {
-					// Let's record Resource names that a client has received.
-					streamState.SetKnownResourceNames(req.TypeUrl, lastResponse.resources)
-				}
-			}
-
-			typeURL := req.GetTypeUrl()
-			responder := make(chan cache.Response, 1)
-			if w, ok := watches.responders[typeURL]; ok {
-				// We've found a pre-existing watch, lets check and update if needed.
-				// If these requirements aren't satisfied, leave an open watch.
-				if w.nonce == "" || w.nonce == nonce {
-					w.close()
-
-					watches.addWatch(typeURL, &watch{
-						cancel:   s.cache.CreateWatch(req, streamState, responder),
-						response: responder,
-					})
-				}
-			} else {
-				// No pre-existing watch exists, let's create one.
-				// We need to precompute the watches first then open a watch in the cache.
-				watches.addWatch(typeURL, &watch{
-					cancel:   s.cache.CreateWatch(req, streamState, responder),
-					response: responder,
-				})
-			}
-
-			// Recompute the dynamic select cases for this stream.
-			watches.recompute(s.ctx, reqCh)
-		default:
-			// Channel n -> these are the dynamic list of responders that correspond to the stream request typeURL
-			if !ok {
-				// Receiver channel was closed. TODO(jpeach): probably cancel the watch or something?
-				return status.Errorf(codes.Unavailable, "resource watch %d -> failed", index)
-			}
-
-			res := value.Interface().(cache.Response)
-			nonce, err := send(res)
-			if err != nil {
-				return err
-			}
+	return out.GetNonce(), s.stream.Send(out)
+}
 
-			watches.responders[res.GetRequest().TypeUrl].nonce = nonce
-		}
+// Shutdown closes all open watches, and notifies API consumers the stream has closed.
+func (s *streamWrapper) shutdown() {
+	s.watches.close()
+	if s.callbacks != nil {
+		s.callbacks.OnStreamClosed(s.ID, s.node)
 	}
 }
 
+// Discovery response that is sent over GRPC stream.
+// We need to record what resource names are already sent to a client
+// So if the client requests a new name we can respond back
+// regardless current snapshot version (even if it is not changed yet)
+type lastDiscoveryResponse struct {
+	nonce     string
+	resources map[string]struct{}
+}
+
 // StreamHandler converts a blocking read call to channels and initiates stream processing
 func (s *server) StreamHandler(stream stream.Stream, typeURL string) error {
 	// a channel for receiving incoming requests
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/watches.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/watches.go
index 45670d6a91e..d781f663e62 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/watches.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/watches.go
@@ -60,7 +60,7 @@ func (w *watches) recompute(ctx context.Context, req <-chan *discovery.Discovery
 	}
 }
 
-// watch contains the necessary modifiables for receiving resource responses
+// watch contains the necessary modifiable data for receiving resource responses
 type watch struct {
 	cancel   func()
 	nonce    string
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/xds.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/xds.go
new file mode 100644
index 00000000000..3b24dec4098
--- /dev/null
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/xds.go
@@ -0,0 +1,166 @@
+package sotw
+
+import (
+	"reflect"
+	"sync/atomic"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
+	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/cache/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
+	"github.com/envoyproxy/go-control-plane/pkg/server/stream/v3"
+)
+
+// process handles a bi-di stream request
+func (s *server) process(str stream.Stream, reqCh chan *discovery.DiscoveryRequest, defaultTypeURL string) error {
+	// create our streamWrapper which can be passed down to sub control loops.
+	// this is useful for abstracting critical information for various types of
+	// xDS resource processing.
+	sw := streamWrapper{
+		stream:    str,
+		ID:        atomic.AddInt64(&s.streamCount, 1), // increment stream count
+		callbacks: s.callbacks,
+		node:      &core.Node{}, // node may only be set on the first discovery request
+
+		// a collection of stack allocated watches per request type.
+		watches:                newWatches(),
+		streamState:            stream.NewStreamState(false, map[string]string{}),
+		lastDiscoveryResponses: make(map[string]lastDiscoveryResponse),
+	}
+
+	// cleanup once our stream has ended.
+	defer sw.shutdown()
+
+	if s.callbacks != nil {
+		if err := s.callbacks.OnStreamOpen(str.Context(), sw.ID, defaultTypeURL); err != nil {
+			return err
+		}
+	}
+
+	// do an initial recompute so we can load the first 2 channels:
+	// <-reqCh
+	// s.ctx.Done()
+	sw.watches.recompute(s.ctx, reqCh)
+
+	for {
+		// The list of select cases looks like this:
+		// 0: <- ctx.Done
+		// 1: <- reqCh
+		// 2...: per type watches
+		index, value, ok := reflect.Select(sw.watches.cases)
+		switch index {
+		// ctx.Done() -> if we receive a value here we return
+		// as no further computation is needed
+		case 0:
+			return nil
+		// Case 1 handles any request inbound on the stream
+		// and handles all initialization as needed
+		case 1:
+			// input stream ended or failed
+			if !ok {
+				return nil
+			}
+
+			req := value.Interface().(*discovery.DiscoveryRequest)
+			if req == nil {
+				return status.Errorf(codes.Unavailable, "empty request")
+			}
+
+			// Only first request is guaranteed to hold node info so if it's missing, reassign.
+			if req.GetNode() != nil {
+				sw.node = req.GetNode()
+			} else {
+				req.Node = sw.node
+			}
+
+			// nonces can be reused across streams; we verify nonce only if nonce is not initialized
+			nonce := req.GetResponseNonce()
+
+			// type URL is required for ADS but is implicit for xDS
+			if defaultTypeURL == resource.AnyType {
+				if req.GetTypeUrl() == "" {
+					return status.Errorf(codes.InvalidArgument, "type URL is required for ADS")
+				}
+
+				// When using ADS we need to order responses.
+				// This is guaranteed in the xDS protocol specification
+				// as ADS is required to be eventually consistent.
+				// More details can be found here if interested:
+				// https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#eventual-consistency-considerations
+				if s.opts.Ordered {
+					// send our first request on the stream again so it doesn't get
+					// lost in processing on the new control loop
+					// There's a risk (albeit very limited) that we'd end up handling requests in the wrong order here.
+					// If envoy is using ADS for endpoints, and clusters are added in short sequence,
+					// the following request might include a new cluster and be discarded as the previous one will be handled after.
+					go func() {
+						reqCh <- req
+					}()
+
+					// Trigger a different code path specifically for ADS.
+					// We want resource ordering so things don't get sent before they should.
+					// This is a blocking call and will exit the process function
+					// on successful completion.
+					return s.processADS(&sw, reqCh, defaultTypeURL)
+				}
+			} else if req.GetTypeUrl() == "" {
+				req.TypeUrl = defaultTypeURL
+			}
+
+			if s.callbacks != nil {
+				if err := s.callbacks.OnStreamRequest(sw.ID, req); err != nil {
+					return err
+				}
+			}
+
+			if lastResponse, ok := sw.lastDiscoveryResponses[req.GetTypeUrl()]; ok {
+				if lastResponse.nonce == "" || lastResponse.nonce == nonce {
+					// Let's record Resource names that a client has received.
+					sw.streamState.SetKnownResourceNames(req.GetTypeUrl(), lastResponse.resources)
+				}
+			}
+
+			typeURL := req.GetTypeUrl()
+			responder := make(chan cache.Response, 1)
+			if w, ok := sw.watches.responders[typeURL]; ok {
+				// We've found a pre-existing watch, lets check and update if needed.
+				// If these requirements aren't satisfied, leave an open watch.
+				if w.nonce == "" || w.nonce == nonce {
+					w.close()
+
+					sw.watches.addWatch(typeURL, &watch{
+						cancel:   s.cache.CreateWatch(req, sw.streamState, responder),
+						response: responder,
+					})
+				}
+			} else {
+				// No pre-existing watch exists, let's create one.
+				// We need to precompute the watches first then open a watch in the cache.
+				sw.watches.addWatch(typeURL, &watch{
+					cancel:   s.cache.CreateWatch(req, sw.streamState, responder),
+					response: responder,
+				})
+			}
+
+			// Recompute the dynamic select cases for this stream.
+			sw.watches.recompute(s.ctx, reqCh)
+		default:
+			// Channel n -> these are the dynamic list of responders that correspond to the stream request typeURL
+			if !ok {
+				// Receiver channel was closed. TODO(jpeach): probably cancel the watch or something?
+				return status.Errorf(codes.Unavailable, "resource watch %d -> failed", index)
+			}
+
+			res := value.Interface().(cache.Response)
+			nonce, err := sw.send(res)
+			if err != nil {
+				return err
+			}
+
+			sw.watches.responders[res.GetRequest().GetTypeUrl()].nonce = nonce
+		}
+	}
+}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ya.make
index 48fb2634416..6d7dad878f2 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3/ya.make
@@ -3,8 +3,10 @@ GO_LIBRARY()
 LICENSE(Apache-2.0)
 
 SRCS(
+    ads.go
     server.go
     watches.go
+    xds.go
 )
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/stream.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/stream.go
index b5832b7d583..1664a941e04 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/stream.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/stream.go
@@ -6,7 +6,7 @@ import (
 	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 )
 
-// Generic RPC stream.
+// Generic RPC stream for state of the world.
 type Stream interface {
 	grpc.ServerStream
 
@@ -14,6 +14,7 @@ type Stream interface {
 	Recv() (*discovery.DiscoveryRequest, error)
 }
 
+// Generic RPC Stream for the delta based xDS protocol.
 type DeltaStream interface {
 	grpc.ServerStream
 
@@ -21,7 +22,7 @@ type DeltaStream interface {
 	Recv() (*discovery.DeltaDiscoveryRequest, error)
 }
 
-// StreamState will keep track of resource state per type on a stream.
+// StreamState will keep track of resource cache state per type on a stream.
 type StreamState struct { // nolint:golint,revive
 	// Indicates whether the delta stream currently has a wildcard watch
 	wildcard bool
@@ -34,11 +35,32 @@ type StreamState struct { // nolint:golint,revive
 	// This field stores the last state sent to the client.
 	resourceVersions map[string]string
 
-	// knownResourceNames contains resource names that a client has received previously
+	// knownResourceNames contains resource names that a client has received previously (SOTW).
 	knownResourceNames map[string]map[string]struct{}
 
-	// indicates whether the object has been modified since its creation
+	// First indicates whether the StreamState has been modified since its creation
 	first bool
+
+	// Ordered indicates whether we want an ordered ADS stream or not
+	ordered bool
+}
+
+// NewStreamState initializes a stream state.
+func NewStreamState(wildcard bool, initialResourceVersions map[string]string) StreamState {
+	state := StreamState{
+		wildcard:                wildcard,
+		subscribedResourceNames: map[string]struct{}{},
+		resourceVersions:        initialResourceVersions,
+		first:                   true,
+		knownResourceNames:      map[string]map[string]struct{}{},
+		ordered:                 false, // Ordered comes from the first request since that's when we discover if they want ADS
+	}
+
+	if initialResourceVersions == nil {
+		state.resourceVersions = make(map[string]string)
+	}
+
+	return state
 }
 
 // GetSubscribedResourceNames returns the list of resources currently explicitly subscribed to
@@ -71,31 +93,43 @@ func (s *StreamState) WatchesResources(resourceNames map[string]struct{}) bool {
 	return false
 }
 
+func (s *StreamState) SetWildcard(wildcard bool) {
+	s.wildcard = wildcard
+}
+
+// GetResourceVersions returns a map of current resources grouped by type URL.
 func (s *StreamState) GetResourceVersions() map[string]string {
 	return s.resourceVersions
 }
 
+// SetResourceVersions sets a list of resource versions by type URL and removes the flag
+// of "first" since we can safely assume another request has come through the stream.
 func (s *StreamState) SetResourceVersions(resourceVersions map[string]string) {
 	s.first = false
 	s.resourceVersions = resourceVersions
 }
 
+// IsFirst returns whether or not the state of the stream is based upon the initial request.
 func (s *StreamState) IsFirst() bool {
 	return s.first
 }
 
-func (s *StreamState) SetWildcard(wildcard bool) {
-	s.wildcard = wildcard
-}
-
+// IsWildcard returns whether or not an xDS client requested in wildcard mode on the initial request.
 func (s *StreamState) IsWildcard() bool {
 	return s.wildcard
 }
 
+// GetKnownResourceNames returns the current known list of resources on a SOTW stream.
+func (s *StreamState) GetKnownResourceNames(url string) map[string]struct{} {
+	return s.knownResourceNames[url]
+}
+
+// SetKnownResourceNames sets a list of resource names in a stream utilizing the SOTW protocol.
 func (s *StreamState) SetKnownResourceNames(url string, names map[string]struct{}) {
 	s.knownResourceNames[url] = names
 }
 
+// SetKnownResourceNamesAsList is a helper function to set resource names as a slice input.
 func (s *StreamState) SetKnownResourceNamesAsList(url string, names []string) {
 	m := map[string]struct{}{}
 	for _, name := range names {
@@ -103,24 +137,3 @@ func (s *StreamState) SetKnownResourceNamesAsList(url string, names []string) {
 	}
 	s.knownResourceNames[url] = m
 }
-
-func (s *StreamState) GetKnownResourceNames(url string) map[string]struct{} {
-	return s.knownResourceNames[url]
-}
-
-// NewStreamState initializes a stream state.
-func NewStreamState(wildcard bool, initialResourceVersions map[string]string) StreamState {
-	state := StreamState{
-		wildcard:                wildcard,
-		subscribedResourceNames: map[string]struct{}{},
-		resourceVersions:        initialResourceVersions,
-		first:                   true,
-		knownResourceNames:      map[string]map[string]struct{}{},
-	}
-
-	if initialResourceVersions == nil {
-		state.resourceVersions = make(map[string]string)
-	}
-
-	return state
-}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/ya.make
index 6cb4c649bec..ff0a7e670bd 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/stream/v3/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(stream.go)
+SRCS(
+    stream.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/server.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/server.go
index 79b66881c4b..c3e91ee0328 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/server.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/server.go
@@ -21,6 +21,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/envoyproxy/go-control-plane/pkg/server/config"
 	"github.com/envoyproxy/go-control-plane/pkg/server/delta/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/server/rest/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/server/sotw/v3"
@@ -29,7 +30,6 @@ import (
 	core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	clusterservice "github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3"
 	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
-	discoverygrpc "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	endpointservice "github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3"
 	extensionconfigservice "github.com/envoyproxy/go-control-plane/envoy/service/extension/v3"
 	listenerservice "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3"
@@ -49,7 +49,7 @@ type Server interface {
 	routeservice.ScopedRoutesDiscoveryServiceServer
 	routeservice.VirtualHostDiscoveryServiceServer
 	listenerservice.ListenerDiscoveryServiceServer
-	discoverygrpc.AggregatedDiscoveryServiceServer
+	discovery.AggregatedDiscoveryServiceServer
 	secretservice.SecretDiscoveryServiceServer
 	runtimeservice.RuntimeDiscoveryServiceServer
 	extensionconfigservice.ExtensionConfigDiscoveryServiceServer
@@ -165,10 +165,10 @@ func (c CallbackFuncs) OnFetchResponse(req *discovery.DiscoveryRequest, resp *di
 }
 
 // NewServer creates handlers from a config watcher and callbacks.
-func NewServer(ctx context.Context, config cache.Cache, callbacks Callbacks) Server {
+func NewServer(ctx context.Context, config cache.Cache, callbacks Callbacks, opts ...config.XDSOption) Server {
 	return NewServerAdvanced(rest.NewServer(config, callbacks),
-		sotw.NewServer(ctx, config, callbacks),
-		delta.NewServer(ctx, config, callbacks),
+		sotw.NewServer(ctx, config, callbacks, opts...),
+		delta.NewServer(ctx, config, callbacks, opts...),
 	)
 }
 
@@ -186,7 +186,7 @@ func (s *server) StreamHandler(stream stream.Stream, typeURL string) error {
 	return s.sotw.StreamHandler(stream, typeURL)
 }
 
-func (s *server) StreamAggregatedResources(stream discoverygrpc.AggregatedDiscoveryService_StreamAggregatedResourcesServer) error {
+func (s *server) StreamAggregatedResources(stream discovery.AggregatedDiscoveryService_StreamAggregatedResourcesServer) error {
 	return s.StreamHandler(stream, resource.AnyType)
 }
 
@@ -311,7 +311,7 @@ func (s *server) DeltaStreamHandler(stream stream.DeltaStream, typeURL string) e
 	return s.delta.DeltaStreamHandler(stream, typeURL)
 }
 
-func (s *server) DeltaAggregatedResources(stream discoverygrpc.AggregatedDiscoveryService_DeltaAggregatedResourcesServer) error {
+func (s *server) DeltaAggregatedResources(stream discovery.AggregatedDiscoveryService_DeltaAggregatedResourcesServer) error {
 	return s.DeltaStreamHandler(stream, resource.AnyType)
 }
 
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/ya.make
index 26fe186fa4f..96ad36cef84 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/v3/ya.make
@@ -15,4 +15,6 @@ GO_XTEST_SRCS(
 
 END()
 
-RECURSE(gotest)
+RECURSE(
+    gotest
+)
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go
index 73141dbaa38..4d2f5b6e3d0 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/wellknown.go
@@ -13,6 +13,11 @@
 //   limitations under the License.
 
 // Package wellknown contains common names for filters, listeners, etc.
+//
+// Deprecated. Envoy no longer requires specific names when configuring
+// filters or other properties, since it inspects the Protobuf type URL
+// to decide how to the decode a message. Because of this, no new names
+// are being added to this package.
 package wellknown
 
 // HTTP filter names
diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/ya.make b/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/ya.make
index 8c88a9ea933..6989f5f4a38 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/wellknown/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(wellknown.go)
+SRCS(
+    wellknown.go
+)
 
 END()
diff --git a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3/rls_conf.pb.go b/vendor/github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3/rls_conf.pb.go
deleted file mode 100644
index a04e8852de9..00000000000
--- a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3/rls_conf.pb.go
+++ /dev/null
@@ -1,551 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.13.0
-// source: ratelimit/config/ratelimit/v3/rls_conf.proto
-
-package ratelimitv3
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Identifies the unit of of time for rate limit.
-type RateLimitUnit int32
-
-const (
-	// The time unit is not known.
-	RateLimitUnit_UNKNOWN RateLimitUnit = 0
-	// The time unit representing a second.
-	RateLimitUnit_SECOND RateLimitUnit = 1
-	// The time unit representing a minute.
-	RateLimitUnit_MINUTE RateLimitUnit = 2
-	// The time unit representing an hour.
-	RateLimitUnit_HOUR RateLimitUnit = 3
-	// The time unit representing a day.
-	RateLimitUnit_DAY RateLimitUnit = 4
-)
-
-// Enum value maps for RateLimitUnit.
-var (
-	RateLimitUnit_name = map[int32]string{
-		0: "UNKNOWN",
-		1: "SECOND",
-		2: "MINUTE",
-		3: "HOUR",
-		4: "DAY",
-	}
-	RateLimitUnit_value = map[string]int32{
-		"UNKNOWN": 0,
-		"SECOND":  1,
-		"MINUTE":  2,
-		"HOUR":    3,
-		"DAY":     4,
-	}
-)
-
-func (x RateLimitUnit) Enum() *RateLimitUnit {
-	p := new(RateLimitUnit)
-	*p = x
-	return p
-}
-
-func (x RateLimitUnit) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (RateLimitUnit) Descriptor() protoreflect.EnumDescriptor {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_enumTypes[0].Descriptor()
-}
-
-func (RateLimitUnit) Type() protoreflect.EnumType {
-	return &file_ratelimit_config_ratelimit_v3_rls_conf_proto_enumTypes[0]
-}
-
-func (x RateLimitUnit) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use RateLimitUnit.Descriptor instead.
-func (RateLimitUnit) EnumDescriptor() ([]byte, []int) {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP(), []int{0}
-}
-
-// Rate limit configuration for a single domain.
-type RateLimitConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Name of the rate limit configuration. This should be unique for each configuration.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Domain name for the rate limit configuration.
-	Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"`
-	// List of rate limit configuration descriptors.
-	Descriptors []*RateLimitDescriptor `protobuf:"bytes,3,rep,name=descriptors,proto3" json:"descriptors,omitempty"`
-}
-
-func (x *RateLimitConfig) Reset() {
-	*x = RateLimitConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RateLimitConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RateLimitConfig) ProtoMessage() {}
-
-func (x *RateLimitConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RateLimitConfig.ProtoReflect.Descriptor instead.
-func (*RateLimitConfig) Descriptor() ([]byte, []int) {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RateLimitConfig) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *RateLimitConfig) GetDomain() string {
-	if x != nil {
-		return x.Domain
-	}
-	return ""
-}
-
-func (x *RateLimitConfig) GetDescriptors() []*RateLimitDescriptor {
-	if x != nil {
-		return x.Descriptors
-	}
-	return nil
-}
-
-// Rate limit configuration descriptor.
-type RateLimitDescriptor struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Key of the descriptor.
-	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	// Optional value of the descriptor.
-	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	// Rate limit policy of the descriptor.
-	RateLimit *RateLimitPolicy `protobuf:"bytes,3,opt,name=rate_limit,json=rateLimit,proto3" json:"rate_limit,omitempty"`
-	// List of sub rate limit descriptors.
-	Descriptors []*RateLimitDescriptor `protobuf:"bytes,4,rep,name=descriptors,proto3" json:"descriptors,omitempty"`
-	// Mark the descriptor as shadow. When the values is true, rate limit service allow requests to the backend.
-	ShadowMode bool `protobuf:"varint,5,opt,name=shadow_mode,json=shadowMode,proto3" json:"shadow_mode,omitempty"`
-}
-
-func (x *RateLimitDescriptor) Reset() {
-	*x = RateLimitDescriptor{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RateLimitDescriptor) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RateLimitDescriptor) ProtoMessage() {}
-
-func (x *RateLimitDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RateLimitDescriptor.ProtoReflect.Descriptor instead.
-func (*RateLimitDescriptor) Descriptor() ([]byte, []int) {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *RateLimitDescriptor) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *RateLimitDescriptor) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *RateLimitDescriptor) GetRateLimit() *RateLimitPolicy {
-	if x != nil {
-		return x.RateLimit
-	}
-	return nil
-}
-
-func (x *RateLimitDescriptor) GetDescriptors() []*RateLimitDescriptor {
-	if x != nil {
-		return x.Descriptors
-	}
-	return nil
-}
-
-func (x *RateLimitDescriptor) GetShadowMode() bool {
-	if x != nil {
-		return x.ShadowMode
-	}
-	return false
-}
-
-// Rate-limit policy.
-type RateLimitPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Unit of time for the rate limit.
-	Unit RateLimitUnit `protobuf:"varint,1,opt,name=unit,proto3,enum=ratelimit.config.ratelimit.v3.RateLimitUnit" json:"unit,omitempty"`
-	// Number of requests allowed in the policy within `unit` time.
-	RequestsPerUnit uint32 `protobuf:"varint,2,opt,name=requests_per_unit,json=requestsPerUnit,proto3" json:"requests_per_unit,omitempty"`
-	// Mark the rate limit policy as unlimited. All requests are allowed to the backend.
-	Unlimited bool `protobuf:"varint,3,opt,name=unlimited,proto3" json:"unlimited,omitempty"`
-	// Optional name for the rate limit policy. Name the policy, if it should be replaced (dropped evaluation) by
-	// another policy.
-	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
-	// List of rate limit policies, this rate limit policy will replace (drop evaluation)
-	// For more information: https://github.com/envoyproxy/ratelimit/tree/0b2f4d5fb04bf55e1873e2c5e2bb28da67c0643f#replaces
-	// Example: https://github.com/envoyproxy/ratelimit/tree/0b2f4d5fb04bf55e1873e2c5e2bb28da67c0643f#example-7
-	Replaces []*RateLimitReplace `protobuf:"bytes,5,rep,name=replaces,proto3" json:"replaces,omitempty"`
-}
-
-func (x *RateLimitPolicy) Reset() {
-	*x = RateLimitPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RateLimitPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RateLimitPolicy) ProtoMessage() {}
-
-func (x *RateLimitPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RateLimitPolicy.ProtoReflect.Descriptor instead.
-func (*RateLimitPolicy) Descriptor() ([]byte, []int) {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *RateLimitPolicy) GetUnit() RateLimitUnit {
-	if x != nil {
-		return x.Unit
-	}
-	return RateLimitUnit_UNKNOWN
-}
-
-func (x *RateLimitPolicy) GetRequestsPerUnit() uint32 {
-	if x != nil {
-		return x.RequestsPerUnit
-	}
-	return 0
-}
-
-func (x *RateLimitPolicy) GetUnlimited() bool {
-	if x != nil {
-		return x.Unlimited
-	}
-	return false
-}
-
-func (x *RateLimitPolicy) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *RateLimitPolicy) GetReplaces() []*RateLimitReplace {
-	if x != nil {
-		return x.Replaces
-	}
-	return nil
-}
-
-// Replace specifies the rate limit policy that should be replaced (dropped evaluation).
-// For more information: https://github.com/envoyproxy/ratelimit/tree/0b2f4d5fb04bf55e1873e2c5e2bb28da67c0643f#replaces
-type RateLimitReplace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Name of the rate limit policy, that is being replaced (dropped evaluation).
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *RateLimitReplace) Reset() {
-	*x = RateLimitReplace{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RateLimitReplace) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RateLimitReplace) ProtoMessage() {}
-
-func (x *RateLimitReplace) ProtoReflect() protoreflect.Message {
-	mi := &file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RateLimitReplace.ProtoReflect.Descriptor instead.
-func (*RateLimitReplace) Descriptor() ([]byte, []int) {
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *RateLimitReplace) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-var File_ratelimit_config_ratelimit_v3_rls_conf_proto protoreflect.FileDescriptor
-
-var file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x76, 0x33, 0x2f,
-	0x72, 0x6c, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d,
-	0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x22, 0x93, 0x01,
-	0x0a, 0x0f, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x54, 0x0a,
-	0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e,
-	0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x6f, 0x72, 0x73, 0x22, 0x83, 0x02, 0x0a, 0x13, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x09, 0x72, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x12, 0x54, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x64,
-	0x6f, 0x77, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73,
-	0x68, 0x61, 0x64, 0x6f, 0x77, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x0f, 0x52, 0x61,
-	0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x40, 0x0a,
-	0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x12,
-	0x2a, 0x0a, 0x11, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f,
-	0x75, 0x6e, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0f, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75,
-	0x6e, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
-	0x75, 0x6e, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4b, 0x0a,
-	0x08, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x2f, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x2e,
-	0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65,
-	0x52, 0x08, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x10, 0x52, 0x61,
-	0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x2a, 0x47, 0x0a, 0x0d, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x55,
-	0x6e, 0x69, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00,
-	0x12, 0x0a, 0x0a, 0x06, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06,
-	0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x55, 0x52,
-	0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x41, 0x59, 0x10, 0x04, 0x42, 0x91, 0x01, 0x0a, 0x2b,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72,
-	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x52, 0x6c, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x50, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x2f, 0x76, 0x33, 0x3b, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x76, 0x33, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescOnce sync.Once
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescData = file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDesc
-)
-
-func file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescGZIP() []byte {
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescOnce.Do(func() {
-		file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescData = protoimpl.X.CompressGZIP(file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescData)
-	})
-	return file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDescData
-}
-
-var file_ratelimit_config_ratelimit_v3_rls_conf_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_ratelimit_config_ratelimit_v3_rls_conf_proto_goTypes = []interface{}{
-	(RateLimitUnit)(0),          // 0: ratelimit.config.ratelimit.v3.RateLimitUnit
-	(*RateLimitConfig)(nil),     // 1: ratelimit.config.ratelimit.v3.RateLimitConfig
-	(*RateLimitDescriptor)(nil), // 2: ratelimit.config.ratelimit.v3.RateLimitDescriptor
-	(*RateLimitPolicy)(nil),     // 3: ratelimit.config.ratelimit.v3.RateLimitPolicy
-	(*RateLimitReplace)(nil),    // 4: ratelimit.config.ratelimit.v3.RateLimitReplace
-}
-var file_ratelimit_config_ratelimit_v3_rls_conf_proto_depIdxs = []int32{
-	2, // 0: ratelimit.config.ratelimit.v3.RateLimitConfig.descriptors:type_name -> ratelimit.config.ratelimit.v3.RateLimitDescriptor
-	3, // 1: ratelimit.config.ratelimit.v3.RateLimitDescriptor.rate_limit:type_name -> ratelimit.config.ratelimit.v3.RateLimitPolicy
-	2, // 2: ratelimit.config.ratelimit.v3.RateLimitDescriptor.descriptors:type_name -> ratelimit.config.ratelimit.v3.RateLimitDescriptor
-	0, // 3: ratelimit.config.ratelimit.v3.RateLimitPolicy.unit:type_name -> ratelimit.config.ratelimit.v3.RateLimitUnit
-	4, // 4: ratelimit.config.ratelimit.v3.RateLimitPolicy.replaces:type_name -> ratelimit.config.ratelimit.v3.RateLimitReplace
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
-}
-
-func init() { file_ratelimit_config_ratelimit_v3_rls_conf_proto_init() }
-func file_ratelimit_config_ratelimit_v3_rls_conf_proto_init() {
-	if File_ratelimit_config_ratelimit_v3_rls_conf_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimitConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimitDescriptor); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimitPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimitReplace); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_ratelimit_config_ratelimit_v3_rls_conf_proto_goTypes,
-		DependencyIndexes: file_ratelimit_config_ratelimit_v3_rls_conf_proto_depIdxs,
-		EnumInfos:         file_ratelimit_config_ratelimit_v3_rls_conf_proto_enumTypes,
-		MessageInfos:      file_ratelimit_config_ratelimit_v3_rls_conf_proto_msgTypes,
-	}.Build()
-	File_ratelimit_config_ratelimit_v3_rls_conf_proto = out.File
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_rawDesc = nil
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_goTypes = nil
-	file_ratelimit_config_ratelimit_v3_rls_conf_proto_depIdxs = nil
-}
diff --git a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3/ya.make b/vendor/github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3/ya.make
index 127086c2ee1..07c7f72aa59 100644
--- a/vendor/github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3/ya.make
+++ b/vendor/github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(Apache-2.0)
 
-SRCS(rls_conf_ds.pb.go)
+SRCS(
+    rls_conf_ds.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/compiler/protogen/gotest/ya.make b/vendor/google.golang.org/protobuf/compiler/protogen/gotest/ya.make
deleted file mode 100644
index e10e68b1c76..00000000000
--- a/vendor/google.golang.org/protobuf/compiler/protogen/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/compiler/protogen)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/compiler/protogen/protogen.go b/vendor/google.golang.org/protobuf/compiler/protogen/protogen.go
index 431e88048a8..914c57b1b25 100644
--- a/vendor/google.golang.org/protobuf/compiler/protogen/protogen.go
+++ b/vendor/google.golang.org/protobuf/compiler/protogen/protogen.go
@@ -5,8 +5,8 @@
 // Package protogen provides support for writing protoc plugins.
 //
 // Plugins for protoc, the Protocol Buffer compiler,
-// are programs which read a CodeGeneratorRequest message from standard input
-// and write a CodeGeneratorResponse message to standard output.
+// are programs which read a [pluginpb.CodeGeneratorRequest] message from standard input
+// and write a [pluginpb.CodeGeneratorResponse] message to standard output.
 // This package provides support for writing plugins which generate Go code.
 package protogen
 
@@ -44,11 +44,11 @@ const goPackageDocURL = "https://protobuf.dev/reference/go/go-generated#package"
 
 // Run executes a function as a protoc plugin.
 //
-// It reads a CodeGeneratorRequest message from os.Stdin, invokes the plugin
-// function, and writes a CodeGeneratorResponse message to os.Stdout.
+// It reads a [pluginpb.CodeGeneratorRequest] message from [os.Stdin], invokes the plugin
+// function, and writes a [pluginpb.CodeGeneratorResponse] message to [os.Stdout].
 //
 // If a failure occurs while reading or writing, Run prints an error to
-// os.Stderr and calls os.Exit(1).
+// [os.Stderr] and calls [os.Exit](1).
 func (opts Options) Run(f func(*Plugin) error) {
 	if err := run(opts, f); err != nil {
 		fmt.Fprintf(os.Stderr, "%s: %v\n", filepath.Base(os.Args[0]), err)
@@ -834,7 +834,7 @@ func newOneof(gen *Plugin, f *File, message *Message, desc protoreflect.OneofDes
 	}
 }
 
-// Extension is an alias of Field for documentation.
+// Extension is an alias of [Field] for documentation.
 type Extension = Field
 
 // A Service describes a service.
@@ -946,7 +946,7 @@ func (gen *Plugin) NewGeneratedFile(filename string, goImportPath GoImportPath)
 }
 
 // P prints a line to the generated output. It converts each parameter to a
-// string following the same rules as fmt.Print. It never inserts spaces
+// string following the same rules as [fmt.Print]. It never inserts spaces
 // between parameters.
 func (g *GeneratedFile) P(v ...interface{}) {
 	for _, x := range v {
@@ -983,14 +983,14 @@ func (g *GeneratedFile) QualifiedGoIdent(ident GoIdent) string {
 
 // Import ensures a package is imported by the generated file.
 //
-// Packages referenced by QualifiedGoIdent are automatically imported.
+// Packages referenced by [GeneratedFile.QualifiedGoIdent] are automatically imported.
 // Explicitly importing a package with Import is generally only necessary
 // when the import will be blank (import _ "package").
 func (g *GeneratedFile) Import(importPath GoImportPath) {
 	g.manualImports[importPath] = true
 }
 
-// Write implements io.Writer.
+// Write implements [io.Writer].
 func (g *GeneratedFile) Write(p []byte) (n int, err error) {
 	return g.buf.Write(p)
 }
@@ -1000,8 +1000,8 @@ func (g *GeneratedFile) Skip() {
 	g.skip = true
 }
 
-// Unskip reverts a previous call to Skip, re-including the generated file in
-// the plugin output.
+// Unskip reverts a previous call to [GeneratedFile.Skip],
+// re-including the generated file in the plugin output.
 func (g *GeneratedFile) Unskip() {
 	g.skip = false
 }
@@ -1013,7 +1013,7 @@ func (g *GeneratedFile) Unskip() {
 // struct field.  The "T.sel" syntax is used to identify the method or field
 // 'sel' on type 'T'.
 //
-// Deprecated: Use the AnnotateSymbol method instead.
+// Deprecated: Use the [GeneratedFile.AnnotateSymbol] method instead.
 func (g *GeneratedFile) Annotate(symbol string, loc Location) {
 	g.AnnotateSymbol(symbol, Annotation{Location: loc})
 }
@@ -1319,7 +1319,7 @@ func (c Comments) String() string {
 // file for which we are generating bindings.
 //
 // Lookups consult the local type registry first and fall back to the base type
-// registry which defaults to protoregistry.GlobalTypes
+// registry which defaults to protoregistry.GlobalTypes.
 type extensionRegistry struct {
 	base  *protoregistry.Types
 	local *protoregistry.Types
diff --git a/vendor/google.golang.org/protobuf/compiler/protogen/protogen_test.go b/vendor/google.golang.org/protobuf/compiler/protogen/protogen_test.go
deleted file mode 100644
index d7b5407be41..00000000000
--- a/vendor/google.golang.org/protobuf/compiler/protogen/protogen_test.go
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protogen
-
-import (
-	"flag"
-	"fmt"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/genid"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	"google.golang.org/protobuf/types/descriptorpb"
-	"google.golang.org/protobuf/types/pluginpb"
-)
-
-func TestPluginParameters(t *testing.T) {
-	var flags flag.FlagSet
-	value := flags.Int("integer", 0, "")
-	const params = "integer=2"
-	_, err := Options{
-		ParamFunc: flags.Set,
-	}.New(&pluginpb.CodeGeneratorRequest{
-		Parameter: proto.String(params),
-	})
-	if err != nil {
-		t.Errorf("New(generator parameters %q): %v", params, err)
-	}
-	if *value != 2 {
-		t.Errorf("New(generator parameters %q): integer=%v, want 2", params, *value)
-	}
-}
-
-func TestPluginParameterErrors(t *testing.T) {
-	for _, parameter := range []string{
-		"unknown=1",
-		"boolean=error",
-	} {
-		var flags flag.FlagSet
-		flags.Bool("boolean", false, "")
-		_, err := Options{
-			ParamFunc: flags.Set,
-		}.New(&pluginpb.CodeGeneratorRequest{
-			Parameter: proto.String(parameter),
-		})
-		if err == nil {
-			t.Errorf("New(generator parameters %q): want error, got nil", parameter)
-		}
-	}
-}
-
-func TestNoGoPackage(t *testing.T) {
-	_, err := Options{}.New(&pluginpb.CodeGeneratorRequest{
-		ProtoFile: []*descriptorpb.FileDescriptorProto{
-			{
-				Name:    proto.String("testdata/go_package/no_go_package.proto"),
-				Syntax:  proto.String(protoreflect.Proto3.String()),
-				Package: proto.String("goproto.testdata"),
-			},
-		},
-	})
-	if err == nil {
-		t.Fatalf("missing go_package option: New(req) = nil, want error")
-	}
-}
-
-func TestInvalidImportPath(t *testing.T) {
-	_, err := Options{}.New(&pluginpb.CodeGeneratorRequest{
-		ProtoFile: []*descriptorpb.FileDescriptorProto{
-			{
-				Name:    proto.String("testdata/go_package/no_go_package.proto"),
-				Syntax:  proto.String(protoreflect.Proto3.String()),
-				Package: proto.String("goproto.testdata"),
-				Options: &descriptorpb.FileOptions{
-					GoPackage: proto.String("foo"),
-				},
-			},
-		},
-	})
-	if err == nil {
-		t.Fatalf("missing go_package option: New(req) = nil, want error")
-	}
-}
-
-func TestPackageNamesAndPaths(t *testing.T) {
-	const (
-		filename         = "dir/filename.proto"
-		protoPackageName = "proto.package"
-	)
-	for _, test := range []struct {
-		desc            string
-		parameter       string
-		goPackageOption string
-		generate        bool
-		wantPackageName GoPackageName
-		wantImportPath  GoImportPath
-		wantFilename    string
-	}{
-		{
-			desc:            "go_package option sets import path",
-			goPackageOption: "golang.org/x/foo",
-			generate:        true,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org/x/foo",
-			wantFilename:    "golang.org/x/foo/filename",
-		},
-		{
-			desc:            "go_package option sets import path without slashes",
-			goPackageOption: "golang.org;foo",
-			generate:        true,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org",
-			wantFilename:    "golang.org/filename",
-		},
-		{
-			desc:            "go_package option sets import path and package",
-			goPackageOption: "golang.org/x/foo;bar",
-			generate:        true,
-			wantPackageName: "bar",
-			wantImportPath:  "golang.org/x/foo",
-			wantFilename:    "golang.org/x/foo/filename",
-		},
-		{
-			desc:            "command line sets import path for a file",
-			parameter:       "Mdir/filename.proto=golang.org/x/bar",
-			goPackageOption: "golang.org/x/foo",
-			generate:        true,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org/x/bar",
-			wantFilename:    "golang.org/x/bar/filename",
-		},
-		{
-			desc:            "command line sets import path for a file with package name specified",
-			parameter:       "Mdir/filename.proto=golang.org/x/bar;bar",
-			goPackageOption: "golang.org/x/foo",
-			generate:        true,
-			wantPackageName: "bar",
-			wantImportPath:  "golang.org/x/bar",
-			wantFilename:    "golang.org/x/bar/filename",
-		},
-		{
-			desc:            "module option set",
-			parameter:       "module=golang.org/x",
-			goPackageOption: "golang.org/x/foo",
-			generate:        false,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org/x/foo",
-			wantFilename:    "foo/filename",
-		},
-		{
-			desc:            "paths=import uses import path from command line",
-			parameter:       "paths=import,Mdir/filename.proto=golang.org/x/bar",
-			goPackageOption: "golang.org/x/foo",
-			generate:        true,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org/x/bar",
-			wantFilename:    "golang.org/x/bar/filename",
-		},
-		{
-			desc:            "module option implies paths=import",
-			parameter:       "module=golang.org/x,Mdir/filename.proto=golang.org/x/foo",
-			generate:        false,
-			wantPackageName: "foo",
-			wantImportPath:  "golang.org/x/foo",
-			wantFilename:    "foo/filename",
-		},
-	} {
-		context := fmt.Sprintf(`
-TEST: %v
-  --go_out=%v:.
-  file %q: generate=%v
-  option go_package = %q;
-
-  `,
-			test.desc, test.parameter, filename, test.generate, test.goPackageOption)
-
-		req := &pluginpb.CodeGeneratorRequest{
-			Parameter: proto.String(test.parameter),
-			ProtoFile: []*descriptorpb.FileDescriptorProto{
-				{
-					Name:    proto.String(filename),
-					Package: proto.String(protoPackageName),
-					Options: &descriptorpb.FileOptions{
-						GoPackage: proto.String(test.goPackageOption),
-					},
-				},
-			},
-		}
-		if test.generate {
-			req.FileToGenerate = []string{filename}
-		}
-		gen, err := Options{}.New(req)
-		if err != nil {
-			t.Errorf("%vNew(req) = %v", context, err)
-			continue
-		}
-		gotFile, ok := gen.FilesByPath[filename]
-		if !ok {
-			t.Errorf("%v%v: missing file info", context, filename)
-			continue
-		}
-		if got, want := gotFile.GoPackageName, test.wantPackageName; got != want {
-			t.Errorf("%vGoPackageName=%v, want %v", context, got, want)
-		}
-		if got, want := gotFile.GoImportPath, test.wantImportPath; got != want {
-			t.Errorf("%vGoImportPath=%v, want %v", context, got, want)
-		}
-		gen.NewGeneratedFile(gotFile.GeneratedFilenamePrefix, "")
-		resp := gen.Response()
-		if got, want := resp.File[0].GetName(), test.wantFilename; got != want {
-			t.Errorf("%vgenerated filename=%v, want %v", context, got, want)
-		}
-	}
-}
-
-func TestPackageNameInference(t *testing.T) {
-	gen, err := Options{}.New(&pluginpb.CodeGeneratorRequest{
-		Parameter: proto.String("Mdir/file1.proto=path/to/file1"),
-		ProtoFile: []*descriptorpb.FileDescriptorProto{
-			{
-				Name:    proto.String("dir/file1.proto"),
-				Package: proto.String("proto.package"),
-			},
-			{
-				Name:    proto.String("dir/file2.proto"),
-				Package: proto.String("proto.package"),
-				Options: &descriptorpb.FileOptions{
-					GoPackage: proto.String("path/to/file2"),
-				},
-			},
-		},
-		FileToGenerate: []string{"dir/file1.proto", "dir/file2.proto"},
-	})
-	if err != nil {
-		t.Fatalf("New(req) = %v", err)
-	}
-	if f1, ok := gen.FilesByPath["dir/file1.proto"]; !ok {
-		t.Errorf("missing file info for dir/file1.proto")
-	} else if f1.GoPackageName != "file1" {
-		t.Errorf("dir/file1.proto: GoPackageName=%v, want foo; package name should be derived from dir/file2.proto", f1.GoPackageName)
-	}
-}
-
-func TestInconsistentPackageNames(t *testing.T) {
-	_, err := Options{}.New(&pluginpb.CodeGeneratorRequest{
-		ProtoFile: []*descriptorpb.FileDescriptorProto{
-			{
-				Name:    proto.String("dir/file1.proto"),
-				Package: proto.String("proto.package"),
-				Options: &descriptorpb.FileOptions{
-					GoPackage: proto.String("golang.org/x/foo"),
-				},
-			},
-			{
-				Name:    proto.String("dir/file2.proto"),
-				Package: proto.String("proto.package"),
-				Options: &descriptorpb.FileOptions{
-					GoPackage: proto.String("golang.org/x/foo;bar"),
-				},
-			},
-		},
-		FileToGenerate: []string{"dir/file1.proto", "dir/file2.proto"},
-	})
-	if err == nil {
-		t.Fatalf("inconsistent package names for the same import path: New(req) = nil, want error")
-	}
-}
-
-func TestImports(t *testing.T) {
-	gen, err := Options{}.New(&pluginpb.CodeGeneratorRequest{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	g := gen.NewGeneratedFile("foo.go", "golang.org/x/foo")
-	g.P("package foo")
-	g.P()
-	for _, importPath := range []GoImportPath{
-		"golang.org/x/foo",
-		// Multiple references to the same package.
-		"golang.org/x/bar",
-		"golang.org/x/bar",
-		// Reference to a different package with the same basename.
-		"golang.org/y/bar",
-		"golang.org/x/baz",
-		// Reference to a package conflicting with a predeclared identifier.
-		"golang.org/z/string",
-	} {
-		g.P("var _ = ", GoIdent{GoName: "X", GoImportPath: importPath}, " // ", importPath)
-	}
-	want := `package foo
-
-import (
-	bar "golang.org/x/bar"
-	baz "golang.org/x/baz"
-	bar1 "golang.org/y/bar"
-	string1 "golang.org/z/string"
-)
-
-var _ = X         // "golang.org/x/foo"
-var _ = bar.X     // "golang.org/x/bar"
-var _ = bar.X     // "golang.org/x/bar"
-var _ = bar1.X    // "golang.org/y/bar"
-var _ = baz.X     // "golang.org/x/baz"
-var _ = string1.X // "golang.org/z/string"
-`
-	got, err := g.Content()
-	if err != nil {
-		t.Fatalf("g.Content() = %v", err)
-	}
-	if diff := cmp.Diff(string(want), string(got)); diff != "" {
-		t.Fatalf("content mismatch (-want +got):\n%s", diff)
-	}
-}
-
-func TestImportRewrites(t *testing.T) {
-	gen, err := Options{
-		ImportRewriteFunc: func(i GoImportPath) GoImportPath {
-			return "prefix/" + i
-		},
-	}.New(&pluginpb.CodeGeneratorRequest{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	g := gen.NewGeneratedFile("foo.go", "golang.org/x/foo")
-	g.P("package foo")
-	g.P("var _ = ", GoIdent{GoName: "X", GoImportPath: "golang.org/x/bar"})
-	want := `package foo
-
-import (
-	bar "prefix/golang.org/x/bar"
-)
-
-var _ = bar.X
-`
-	got, err := g.Content()
-	if err != nil {
-		t.Fatalf("g.Content() = %v", err)
-	}
-	if diff := cmp.Diff(string(want), string(got)); diff != "" {
-		t.Fatalf("content mismatch (-want +got):\n%s", diff)
-	}
-}
-
-func TestAnnotations(t *testing.T) {
-	gen, err := Options{}.New(&pluginpb.CodeGeneratorRequest{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	loc := Location{SourceFile: "foo.go"}
-	g := gen.NewGeneratedFile("foo.go", "golang.org/x/foo")
-
-	g.P("package foo")
-	g.P()
-
-	structName := "S"
-	fieldName := "Field"
-
-	messageLoc := loc.appendPath(genid.FileDescriptorProto_MessageType_field_number, 1)
-	fieldLoc := messageLoc.appendPath(genid.DescriptorProto_Field_field_number, 1)
-
-	g.Annotate(structName, messageLoc) // use deprecated version to test existing usages
-	g.P("type ", structName, " struct {")
-	g.AnnotateSymbol(structName+"."+fieldName, Annotation{Location: fieldLoc})
-	g.P(fieldName, " string")
-	g.P("}")
-	g.P()
-
-	g.AnnotateSymbol(fmt.Sprintf("%s.Set%s", structName, fieldName), Annotation{
-		Location: fieldLoc,
-		Semantic: descriptorpb.GeneratedCodeInfo_Annotation_SET.Enum(),
-	})
-	g.P("func (m *", structName, ") Set", fieldName, "(x string) {")
-	g.P("m.", fieldName, " = x")
-	g.P("}")
-	g.P()
-
-	want := &descriptorpb.GeneratedCodeInfo{
-		Annotation: []*descriptorpb.GeneratedCodeInfo_Annotation{
-			{ // S
-				SourceFile: proto.String("foo.go"),
-				Path:       []int32{4, 1}, // message S
-				Begin:      proto.Int32(18),
-				End:        proto.Int32(19),
-			},
-			{ // S.F
-				SourceFile: proto.String("foo.go"),
-				Path:       []int32{4, 1, 2, 1},
-				Begin:      proto.Int32(30),
-				End:        proto.Int32(35),
-			},
-			{ // SetF
-				SourceFile: proto.String("foo.go"),
-				Path:       []int32{4, 1, 2, 1},
-				Begin:      proto.Int32(58),
-				End:        proto.Int32(66),
-				Semantic:   descriptorpb.GeneratedCodeInfo_Annotation_SET.Enum(),
-			},
-		},
-	}
-
-	content, err := g.Content()
-	if err != nil {
-		t.Fatalf("g.Content() = %v", err)
-	}
-	got, err := g.generatedCodeInfo(content)
-	if err != nil {
-		t.Fatalf("g.generatedCodeInfo(...) = %v", err)
-	}
-	if diff := cmp.Diff(want, got, protocmp.Transform()); diff != "" {
-		t.Fatalf("GeneratedCodeInfo mismatch (-want +got):\n%s", diff)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/compiler/protogen/ya.make b/vendor/google.golang.org/protobuf/compiler/protogen/ya.make
index 9dcf3b5979b..65652dc84ae 100644
--- a/vendor/google.golang.org/protobuf/compiler/protogen/ya.make
+++ b/vendor/google.golang.org/protobuf/compiler/protogen/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(protogen.go)
-
-GO_TEST_SRCS(protogen_test.go)
+SRCS(
+    protogen.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/bench_test.go b/vendor/google.golang.org/protobuf/encoding/protojson/bench_test.go
deleted file mode 100644
index 8d5a0bb68d9..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protojson/bench_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protojson_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/encoding/protojson"
-
-	"google.golang.org/protobuf/types/known/durationpb"
-)
-
-func BenchmarkUnmarshal_Duration(b *testing.B) {
-	input := []byte(`"-123456789.123456789s"`)
-
-	for i := 0; i < b.N; i++ {
-		err := protojson.Unmarshal(input, &durationpb.Duration{})
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/decode.go b/vendor/google.golang.org/protobuf/encoding/protojson/decode.go
index 5f28148d805..f47902371a6 100644
--- a/vendor/google.golang.org/protobuf/encoding/protojson/decode.go
+++ b/vendor/google.golang.org/protobuf/encoding/protojson/decode.go
@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 
+	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/internal/encoding/json"
 	"google.golang.org/protobuf/internal/encoding/messageset"
 	"google.golang.org/protobuf/internal/errors"
@@ -23,7 +24,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
-// Unmarshal reads the given []byte into the given proto.Message.
+// Unmarshal reads the given []byte into the given [proto.Message].
 // The provided message must be mutable (e.g., a non-nil pointer to a message).
 func Unmarshal(b []byte, m proto.Message) error {
 	return UnmarshalOptions{}.Unmarshal(b, m)
@@ -37,7 +38,7 @@ type UnmarshalOptions struct {
 	// required fields will not return an error.
 	AllowPartial bool
 
-	// If DiscardUnknown is set, unknown fields are ignored.
+	// If DiscardUnknown is set, unknown fields and enum name values are ignored.
 	DiscardUnknown bool
 
 	// Resolver is used for looking up types when unmarshaling
@@ -47,9 +48,13 @@ type UnmarshalOptions struct {
 		protoregistry.MessageTypeResolver
 		protoregistry.ExtensionTypeResolver
 	}
+
+	// RecursionLimit limits how deeply messages may be nested.
+	// If zero, a default limit is applied.
+	RecursionLimit int
 }
 
-// Unmarshal reads the given []byte and populates the given proto.Message
+// Unmarshal reads the given []byte and populates the given [proto.Message]
 // using options in the UnmarshalOptions object.
 // It will clear the message first before setting the fields.
 // If it returns an error, the given message may be partially set.
@@ -67,6 +72,9 @@ func (o UnmarshalOptions) unmarshal(b []byte, m proto.Message) error {
 	if o.Resolver == nil {
 		o.Resolver = protoregistry.GlobalTypes
 	}
+	if o.RecursionLimit == 0 {
+		o.RecursionLimit = protowire.DefaultRecursionLimit
+	}
 
 	dec := decoder{json.NewDecoder(b), o}
 	if err := dec.unmarshalMessage(m.ProtoReflect(), false); err != nil {
@@ -114,6 +122,10 @@ func (d decoder) syntaxError(pos int, f string, x ...interface{}) error {
 
 // unmarshalMessage unmarshals a message into the given protoreflect.Message.
 func (d decoder) unmarshalMessage(m protoreflect.Message, skipTypeURL bool) error {
+	d.opts.RecursionLimit--
+	if d.opts.RecursionLimit < 0 {
+		return errors.New("exceeded max recursion depth")
+	}
 	if unmarshal := wellKnownTypeUnmarshaler(m.Descriptor().FullName()); unmarshal != nil {
 		return unmarshal(d, m)
 	}
@@ -266,7 +278,9 @@ func (d decoder) unmarshalSingular(m protoreflect.Message, fd protoreflect.Field
 	if err != nil {
 		return err
 	}
-	m.Set(fd, val)
+	if val.IsValid() {
+		m.Set(fd, val)
+	}
 	return nil
 }
 
@@ -329,7 +343,7 @@ func (d decoder) unmarshalScalar(fd protoreflect.FieldDescriptor) (protoreflect.
 		}
 
 	case protoreflect.EnumKind:
-		if v, ok := unmarshalEnum(tok, fd); ok {
+		if v, ok := unmarshalEnum(tok, fd, d.opts.DiscardUnknown); ok {
 			return v, nil
 		}
 
@@ -474,7 +488,7 @@ func unmarshalBytes(tok json.Token) (protoreflect.Value, bool) {
 	return protoreflect.ValueOfBytes(b), true
 }
 
-func unmarshalEnum(tok json.Token, fd protoreflect.FieldDescriptor) (protoreflect.Value, bool) {
+func unmarshalEnum(tok json.Token, fd protoreflect.FieldDescriptor, discardUnknown bool) (protoreflect.Value, bool) {
 	switch tok.Kind() {
 	case json.String:
 		// Lookup EnumNumber based on name.
@@ -482,6 +496,9 @@ func unmarshalEnum(tok json.Token, fd protoreflect.FieldDescriptor) (protoreflec
 		if enumVal := fd.Enum().Values().ByName(protoreflect.Name(s)); enumVal != nil {
 			return protoreflect.ValueOfEnum(enumVal.Number()), true
 		}
+		if discardUnknown {
+			return protoreflect.Value{}, true
+		}
 
 	case json.Number:
 		if n, ok := tok.Int(32); ok {
@@ -542,7 +559,9 @@ func (d decoder) unmarshalList(list protoreflect.List, fd protoreflect.FieldDesc
 			if err != nil {
 				return err
 			}
-			list.Append(val)
+			if val.IsValid() {
+				list.Append(val)
+			}
 		}
 	}
 
@@ -609,8 +628,9 @@ Loop:
 		if err != nil {
 			return err
 		}
-
-		mmap.Set(pkey, pval)
+		if pval.IsValid() {
+			mmap.Set(pkey, pval)
+		}
 	}
 
 	return nil
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/decode_test.go b/vendor/google.golang.org/protobuf/encoding/protojson/decode_test.go
deleted file mode 100644
index 3653ccbca13..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protojson/decode_test.go
+++ /dev/null
@@ -1,2480 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protojson_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/internal/errors"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoregistry"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	weakpb "google.golang.org/protobuf/internal/testprotos/test/weak1"
-	pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
-	pb3 "google.golang.org/protobuf/internal/testprotos/textpb3"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/emptypb"
-	"google.golang.org/protobuf/types/known/fieldmaskpb"
-	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func TestUnmarshal(t *testing.T) {
-	tests := []struct {
-		desc         string
-		umo          protojson.UnmarshalOptions
-		inputMessage proto.Message
-		inputText    string
-		wantMessage  proto.Message
-		wantErr      string // Expected error substring.
-		skip         bool
-	}{{
-		desc:         "proto2 empty message",
-		inputMessage: &pb2.Scalars{},
-		inputText:    "{}",
-		wantMessage:  &pb2.Scalars{},
-	}, {
-		desc:         "unexpected value instead of EOF",
-		inputMessage: &pb2.Scalars{},
-		inputText:    "{} {}",
-		wantErr:      `(line 1:4): unexpected token {`,
-	}, {
-		desc:         "proto2 optional scalars set to zero values",
-		inputMessage: &pb2.Scalars{},
-		inputText: `{
-  "optBool": false,
-  "optInt32": 0,
-  "optInt64": 0,
-  "optUint32": 0,
-  "optUint64": 0,
-  "optSint32": 0,
-  "optSint64": 0,
-  "optFixed32": 0,
-  "optFixed64": 0,
-  "optSfixed32": 0,
-  "optSfixed64": 0,
-  "optFloat": 0,
-  "optDouble": 0,
-  "optBytes": "",
-  "optString": ""
-}`,
-		wantMessage: &pb2.Scalars{
-			OptBool:     proto.Bool(false),
-			OptInt32:    proto.Int32(0),
-			OptInt64:    proto.Int64(0),
-			OptUint32:   proto.Uint32(0),
-			OptUint64:   proto.Uint64(0),
-			OptSint32:   proto.Int32(0),
-			OptSint64:   proto.Int64(0),
-			OptFixed32:  proto.Uint32(0),
-			OptFixed64:  proto.Uint64(0),
-			OptSfixed32: proto.Int32(0),
-			OptSfixed64: proto.Int64(0),
-			OptFloat:    proto.Float32(0),
-			OptDouble:   proto.Float64(0),
-			OptBytes:    []byte{},
-			OptString:   proto.String(""),
-		},
-	}, {
-		desc:         "proto3 scalars set to zero values",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sBool": false,
-  "sInt32": 0,
-  "sInt64": 0,
-  "sUint32": 0,
-  "sUint64": 0,
-  "sSint32": 0,
-  "sSint64": 0,
-  "sFixed32": 0,
-  "sFixed64": 0,
-  "sSfixed32": 0,
-  "sSfixed64": 0,
-  "sFloat": 0,
-  "sDouble": 0,
-  "sBytes": "",
-  "sString": ""
-}`,
-		wantMessage: &pb3.Scalars{},
-	}, {
-		desc:         "proto3 optional set to zero values",
-		inputMessage: &pb3.Proto3Optional{},
-		inputText: `{
-  "optBool": false,
-  "optInt32": 0,
-  "optInt64": 0,
-  "optUint32": 0,
-  "optUint64": 0,
-  "optFloat": 0,
-  "optDouble": 0,
-  "optString": "",
-  "optBytes": "",
-  "optEnum": "ZERO",
-  "optMessage": {}
-}`,
-		wantMessage: &pb3.Proto3Optional{
-			OptBool:    proto.Bool(false),
-			OptInt32:   proto.Int32(0),
-			OptInt64:   proto.Int64(0),
-			OptUint32:  proto.Uint32(0),
-			OptUint64:  proto.Uint64(0),
-			OptFloat:   proto.Float32(0),
-			OptDouble:  proto.Float64(0),
-			OptString:  proto.String(""),
-			OptBytes:   []byte{},
-			OptEnum:    pb3.Enum_ZERO.Enum(),
-			OptMessage: &pb3.Nested{},
-		},
-	}, {
-		desc:         "proto2 optional scalars set to null",
-		inputMessage: &pb2.Scalars{},
-		inputText: `{
-  "optBool": null,
-  "optInt32": null,
-  "optInt64": null,
-  "optUint32": null,
-  "optUint64": null,
-  "optSint32": null,
-  "optSint64": null,
-  "optFixed32": null,
-  "optFixed64": null,
-  "optSfixed32": null,
-  "optSfixed64": null,
-  "optFloat": null,
-  "optDouble": null,
-  "optBytes": null,
-  "optString": null
-}`,
-		wantMessage: &pb2.Scalars{},
-	}, {
-		desc:         "proto3 scalars set to null",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sBool": null,
-  "sInt32": null,
-  "sInt64": null,
-  "sUint32": null,
-  "sUint64": null,
-  "sSint32": null,
-  "sSint64": null,
-  "sFixed32": null,
-  "sFixed64": null,
-  "sSfixed32": null,
-  "sSfixed64": null,
-  "sFloat": null,
-  "sDouble": null,
-  "sBytes": null,
-  "sString": null
-}`,
-		wantMessage: &pb3.Scalars{},
-	}, {
-		desc:         "boolean",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sBool": true}`,
-		wantMessage: &pb3.Scalars{
-			SBool: true,
-		},
-	}, {
-		desc:         "not boolean",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sBool": "true"}`,
-		wantErr:      `invalid value for bool type: "true"`,
-	}, {
-		desc:         "float and double",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sFloat": 1.234,
-  "sDouble": 5.678
-}`,
-		wantMessage: &pb3.Scalars{
-			SFloat:  1.234,
-			SDouble: 5.678,
-		},
-	}, {
-		desc:         "float and double in string",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sFloat": "1.234",
-  "sDouble": "5.678"
-}`,
-		wantMessage: &pb3.Scalars{
-			SFloat:  1.234,
-			SDouble: 5.678,
-		},
-	}, {
-		desc:         "float and double in E notation",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sFloat": 12.34E-1,
-  "sDouble": 5.678e4
-}`,
-		wantMessage: &pb3.Scalars{
-			SFloat:  1.234,
-			SDouble: 56780,
-		},
-	}, {
-		desc:         "float and double in string E notation",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sFloat": "12.34E-1",
-  "sDouble": "5.678e4"
-}`,
-		wantMessage: &pb3.Scalars{
-			SFloat:  1.234,
-			SDouble: 56780,
-		},
-	}, {
-		desc:         "float exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sFloat": 3.4e39}`,
-		wantErr:      `invalid value for float type: 3.4e39`,
-	}, {
-		desc:         "float in string exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sFloat": "-3.4e39"}`,
-		wantErr:      `invalid value for float type: "-3.4e39"`,
-	}, {
-		desc:         "double exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sDouble": -1.79e+309}`,
-		wantErr:      `invalid value for double type: -1.79e+309`,
-	}, {
-		desc:         "double in string exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sDouble": "1.79e+309"}`,
-		wantErr:      `invalid value for double type: "1.79e+309"`,
-	}, {
-		desc:         "infinites",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sFloat": "Infinity", "sDouble": "-Infinity"}`,
-		wantMessage: &pb3.Scalars{
-			SFloat:  float32(math.Inf(+1)),
-			SDouble: math.Inf(-1),
-		},
-	}, {
-		desc:         "float string with leading space",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sFloat": " 1.234"}`,
-		wantErr:      `invalid value for float type: " 1.234"`,
-	}, {
-		desc:         "double string with trailing space",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sDouble": "5.678 "}`,
-		wantErr:      `invalid value for double type: "5.678 "`,
-	}, {
-		desc:         "not float",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sFloat": true}`,
-		wantErr:      `invalid value for float type: true`,
-	}, {
-		desc:         "not double",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sDouble": "not a number"}`,
-		wantErr:      `invalid value for double type: "not a number"`,
-	}, {
-		desc:         "integers",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sInt32": 1234,
-  "sInt64": -1234,
-  "sUint32": 1e2,
-  "sUint64": 100E-2,
-  "sSint32": 1.0,
-  "sSint64": -1.0,
-  "sFixed32": 1.234e+5,
-  "sFixed64": 1200E-2,
-  "sSfixed32": -1.234e05,
-  "sSfixed64": -1200e-02
-}`,
-		wantMessage: &pb3.Scalars{
-			SInt32:    1234,
-			SInt64:    -1234,
-			SUint32:   100,
-			SUint64:   1,
-			SSint32:   1,
-			SSint64:   -1,
-			SFixed32:  123400,
-			SFixed64:  12,
-			SSfixed32: -123400,
-			SSfixed64: -12,
-		},
-	}, {
-		desc:         "integers in string",
-		inputMessage: &pb3.Scalars{},
-		inputText: `{
-  "sInt32": "1234",
-  "sInt64": "-1234",
-  "sUint32": "1e2",
-  "sUint64": "100E-2",
-  "sSint32": "1.0",
-  "sSint64": "-1.0",
-  "sFixed32": "1.234e+5",
-  "sFixed64": "1200E-2",
-  "sSfixed32": "-1.234e05",
-  "sSfixed64": "-1200e-02"
-}`,
-		wantMessage: &pb3.Scalars{
-			SInt32:    1234,
-			SInt64:    -1234,
-			SUint32:   100,
-			SUint64:   1,
-			SSint32:   1,
-			SSint64:   -1,
-			SFixed32:  123400,
-			SFixed64:  12,
-			SSfixed32: -123400,
-			SSfixed64: -12,
-		},
-	}, {
-		desc:         "integers in escaped string",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sInt32": "\u0031\u0032"}`,
-		wantMessage: &pb3.Scalars{
-			SInt32: 12,
-		},
-	}, {
-		desc:         "integer string with leading space",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sInt32": " 1234"}`,
-		wantErr:      `invalid value for int32 type: " 1234"`,
-	}, {
-		desc:         "integer string with trailing space",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sUint32": "1e2 "}`,
-		wantErr:      `invalid value for uint32 type: "1e2 "`,
-	}, {
-		desc:         "number is not an integer",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sInt32": 1.001}`,
-		wantErr:      `invalid value for int32 type: 1.001`,
-	}, {
-		desc:         "32-bit int exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sInt32": 2e10}`,
-		wantErr:      `invalid value for int32 type: 2e10`,
-	}, {
-		desc:         "64-bit int exceeds limit",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sSfixed64": -9e19}`,
-		wantErr:      `invalid value for sfixed64 type: -9e19`,
-	}, {
-		desc:         "not integer",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sInt32": "not a number"}`,
-		wantErr:      `invalid value for int32 type: "not a number"`,
-	}, {
-		desc:         "not unsigned integer",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sUint32": "not a number"}`,
-		wantErr:      `invalid value for uint32 type: "not a number"`,
-	}, {
-		desc:         "number is not an unsigned integer",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sUint32": -1}`,
-		wantErr:      `invalid value for uint32 type: -1`,
-	}, {
-		desc:         "string",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `{"optString": "谷歌"}`,
-		wantMessage: &pb2.Scalars{
-			OptString: proto.String("谷歌"),
-		},
-	}, {
-		desc:         "string with invalid UTF-8",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "{\"sString\": \"\xff\"}",
-		wantErr:      `(line 1:13): invalid UTF-8 in string`,
-	}, {
-		desc:         "not string",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `{"optString": 42}`,
-		wantErr:      `invalid value for string type: 42`,
-	}, {
-		desc:         "bytes",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sBytes": "aGVsbG8gd29ybGQ"}`,
-		wantMessage: &pb3.Scalars{
-			SBytes: []byte("hello world"),
-		},
-	}, {
-		desc:         "bytes padded",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sBytes": "aGVsbG8gd29ybGQ="}`,
-		wantMessage: &pb3.Scalars{
-			SBytes: []byte("hello world"),
-		},
-	}, {
-		desc:         "not bytes",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `{"sBytes": true}`,
-		wantErr:      `invalid value for bytes type: true`,
-	}, {
-		desc:         "proto2 enum",
-		inputMessage: &pb2.Enums{},
-		inputText: `{
-  "optEnum": "ONE",
-  "optNestedEnum": "UNO"
-}`,
-		wantMessage: &pb2.Enums{
-			OptEnum:       pb2.Enum_ONE.Enum(),
-			OptNestedEnum: pb2.Enums_UNO.Enum(),
-		},
-	}, {
-		desc:         "proto3 enum",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": "ONE",
-  "sNestedEnum": "DIEZ"
-}`,
-		wantMessage: &pb3.Enums{
-			SEnum:       pb3.Enum_ONE,
-			SNestedEnum: pb3.Enums_DIEZ,
-		},
-	}, {
-		desc:         "enum numeric value",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": 2,
-  "sNestedEnum": 2
-}`,
-		wantMessage: &pb3.Enums{
-			SEnum:       pb3.Enum_TWO,
-			SNestedEnum: pb3.Enums_DOS,
-		},
-	}, {
-		desc:         "enum unnamed numeric value",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": 101,
-  "sNestedEnum": -101
-}`,
-		wantMessage: &pb3.Enums{
-			SEnum:       101,
-			SNestedEnum: -101,
-		},
-	}, {
-		desc:         "enum set to number string",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": "1"
-}`,
-		wantErr: `invalid value for enum type: "1"`,
-	}, {
-		desc:         "enum set to invalid named",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": "UNNAMED"
-}`,
-		wantErr: `invalid value for enum type: "UNNAMED"`,
-	}, {
-		desc:         "enum set to not enum",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": true
-}`,
-		wantErr: `invalid value for enum type: true`,
-	}, {
-		desc:         "enum set to JSON null",
-		inputMessage: &pb3.Enums{},
-		inputText: `{
-  "sEnum": null
-}`,
-		wantMessage: &pb3.Enums{},
-	}, {
-		desc:         "proto name",
-		inputMessage: &pb3.JSONNames{},
-		inputText: `{
-  "s_string": "proto name used"
-}`,
-		wantMessage: &pb3.JSONNames{
-			SString: "proto name used",
-		},
-	}, {
-		desc:         "proto group name",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-		"OptGroup": {"optString": "hello"},
-		"RptGroup": [{"rptString": ["goodbye"]}]
-	}`,
-		wantMessage: &pb2.Nests{
-			Optgroup: &pb2.Nests_OptGroup{OptString: proto.String("hello")},
-			Rptgroup: []*pb2.Nests_RptGroup{{RptString: []string{"goodbye"}}},
-		},
-	}, {
-		desc:         "json_name",
-		inputMessage: &pb3.JSONNames{},
-		inputText: `{
-  "foo_bar": "json_name used"
-}`,
-		wantMessage: &pb3.JSONNames{
-			SString: "json_name used",
-		},
-	}, {
-		desc:         "camelCase name",
-		inputMessage: &pb3.JSONNames{},
-		inputText: `{
-  "sString": "camelcase used"
-}`,
-		wantErr: `unknown field "sString"`,
-	}, {
-		desc:         "proto name and json_name",
-		inputMessage: &pb3.JSONNames{},
-		inputText: `{
-  "foo_bar": "json_name used",
-  "s_string": "proto name used"
-}`,
-		wantErr: `(line 3:3): duplicate field "s_string"`,
-	}, {
-		desc:         "duplicate field names",
-		inputMessage: &pb3.JSONNames{},
-		inputText: `{
-  "foo_bar": "one",
-  "foo_bar": "two",
-}`,
-		wantErr: `(line 3:3): duplicate field "foo_bar"`,
-	}, {
-		desc:         "null message",
-		inputMessage: &pb2.Nests{},
-		inputText:    "null",
-		wantErr:      `unexpected token null`,
-	}, {
-		desc:         "proto2 nested message not set",
-		inputMessage: &pb2.Nests{},
-		inputText:    "{}",
-		wantMessage:  &pb2.Nests{},
-	}, {
-		desc:         "proto2 nested message set to null",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "optNested": null,
-  "optgroup": null
-}`,
-		wantMessage: &pb2.Nests{},
-	}, {
-		desc:         "proto2 nested message set to empty",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "optNested": {},
-  "optgroup": {}
-}`,
-		wantMessage: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-	}, {
-		desc:         "proto2 nested messages",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "optNested": {
-    "optString": "nested message",
-    "optNested": {
-      "optString": "another nested message"
-    }
-  }
-}`,
-		wantMessage: &pb2.Nests{
-			OptNested: &pb2.Nested{
-				OptString: proto.String("nested message"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested message"),
-				},
-			},
-		},
-	}, {
-		desc:         "proto2 groups",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "optgroup": {
-    "optString": "inside a group",
-    "optNested": {
-      "optString": "nested message inside a group"
-    },
-    "optnestedgroup": {
-      "optFixed32": 47
-    }
-  }
-}`,
-		wantMessage: &pb2.Nests{
-			Optgroup: &pb2.Nests_OptGroup{
-				OptString: proto.String("inside a group"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("nested message inside a group"),
-				},
-				Optnestedgroup: &pb2.Nests_OptGroup_OptNestedGroup{
-					OptFixed32: proto.Uint32(47),
-				},
-			},
-		},
-	}, {
-		desc:         "proto3 nested message not set",
-		inputMessage: &pb3.Nests{},
-		inputText:    "{}",
-		wantMessage:  &pb3.Nests{},
-	}, {
-		desc:         "proto3 nested message set to null",
-		inputMessage: &pb3.Nests{},
-		inputText:    `{"sNested": null}`,
-		wantMessage:  &pb3.Nests{},
-	}, {
-		desc:         "proto3 nested message set to empty",
-		inputMessage: &pb3.Nests{},
-		inputText:    `{"sNested": {}}`,
-		wantMessage: &pb3.Nests{
-			SNested: &pb3.Nested{},
-		},
-	}, {
-		desc:         "proto3 nested message",
-		inputMessage: &pb3.Nests{},
-		inputText: `{
-  "sNested": {
-    "sString": "nested message",
-    "sNested": {
-      "sString": "another nested message"
-    }
-  }
-}`,
-		wantMessage: &pb3.Nests{
-			SNested: &pb3.Nested{
-				SString: "nested message",
-				SNested: &pb3.Nested{
-					SString: "another nested message",
-				},
-			},
-		},
-	}, {
-		desc:         "message set to non-message",
-		inputMessage: &pb3.Nests{},
-		inputText:    `"not valid"`,
-		wantErr:      `unexpected token "not valid"`,
-	}, {
-		desc:         "nested message set to non-message",
-		inputMessage: &pb3.Nests{},
-		inputText:    `{"sNested": true}`,
-		wantErr:      `(line 1:13): unexpected token true`,
-	}, {
-		desc:         "oneof not set",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    "{}",
-		wantMessage:  &pb3.Oneofs{},
-	}, {
-		desc:         "oneof set to empty string",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    `{"oneofString": ""}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{},
-		},
-	}, {
-		desc:         "oneof set to string",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    `{"oneofString": "hello"}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{
-				OneofString: "hello",
-			},
-		},
-	}, {
-		desc:         "oneof set to enum",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    `{"oneofEnum": "ZERO"}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofEnum{
-				OneofEnum: pb3.Enum_ZERO,
-			},
-		},
-	}, {
-		desc:         "oneof set to empty message",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    `{"oneofNested": {}}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{},
-			},
-		},
-	}, {
-		desc:         "oneof set to message",
-		inputMessage: &pb3.Oneofs{},
-		inputText: `{
-  "oneofNested": {
-    "sString": "nested message"
-  }
-}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{
-					SString: "nested message",
-				},
-			},
-		},
-	}, {
-		desc:         "oneof set to more than one field",
-		inputMessage: &pb3.Oneofs{},
-		inputText: `{
-  "oneofEnum": "ZERO",
-  "oneofString": "hello"
-}`,
-		wantErr: `(line 3:3): error parsing "oneofString", oneof pb3.Oneofs.union is already set`,
-	}, {
-		desc:         "oneof set to null and value",
-		inputMessage: &pb3.Oneofs{},
-		inputText: `{
-  "oneofEnum": "ZERO",
-  "oneofString": null
-}`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofEnum{
-				OneofEnum: pb3.Enum_ZERO,
-			},
-		},
-	}, {
-		desc:         "repeated null fields",
-		inputMessage: &pb2.Repeats{},
-		inputText: `{
-  "rptString": null,
-  "rptInt32" : null,
-  "rptFloat" : null,
-  "rptBytes" : null
-}`,
-		wantMessage: &pb2.Repeats{},
-	}, {
-		desc:         "repeated scalars",
-		inputMessage: &pb2.Repeats{},
-		inputText: `{
-  "rptString": ["hello", "world"],
-  "rptInt32" : [-1, 0, 1],
-  "rptBool"  : [false, true]
-}`,
-		wantMessage: &pb2.Repeats{
-			RptString: []string{"hello", "world"},
-			RptInt32:  []int32{-1, 0, 1},
-			RptBool:   []bool{false, true},
-		},
-	}, {
-		desc:         "repeated enums",
-		inputMessage: &pb2.Enums{},
-		inputText: `{
-  "rptEnum"      : ["TEN", 1, 42],
-  "rptNestedEnum": ["DOS", 2, -47]
-}`,
-		wantMessage: &pb2.Enums{
-			RptEnum:       []pb2.Enum{pb2.Enum_TEN, pb2.Enum_ONE, 42},
-			RptNestedEnum: []pb2.Enums_NestedEnum{pb2.Enums_DOS, pb2.Enums_DOS, -47},
-		},
-	}, {
-		desc:         "repeated messages",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "rptNested": [
-    {
-      "optString": "repeat nested one"
-    },
-    {
-      "optString": "repeat nested two",
-      "optNested": {
-        "optString": "inside repeat nested two"
-      }
-    },
-    {}
-  ]
-}`,
-		wantMessage: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{
-					OptString: proto.String("repeat nested one"),
-				},
-				{
-					OptString: proto.String("repeat nested two"),
-					OptNested: &pb2.Nested{
-						OptString: proto.String("inside repeat nested two"),
-					},
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "repeated groups",
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "rptgroup": [
-    {
-      "rptString": ["hello", "world"]
-    },
-    {}
-  ]
-}
-`,
-		wantMessage: &pb2.Nests{
-			Rptgroup: []*pb2.Nests_RptGroup{
-				{
-					RptString: []string{"hello", "world"},
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "repeated string contains invalid UTF8",
-		inputMessage: &pb2.Repeats{},
-		inputText:    `{"rptString": ["` + "abc\xff" + `"]}`,
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "repeated messages contain invalid UTF8",
-		inputMessage: &pb2.Nests{},
-		inputText:    `{"rptNested": [{"optString": "` + "abc\xff" + `"}]}`,
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "repeated scalars contain invalid type",
-		inputMessage: &pb2.Repeats{},
-		inputText:    `{"rptString": ["hello", null, "world"]}`,
-		wantErr:      `invalid value for string type: null`,
-	}, {
-		desc:         "repeated messages contain invalid type",
-		inputMessage: &pb2.Nests{},
-		inputText:    `{"rptNested": [{}, null]}`,
-		wantErr:      `unexpected token null`,
-	}, {
-		desc:         "map fields 1",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "-101": "-101",
-	"0"   : "zero",
-	"255" : "0xff"
-  },
-  "boolToUint32": {
-    "false": 101,
-	"true" : "42"
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				-101: "-101",
-				0xff: "0xff",
-				0:    "zero",
-			},
-			BoolToUint32: map[bool]uint32{
-				true:  42,
-				false: 101,
-			},
-		},
-	}, {
-		desc:         "map fields 2",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "uint64ToEnum": {
-    "1" : "ONE",
-	"2" : 2,
-	"10": 101
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				1:  pb3.Enum_ONE,
-				2:  pb3.Enum_TWO,
-				10: 101,
-			},
-		},
-	}, {
-		desc:         "map fields 3",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "nested_one": {
-	  "sString": "nested in a map"
-    },
-    "nested_two": {}
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested_one": {
-					SString: "nested in a map",
-				},
-				"nested_two": {},
-			},
-		},
-	}, {
-		desc:         "map fields 4",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToOneofs": {
-    "nested": {
-	  "oneofNested": {
-	    "sString": "nested oneof in map field value"
-      }
-	},
-	"string": {
-      "oneofString": "hello"
-    }
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			StrToOneofs: map[string]*pb3.Oneofs{
-				"string": {
-					Union: &pb3.Oneofs_OneofString{
-						OneofString: "hello",
-					},
-				},
-				"nested": {
-					Union: &pb3.Oneofs_OneofNested{
-						OneofNested: &pb3.Nested{
-							SString: "nested oneof in map field value",
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:         "map contains duplicate keys",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "0": "cero",
-    "0": "zero"
-  }
-}
-`,
-		wantErr: `(line 4:5): duplicate map key "0"`,
-	}, {
-		desc:         "map key empty string",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "": {}
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"": {},
-			},
-		},
-	}, {
-		desc:         "map contains invalid key 1",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "invalid": "cero"
-  }
-}`,
-		wantErr: `invalid value for int32 key: "invalid"`,
-	}, {
-		desc:         "map contains invalid key 2",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "1.02": "float"
-  }
-}`,
-		wantErr: `invalid value for int32 key: "1.02"`,
-	}, {
-		desc:         "map contains invalid key 3",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "2147483648": "exceeds 32-bit integer max limit"
-  }
-}`,
-		wantErr: `invalid value for int32 key: "2147483648"`,
-	}, {
-		desc:         "map contains invalid key 4",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "uint64ToEnum": {
-    "-1": 0
-  }
-}`,
-		wantErr: `invalid value for uint64 key: "-1"`,
-	}, {
-		desc:         "map contains invalid value",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "101": true
-}`,
-		wantErr: `invalid value for string type: true`,
-	}, {
-		desc:         "map contains null for scalar value",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "int32ToStr": {
-    "101": null
-}`,
-		wantErr: `invalid value for string type: null`,
-	}, {
-		desc:         "map contains null for message value",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "hello": null
-  }
-}`,
-		wantErr: `unexpected token null`,
-	}, {
-		desc:         "map contains contains message value with invalid UTF8",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "hello": {
-      "sString": "` + "abc\xff" + `"
-	}
-  }
-}`,
-		wantErr: `invalid UTF-8`,
-	}, {
-		desc:         "map key contains invalid UTF8",
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "` + "abc\xff" + `": {}
-  }
-}`,
-		wantErr: `invalid UTF-8`,
-	}, {
-		desc:         "required fields not set",
-		inputMessage: &pb2.Requireds{},
-		inputText:    `{}`,
-		wantErr:      errors.RequiredNotSet("pb2.Requireds.req_bool").Error(),
-	}, {
-		desc:         "required field set",
-		inputMessage: &pb2.PartialRequired{},
-		inputText: `{
-  "reqString": "this is required"
-}`,
-		wantMessage: &pb2.PartialRequired{
-			ReqString: proto.String("this is required"),
-		},
-	}, {
-		desc:         "required fields partially set",
-		inputMessage: &pb2.Requireds{},
-		inputText: `{
-  "reqBool": false,
-  "reqSfixed64": 42,
-  "reqString": "hello",
-  "reqEnum": "ONE"
-}`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(42),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		wantErr: errors.RequiredNotSet("pb2.Requireds.req_double").Error(),
-	}, {
-		desc:         "required fields partially set with AllowPartial",
-		umo:          protojson.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.Requireds{},
-		inputText: `{
-  "reqBool": false,
-  "reqSfixed64": 42,
-  "reqString": "hello",
-  "reqEnum": "ONE"
-}`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(42),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-	}, {
-		desc:         "required fields all set",
-		inputMessage: &pb2.Requireds{},
-		inputText: `{
-  "reqBool": false,
-  "reqSfixed64": 42,
-  "reqDouble": 1.23,
-  "reqString": "hello",
-  "reqEnum": "ONE",
-  "reqNested": {}
-}`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(42),
-			ReqDouble:   proto.Float64(1.23),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-			ReqNested:   &pb2.Nested{},
-		},
-	}, {
-		desc:         "indirect required field",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "optNested": {}
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		wantErr: errors.RequiredNotSet("pb2.NestedWithRequired.req_string").Error(),
-	}, {
-		desc:         "indirect required field with AllowPartial",
-		umo:          protojson.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "optNested": {}
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-	}, {
-		desc:         "indirect required field in repeated",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "rptNested": [
-    {"reqString": "one"},
-    {}
-  ]
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				{
-					ReqString: proto.String("one"),
-				},
-				{},
-			},
-		},
-		wantErr: errors.RequiredNotSet("pb2.NestedWithRequired.req_string").Error(),
-	}, {
-		desc:         "indirect required field in repeated with AllowPartial",
-		umo:          protojson.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "rptNested": [
-    {"reqString": "one"},
-    {}
-  ]
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				{
-					ReqString: proto.String("one"),
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "indirect required field in map",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "strToNested": {
-    "missing": {},
-	"contains": {
-      "reqString": "here"
-    }
-  }
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"missing": &pb2.NestedWithRequired{},
-				"contains": &pb2.NestedWithRequired{
-					ReqString: proto.String("here"),
-				},
-			},
-		},
-		wantErr: errors.RequiredNotSet("pb2.NestedWithRequired.req_string").Error(),
-	}, {
-		desc:         "indirect required field in map with AllowPartial",
-		umo:          protojson.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "strToNested": {
-    "missing": {},
-	"contains": {
-      "reqString": "here"
-    }
-  }
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"missing": &pb2.NestedWithRequired{},
-				"contains": &pb2.NestedWithRequired{
-					ReqString: proto.String("here"),
-				},
-			},
-		},
-	}, {
-		desc:         "indirect required field in oneof",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "oneofNested": {}
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		wantErr: errors.RequiredNotSet("pb2.NestedWithRequired.req_string").Error(),
-	}, {
-		desc:         "indirect required field in oneof with AllowPartial",
-		umo:          protojson.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `{
-  "oneofNested": {}
-}`,
-		wantMessage: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-	}, {
-		desc:         "extensions of non-repeated fields",
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "optString": "non-extension field",
-  "optBool": true,
-  "optInt32": 42,
-  "[pb2.opt_ext_bool]": true,
-  "[pb2.opt_ext_nested]": {
-    "optString": "nested in an extension",
-    "optNested": {
-      "optString": "another nested in an extension"
-    }
-  },
-  "[pb2.opt_ext_string]": "extension field",
-  "[pb2.opt_ext_enum]": "TEN"
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extensions of repeated fields",
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "[pb2.rpt_ext_enum]": ["TEN", 101, "ONE"],
-  "[pb2.rpt_ext_fixed32]": [42, 47],
-  "[pb2.rpt_ext_nested]": [
-    {"optString": "one"},
-	{"optString": "two"},
-	{"optString": "three"}
-  ]
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_RptExtFixed32, []uint32{42, 47})
-			proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extensions of non-repeated fields in another message",
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "[pb2.ExtensionsContainer.opt_ext_bool]": true,
-  "[pb2.ExtensionsContainer.opt_ext_enum]": "TEN",
-  "[pb2.ExtensionsContainer.opt_ext_nested]": {
-    "optString": "nested in an extension",
-    "optNested": {
-      "optString": "another nested in an extension"
-    }
-  },
-  "[pb2.ExtensionsContainer.opt_ext_string]": "extension field"
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extensions of repeated fields in another message",
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "optString": "non-extension field",
-  "optBool": true,
-  "optInt32": 42,
-  "[pb2.ExtensionsContainer.rpt_ext_nested]": [
-    {"optString": "one"},
-    {"optString": "two"},
-    {"optString": "three"}
-  ],
-  "[pb2.ExtensionsContainer.rpt_ext_enum]": ["TEN", 101, "ONE"],
-  "[pb2.ExtensionsContainer.rpt_ext_string]": ["hello", "world"]
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtString, []string{"hello", "world"})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "invalid extension field name",
-		inputMessage: &pb2.Extensions{},
-		inputText:    `{ "[pb2.invalid_message_field]": true }`,
-		wantErr:      `(line 1:3): unknown field "[pb2.invalid_message_field]"`,
-	}, {
-		desc:         "extensions of repeated field contains null",
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "[pb2.ExtensionsContainer.rpt_ext_nested]": [
-    {"optString": "one"},
-    null,
-    {"optString": "three"}
-  ],
-}`,
-		wantErr: `(line 4:5): unexpected token null`,
-	}, {
-		desc:         "MessageSet",
-		inputMessage: &pb2.MessageSet{},
-		inputText: `{
-  "[pb2.MessageSetExtension]": {
-    "optString": "a messageset extension"
-  },
-  "[pb2.MessageSetExtension.ext_nested]": {
-    "optString": "just a regular extension"
-  },
-  "[pb2.MessageSetExtension.not_message_set_extension]": {
-    "optString": "not a messageset extension"
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
-				OptString: proto.String("just a regular extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 1",
-		inputMessage: &pb2.FakeMessageSet{},
-		inputText: `{
-  "[pb2.FakeMessageSetExtension.message_set_extension]": {
-    "optString": "not a messageset extension"
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.FakeMessageSet{}
-			proto.SetExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 2",
-		inputMessage: &pb2.FakeMessageSet{},
-		inputText: `{
-  "[pb2.FakeMessageSetExtension]": {
-    "optString": "not a messageset extension"
-  }
-}`,
-		wantErr: `unable to resolve "[pb2.FakeMessageSetExtension]": found wrong type`,
-		skip:    !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 3",
-		inputMessage: &pb2.MessageSet{},
-		inputText: `{
-  "[pb2.message_set_extension]": {
-    "optString": "another not a messageset extension"
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("another not a messageset extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "Empty",
-		inputMessage: &emptypb.Empty{},
-		inputText:    `{}`,
-		wantMessage:  &emptypb.Empty{},
-	}, {
-		desc:         "Empty contains unknown",
-		inputMessage: &emptypb.Empty{},
-		inputText:    `{"unknown": null}`,
-		wantErr:      `unknown field "unknown"`,
-	}, {
-		desc:         "BoolValue false",
-		inputMessage: &wrapperspb.BoolValue{},
-		inputText:    `false`,
-		wantMessage:  &wrapperspb.BoolValue{},
-	}, {
-		desc:         "BoolValue true",
-		inputMessage: &wrapperspb.BoolValue{},
-		inputText:    `true`,
-		wantMessage:  &wrapperspb.BoolValue{Value: true},
-	}, {
-		desc:         "BoolValue invalid value",
-		inputMessage: &wrapperspb.BoolValue{},
-		inputText:    `{}`,
-		wantErr:      `invalid value for bool type: {`,
-	}, {
-		desc:         "Int32Value",
-		inputMessage: &wrapperspb.Int32Value{},
-		inputText:    `42`,
-		wantMessage:  &wrapperspb.Int32Value{Value: 42},
-	}, {
-		desc:         "Int32Value in JSON string",
-		inputMessage: &wrapperspb.Int32Value{},
-		inputText:    `"1.23e3"`,
-		wantMessage:  &wrapperspb.Int32Value{Value: 1230},
-	}, {
-		desc:         "Int64Value",
-		inputMessage: &wrapperspb.Int64Value{},
-		inputText:    `"42"`,
-		wantMessage:  &wrapperspb.Int64Value{Value: 42},
-	}, {
-		desc:         "UInt32Value",
-		inputMessage: &wrapperspb.UInt32Value{},
-		inputText:    `42`,
-		wantMessage:  &wrapperspb.UInt32Value{Value: 42},
-	}, {
-		desc:         "UInt64Value",
-		inputMessage: &wrapperspb.UInt64Value{},
-		inputText:    `"42"`,
-		wantMessage:  &wrapperspb.UInt64Value{Value: 42},
-	}, {
-		desc:         "FloatValue",
-		inputMessage: &wrapperspb.FloatValue{},
-		inputText:    `1.02`,
-		wantMessage:  &wrapperspb.FloatValue{Value: 1.02},
-	}, {
-		desc:         "FloatValue exceeds max limit",
-		inputMessage: &wrapperspb.FloatValue{},
-		inputText:    `1.23e+40`,
-		wantErr:      `invalid value for float type: 1.23e+40`,
-	}, {
-		desc:         "FloatValue Infinity",
-		inputMessage: &wrapperspb.FloatValue{},
-		inputText:    `"-Infinity"`,
-		wantMessage:  &wrapperspb.FloatValue{Value: float32(math.Inf(-1))},
-	}, {
-		desc:         "DoubleValue",
-		inputMessage: &wrapperspb.DoubleValue{},
-		inputText:    `1.02`,
-		wantMessage:  &wrapperspb.DoubleValue{Value: 1.02},
-	}, {
-		desc:         "DoubleValue Infinity",
-		inputMessage: &wrapperspb.DoubleValue{},
-		inputText:    `"Infinity"`,
-		wantMessage:  &wrapperspb.DoubleValue{Value: math.Inf(+1)},
-	}, {
-		desc:         "StringValue empty",
-		inputMessage: &wrapperspb.StringValue{},
-		inputText:    `""`,
-		wantMessage:  &wrapperspb.StringValue{},
-	}, {
-		desc:         "StringValue",
-		inputMessage: &wrapperspb.StringValue{},
-		inputText:    `"谷歌"`,
-		wantMessage:  &wrapperspb.StringValue{Value: "谷歌"},
-	}, {
-		desc:         "StringValue with invalid UTF8 error",
-		inputMessage: &wrapperspb.StringValue{},
-		inputText:    "\"abc\xff\"",
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "StringValue field with invalid UTF8 error",
-		inputMessage: &pb2.KnownTypes{},
-		inputText:    "{\n  \"optString\": \"abc\xff\"\n}",
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "NullValue field with JSON null",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optNull": null
-}`,
-		wantMessage: &pb2.KnownTypes{OptNull: new(structpb.NullValue)},
-	}, {
-		desc:         "NullValue field with string",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optNull": "NULL_VALUE"
-}`,
-		wantMessage: &pb2.KnownTypes{OptNull: new(structpb.NullValue)},
-	}, {
-		desc:         "BytesValue",
-		inputMessage: &wrapperspb.BytesValue{},
-		inputText:    `"aGVsbG8="`,
-		wantMessage:  &wrapperspb.BytesValue{Value: []byte("hello")},
-	}, {
-		desc:         "Value null",
-		inputMessage: &structpb.Value{},
-		inputText:    `null`,
-		wantMessage:  &structpb.Value{Kind: &structpb.Value_NullValue{}},
-	}, {
-		desc:         "Value field null",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": null
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptValue: &structpb.Value{Kind: &structpb.Value_NullValue{}},
-		},
-	}, {
-		desc:         "Value bool",
-		inputMessage: &structpb.Value{},
-		inputText:    `false`,
-		wantMessage:  &structpb.Value{Kind: &structpb.Value_BoolValue{}},
-	}, {
-		desc:         "Value field bool",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": true
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptValue: &structpb.Value{Kind: &structpb.Value_BoolValue{true}},
-		},
-	}, {
-		desc:         "Value number",
-		inputMessage: &structpb.Value{},
-		inputText:    `1.02`,
-		wantMessage:  &structpb.Value{Kind: &structpb.Value_NumberValue{1.02}},
-	}, {
-		desc:         "Value field number",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": 1.02
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptValue: &structpb.Value{Kind: &structpb.Value_NumberValue{1.02}},
-		},
-	}, {
-		desc:         "Value string",
-		inputMessage: &structpb.Value{},
-		inputText:    `"hello"`,
-		wantMessage:  &structpb.Value{Kind: &structpb.Value_StringValue{"hello"}},
-	}, {
-		desc:         "Value string with invalid UTF8",
-		inputMessage: &structpb.Value{},
-		inputText:    "\"\xff\"",
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "Value field string",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": "NaN"
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptValue: &structpb.Value{Kind: &structpb.Value_StringValue{"NaN"}},
-		},
-	}, {
-		desc:         "Value field string with invalid UTF8",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": "` + "\xff" + `"
-}`,
-		wantErr: `invalid UTF-8`,
-	}, {
-		desc:         "Value empty struct",
-		inputMessage: &structpb.Value{},
-		inputText:    `{}`,
-		wantMessage: &structpb.Value{
-			Kind: &structpb.Value_StructValue{
-				&structpb.Struct{Fields: map[string]*structpb.Value{}},
-			},
-		},
-	}, {
-		desc:         "Value struct",
-		inputMessage: &structpb.Value{},
-		inputText: `{
-  "string": "hello",
-  "number": 123,
-  "null": null,
-  "bool": false,
-  "struct": {
-    "string": "world"
-  },
-  "list": []
-}`,
-		wantMessage: &structpb.Value{
-			Kind: &structpb.Value_StructValue{
-				&structpb.Struct{
-					Fields: map[string]*structpb.Value{
-						"string": {Kind: &structpb.Value_StringValue{"hello"}},
-						"number": {Kind: &structpb.Value_NumberValue{123}},
-						"null":   {Kind: &structpb.Value_NullValue{}},
-						"bool":   {Kind: &structpb.Value_BoolValue{false}},
-						"struct": {
-							Kind: &structpb.Value_StructValue{
-								&structpb.Struct{
-									Fields: map[string]*structpb.Value{
-										"string": {Kind: &structpb.Value_StringValue{"world"}},
-									},
-								},
-							},
-						},
-						"list": {
-							Kind: &structpb.Value_ListValue{&structpb.ListValue{}},
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:         "Value struct with invalid UTF8 string",
-		inputMessage: &structpb.Value{},
-		inputText:    "{\"string\": \"abc\xff\"}",
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "Value field struct",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": {
-    "string": "hello"
-  }
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptValue: &structpb.Value{
-				Kind: &structpb.Value_StructValue{
-					&structpb.Struct{
-						Fields: map[string]*structpb.Value{
-							"string": {Kind: &structpb.Value_StringValue{"hello"}},
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:         "Value empty list",
-		inputMessage: &structpb.Value{},
-		inputText:    `[]`,
-		wantMessage: &structpb.Value{
-			Kind: &structpb.Value_ListValue{
-				&structpb.ListValue{Values: []*structpb.Value{}},
-			},
-		},
-	}, {
-		desc:         "Value list",
-		inputMessage: &structpb.Value{},
-		inputText: `[
-  "string",
-  123,
-  null,
-  true,
-  {},
-  [
-    "string",
-	1.23,
-	null,
-	false
-  ]
-]`,
-		wantMessage: &structpb.Value{
-			Kind: &structpb.Value_ListValue{
-				&structpb.ListValue{
-					Values: []*structpb.Value{
-						{Kind: &structpb.Value_StringValue{"string"}},
-						{Kind: &structpb.Value_NumberValue{123}},
-						{Kind: &structpb.Value_NullValue{}},
-						{Kind: &structpb.Value_BoolValue{true}},
-						{Kind: &structpb.Value_StructValue{&structpb.Struct{}}},
-						{
-							Kind: &structpb.Value_ListValue{
-								&structpb.ListValue{
-									Values: []*structpb.Value{
-										{Kind: &structpb.Value_StringValue{"string"}},
-										{Kind: &structpb.Value_NumberValue{1.23}},
-										{Kind: &structpb.Value_NullValue{}},
-										{Kind: &structpb.Value_BoolValue{false}},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:         "Value list with invalid UTF8 string",
-		inputMessage: &structpb.Value{},
-		inputText:    "[\"abc\xff\"]",
-		wantErr:      `invalid UTF-8`,
-	}, {
-		desc:         "Value field list with invalid UTF8 string",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optValue": [ "` + "abc\xff" + `"]
-}`,
-		wantErr: `(line 2:17): invalid UTF-8`,
-	}, {
-		desc:         "Duration empty string",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `""`,
-		wantErr:      `invalid google.protobuf.Duration value ""`,
-	}, {
-		desc:         "Duration with secs",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"3s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 3},
-	}, {
-		desc:         "Duration with escaped unicode",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"\u0033s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 3},
-	}, {
-		desc:         "Duration with -secs",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-3s"`,
-		wantMessage:  &durationpb.Duration{Seconds: -3},
-	}, {
-		desc:         "Duration with plus sign",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"+3s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 3},
-	}, {
-		desc:         "Duration with nanos",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"0.001s"`,
-		wantMessage:  &durationpb.Duration{Nanos: 1e6},
-	}, {
-		desc:         "Duration with -nanos",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-0.001s"`,
-		wantMessage:  &durationpb.Duration{Nanos: -1e6},
-	}, {
-		desc:         "Duration with -nanos",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-.001s"`,
-		wantMessage:  &durationpb.Duration{Nanos: -1e6},
-	}, {
-		desc:         "Duration with +nanos",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"+.001s"`,
-		wantMessage:  &durationpb.Duration{Nanos: 1e6},
-	}, {
-		desc:         "Duration with -secs -nanos",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-123.000000450s"`,
-		wantMessage:  &durationpb.Duration{Seconds: -123, Nanos: -450},
-	}, {
-		desc:         "Duration with large secs",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"10000000000.000000001s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 1e10, Nanos: 1},
-	}, {
-		desc:         "Duration with decimal without fractional",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"3.s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 3},
-	}, {
-		desc:         "Duration with decimal without integer",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"0.5s"`,
-		wantMessage:  &durationpb.Duration{Nanos: 5e8},
-	}, {
-		desc:         "Duration max value",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"315576000000.999999999s"`,
-		wantMessage:  &durationpb.Duration{Seconds: 315576000000, Nanos: 999999999},
-	}, {
-		desc:         "Duration min value",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-315576000000.999999999s"`,
-		wantMessage:  &durationpb.Duration{Seconds: -315576000000, Nanos: -999999999},
-	}, {
-		desc:         "Duration with +secs out of range",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"315576000001s"`,
-		wantErr:      `google.protobuf.Duration value out of range: "315576000001s"`,
-	}, {
-		desc:         "Duration with -secs out of range",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"-315576000001s"`,
-		wantErr:      `google.protobuf.Duration value out of range: "-315576000001s"`,
-	}, {
-		desc:         "Duration with nanos beyond 9 digits",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"0.1000000000s"`,
-		wantErr:      `invalid google.protobuf.Duration value "0.1000000000s"`,
-	}, {
-		desc:         "Duration without suffix s",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"123"`,
-		wantErr:      `invalid google.protobuf.Duration value "123"`,
-	}, {
-		desc:         "Duration invalid signed fraction",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"123.+123s"`,
-		wantErr:      `invalid google.protobuf.Duration value "123.+123s"`,
-	}, {
-		desc:         "Duration invalid multiple .",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"123.123.s"`,
-		wantErr:      `invalid google.protobuf.Duration value "123.123.s"`,
-	}, {
-		desc:         "Duration invalid integer",
-		inputMessage: &durationpb.Duration{},
-		inputText:    `"01s"`,
-		wantErr:      `invalid google.protobuf.Duration value "01s"`,
-	}, {
-		desc:         "Timestamp zero",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"1970-01-01T00:00:00Z"`,
-		wantMessage:  &timestamppb.Timestamp{},
-	}, {
-		desc:         "Timestamp with tz adjustment",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"1970-01-01T00:00:00+01:00"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: -3600},
-	}, {
-		desc:         "Timestamp UTC",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"2019-03-19T23:03:21Z"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: 1553036601},
-	}, {
-		desc:         "Timestamp with escaped unicode",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"2019-0\u0033-19T23:03:21Z"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: 1553036601},
-	}, {
-		desc:         "Timestamp with nanos",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"2019-03-19T23:03:21.000000001Z"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: 1553036601, Nanos: 1},
-	}, {
-		desc:         "Timestamp max value",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"9999-12-31T23:59:59.999999999Z"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: 253402300799, Nanos: 999999999},
-	}, {
-		desc:         "Timestamp above max value",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"9999-12-31T23:59:59-01:00"`,
-		wantErr:      `google.protobuf.Timestamp value out of range: "9999-12-31T23:59:59-01:00"`,
-	}, {
-		desc:         "Timestamp min value",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"0001-01-01T00:00:00Z"`,
-		wantMessage:  &timestamppb.Timestamp{Seconds: -62135596800},
-	}, {
-		desc:         "Timestamp below min value",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"0001-01-01T00:00:00+01:00"`,
-		wantErr:      `google.protobuf.Timestamp value out of range: "0001-01-01T00:00:00+01:00"`,
-	}, {
-		desc:         "Timestamp with nanos beyond 9 digits",
-		inputMessage: &timestamppb.Timestamp{},
-		inputText:    `"1970-01-01T00:00:00.0000000001Z"`,
-		wantErr:      `invalid google.protobuf.Timestamp value`,
-	}, {
-		desc:         "FieldMask empty",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `""`,
-		wantMessage:  &fieldmaskpb.FieldMask{Paths: []string{}},
-	}, {
-		desc:         "FieldMask",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `"foo,fooBar,foo.barQux,Foo"`,
-		wantMessage: &fieldmaskpb.FieldMask{
-			Paths: []string{
-				"foo",
-				"foo_bar",
-				"foo.bar_qux",
-				"_foo",
-			},
-		},
-	}, {
-		desc:         "FieldMask empty path 1",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `"foo,"`,
-		wantErr:      `google.protobuf.FieldMask.paths contains invalid path: ""`,
-	}, {
-		desc:         "FieldMask empty path 2",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `"foo,  ,bar"`,
-		wantErr:      `google.protobuf.FieldMask.paths contains invalid path: "  "`,
-	}, {
-		desc:         "FieldMask invalid char 1",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `"foo_bar"`,
-		wantErr:      `google.protobuf.FieldMask.paths contains invalid path: "foo_bar"`,
-	}, {
-		desc:         "FieldMask invalid char 2",
-		inputMessage: &fieldmaskpb.FieldMask{},
-		inputText:    `"foo@bar"`,
-		wantErr:      `google.protobuf.FieldMask.paths contains invalid path: "foo@bar"`,
-	}, {
-		desc:         "FieldMask field",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optFieldmask": "foo,qux.fooBar"
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptFieldmask: &fieldmaskpb.FieldMask{
-				Paths: []string{
-					"foo",
-					"qux.foo_bar",
-				},
-			},
-		},
-	}, {
-		desc:         "Any empty",
-		inputMessage: &anypb.Any{},
-		inputText:    `{}`,
-		wantMessage:  &anypb.Any{},
-	}, {
-		desc:         "Any with non-custom message",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "foo/pb2.Nested",
-  "optString": "embedded inside Any",
-  "optNested": {
-    "optString": "inception"
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "foo/pb2.Nested",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with empty embedded message",
-		inputMessage: &anypb.Any{},
-		inputText:    `{"@type": "foo/pb2.Nested"}`,
-		wantMessage:  &anypb.Any{TypeUrl: "foo/pb2.Nested"},
-	}, {
-		desc:         "Any without registered type",
-		umo:          protojson.UnmarshalOptions{Resolver: new(protoregistry.Types)},
-		inputMessage: &anypb.Any{},
-		inputText:    `{"@type": "foo/pb2.Nested"}`,
-		wantErr:      `(line 1:11): unable to resolve "foo/pb2.Nested":`,
-	}, {
-		desc:         "Any with missing required",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "pb2.PartialRequired",
-  "optString": "embedded inside Any"
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				Deterministic: true,
-				AllowPartial:  true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc: "Any with partial required and AllowPartial",
-		umo: protojson.UnmarshalOptions{
-			AllowPartial: true,
-		},
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "pb2.PartialRequired",
-  "optString": "embedded inside Any"
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				Deterministic: true,
-				AllowPartial:  true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with invalid UTF8",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "optString": "` + "abc\xff" + `",
-  "@type": "foo/pb2.Nested"
-}`,
-		wantErr: `(line 2:16): invalid UTF-8`,
-	}, {
-		desc:         "Any with BoolValue",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "type.googleapis.com/google.protobuf.BoolValue",
-  "value": true
-}`,
-		wantMessage: func() proto.Message {
-			m := &wrapperspb.BoolValue{Value: true}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.BoolValue",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with Empty",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "value": {},
-  "@type": "type.googleapis.com/google.protobuf.Empty"
-}`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.Empty",
-		},
-	}, {
-		desc:         "Any with missing Empty",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "type.googleapis.com/google.protobuf.Empty"
-}`,
-		wantErr: `(line 3:1): missing "value" field`,
-	}, {
-		desc:         "Any with StringValue containing invalid UTF8",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.StringValue",
-  "value": "` + "abc\xff" + `"
-}`,
-		wantErr: `(line 3:12): invalid UTF-8`,
-	}, {
-		desc:         "Any with Int64Value",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.Int64Value",
-  "value": "42"
-}`,
-		wantMessage: func() proto.Message {
-			m := &wrapperspb.Int64Value{Value: 42}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.Int64Value",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with invalid Int64Value",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.Int64Value",
-  "value": "forty-two"
-}`,
-		wantErr: `(line 3:12): invalid value for int64 type: "forty-two"`,
-	}, {
-		desc:         "Any with invalid UInt64Value",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.UInt64Value",
-  "value": -42
-}`,
-		wantErr: `(line 3:12): invalid value for uint64 type: -42`,
-	}, {
-		desc:         "Any with Duration",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "type.googleapis.com/google.protobuf.Duration",
-  "value": "0s"
-}`,
-		wantMessage: func() proto.Message {
-			m := &durationpb.Duration{}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Duration",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with Value of StringValue",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.Value",
-  "value": "` + "abc\xff" + `"
-}`,
-		wantErr: `(line 3:12): invalid UTF-8`,
-	}, {
-		desc:         "Any with Value of NullValue",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.Value",
-  "value": null
-}`,
-		wantMessage: func() proto.Message {
-			m := &structpb.Value{Kind: &structpb.Value_NullValue{}}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.Value",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with Struct",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.Struct",
-  "value": {
-    "bool": true,
-    "null": null,
-    "string": "hello",
-    "struct": {
-      "string": "world"
-    }
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &structpb.Struct{
-				Fields: map[string]*structpb.Value{
-					"bool":   {Kind: &structpb.Value_BoolValue{true}},
-					"null":   {Kind: &structpb.Value_NullValue{}},
-					"string": {Kind: &structpb.Value_StringValue{"hello"}},
-					"struct": {
-						Kind: &structpb.Value_StructValue{
-							&structpb.Struct{
-								Fields: map[string]*structpb.Value{
-									"string": {Kind: &structpb.Value_StringValue{"world"}},
-								},
-							},
-						},
-					},
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.Struct",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with missing @type",
-		umo:          protojson.UnmarshalOptions{},
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "value": {}
-}`,
-		wantErr: `(line 1:1): missing "@type" field`,
-	}, {
-		desc:         "Any with empty @type",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": ""
-}`,
-		wantErr: `(line 2:12): @type field contains empty value`,
-	}, {
-		desc:         "Any with duplicate @type",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.StringValue",
-  "value": "hello",
-  "@type": "pb2.Nested"
-}`,
-		wantErr: `(line 4:3): duplicate "@type" field`,
-	}, {
-		desc:         "Any with duplicate value",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "google.protobuf.StringValue",
-  "value": "hello",
-  "value": "world"
-}`,
-		wantErr: `(line 4:3): duplicate "value" field`,
-	}, {
-		desc:         "Any with unknown field",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "pb2.Nested",
-  "optString": "hello",
-  "unknown": "world"
-}`,
-		wantErr: `(line 4:3): unknown field "unknown"`,
-	}, {
-		desc:         "Any with embedded type containing Any",
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "pb2.KnownTypes",
-  "optAny": {
-    "@type": "google.protobuf.StringValue",
-    "value": "` + "abc\xff" + `"
-  }
-}`,
-		wantErr: `(line 5:14): invalid UTF-8`,
-	}, {
-		desc:         "well known types as field values",
-		inputMessage: &pb2.KnownTypes{},
-		inputText: `{
-  "optBool": false,
-  "optInt32": 42,
-  "optInt64": "42",
-  "optUint32": 42,
-  "optUint64": "42",
-  "optFloat": 1.23,
-  "optDouble": 3.1415,
-  "optString": "hello",
-  "optBytes": "aGVsbG8=",
-  "optDuration": "123s",
-  "optTimestamp": "2019-03-19T23:03:21Z",
-  "optStruct": {
-    "string": "hello"
-  },
-  "optList": [
-    null,
-    "",
-    {},
-    []
-  ],
-  "optValue": "world",
-  "optEmpty": {},
-  "optAny": {
-    "@type": "google.protobuf.Empty",
-    "value": {}
-  },
-  "optFieldmask": "fooBar,barFoo"
-}`,
-		wantMessage: &pb2.KnownTypes{
-			OptBool:      &wrapperspb.BoolValue{Value: false},
-			OptInt32:     &wrapperspb.Int32Value{Value: 42},
-			OptInt64:     &wrapperspb.Int64Value{Value: 42},
-			OptUint32:    &wrapperspb.UInt32Value{Value: 42},
-			OptUint64:    &wrapperspb.UInt64Value{Value: 42},
-			OptFloat:     &wrapperspb.FloatValue{Value: 1.23},
-			OptDouble:    &wrapperspb.DoubleValue{Value: 3.1415},
-			OptString:    &wrapperspb.StringValue{Value: "hello"},
-			OptBytes:     &wrapperspb.BytesValue{Value: []byte("hello")},
-			OptDuration:  &durationpb.Duration{Seconds: 123},
-			OptTimestamp: &timestamppb.Timestamp{Seconds: 1553036601},
-			OptStruct: &structpb.Struct{
-				Fields: map[string]*structpb.Value{
-					"string": {Kind: &structpb.Value_StringValue{"hello"}},
-				},
-			},
-			OptList: &structpb.ListValue{
-				Values: []*structpb.Value{
-					{Kind: &structpb.Value_NullValue{}},
-					{Kind: &structpb.Value_StringValue{}},
-					{
-						Kind: &structpb.Value_StructValue{
-							&structpb.Struct{Fields: map[string]*structpb.Value{}},
-						},
-					},
-					{
-						Kind: &structpb.Value_ListValue{
-							&structpb.ListValue{Values: []*structpb.Value{}},
-						},
-					},
-				},
-			},
-			OptValue: &structpb.Value{
-				Kind: &structpb.Value_StringValue{"world"},
-			},
-			OptEmpty: &emptypb.Empty{},
-			OptAny: &anypb.Any{
-				TypeUrl: "google.protobuf.Empty",
-			},
-			OptFieldmask: &fieldmaskpb.FieldMask{
-				Paths: []string{"foo_bar", "bar_foo"},
-			},
-		},
-	}, {
-		desc:         "DiscardUnknown: regular messages",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb3.Nests{},
-		inputText: `{
-  "sNested": {
-    "unknown": {
-      "foo": 1,
-	  "bar": [1, 2, 3]
-    }
-  },
-  "unknown": "not known"
-}`,
-		wantMessage: &pb3.Nests{SNested: &pb3.Nested{}},
-	}, {
-		desc:         "DiscardUnknown: repeated",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Nests{},
-		inputText: `{
-  "rptNested": [
-    {"unknown": "blah"},
-	{"optString": "hello"}
-  ]
-}`,
-		wantMessage: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{},
-				{OptString: proto.String("hello")},
-			},
-		},
-	}, {
-		desc:         "DiscardUnknown: map",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb3.Maps{},
-		inputText: `{
-  "strToNested": {
-    "nested_one": {
-	  "unknown": "what you see is not"
-    }
-  }
-}`,
-		wantMessage: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested_one": {},
-			},
-		},
-	}, {
-		desc:         "DiscardUnknown: extension",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Extensions{},
-		inputText: `{
-  "[pb2.opt_ext_nested]": {
-	"unknown": []
-  }
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{})
-			return m
-		}(),
-	}, {
-		desc:         "DiscardUnknown: Empty",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &emptypb.Empty{},
-		inputText:    `{"unknown": "something"}`,
-		wantMessage:  &emptypb.Empty{},
-	}, {
-		desc:         "DiscardUnknown: Any without type",
-		umo:          protojson.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "value": {"foo": "bar"},
-  "unknown": true
-}`,
-		wantMessage: &anypb.Any{},
-	}, {
-		desc: "DiscardUnknown: Any",
-		umo: protojson.UnmarshalOptions{
-			DiscardUnknown: true,
-		},
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "foo/pb2.Nested",
-  "unknown": "none"
-}`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "foo/pb2.Nested",
-		},
-	}, {
-		desc: "DiscardUnknown: Any with Empty",
-		umo: protojson.UnmarshalOptions{
-			DiscardUnknown: true,
-		},
-		inputMessage: &anypb.Any{},
-		inputText: `{
-  "@type": "type.googleapis.com/google.protobuf.Empty",
-  "value": {"unknown": 47}
-}`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.Empty",
-		},
-	}, {
-		desc:         "weak fields",
-		inputMessage: &testpb.TestWeak{},
-		inputText:    `{"weak_message1":{"a":1}}`,
-		wantMessage: func() *testpb.TestWeak {
-			m := new(testpb.TestWeak)
-			m.SetWeakMessage1(&weakpb.WeakImportMessage1{A: proto.Int32(1)})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "weak fields; unknown field",
-		inputMessage: &testpb.TestWeak{},
-		inputText:    `{"weak_message1":{"a":1}, "weak_message2":{"a":1}}`,
-		wantErr:      `unknown field "weak_message2"`, // weak_message2 is unknown since the package containing it is not imported
-		skip:         !flags.ProtoLegacy,
-	}}
-
-	for _, tt := range tests {
-		tt := tt
-		if tt.skip {
-			continue
-		}
-		t.Run(tt.desc, func(t *testing.T) {
-			err := tt.umo.Unmarshal([]byte(tt.inputText), tt.inputMessage)
-			if err != nil {
-				if tt.wantErr == "" {
-					t.Errorf("Unmarshal() got unexpected error: %v", err)
-				} else if !strings.Contains(err.Error(), tt.wantErr) {
-					t.Errorf("Unmarshal() error got %q, want %q", err, tt.wantErr)
-				}
-				return
-			}
-			if tt.wantErr != "" {
-				t.Errorf("Unmarshal() got nil error, want error %q", tt.wantErr)
-			}
-			if tt.wantMessage != nil && !proto.Equal(tt.inputMessage, tt.wantMessage) {
-				t.Errorf("Unmarshal()\n<got>\n%v\n<want>\n%v\n", tt.inputMessage, tt.wantMessage)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/doc.go b/vendor/google.golang.org/protobuf/encoding/protojson/doc.go
index 21d5d2cb18e..ae71007c18b 100644
--- a/vendor/google.golang.org/protobuf/encoding/protojson/doc.go
+++ b/vendor/google.golang.org/protobuf/encoding/protojson/doc.go
@@ -6,6 +6,6 @@
 // format. It follows the guide at
 // https://protobuf.dev/programming-guides/proto3#json.
 //
-// This package produces a different output than the standard "encoding/json"
+// This package produces a different output than the standard [encoding/json]
 // package, which does not operate correctly on protocol buffer messages.
 package protojson
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/encode.go b/vendor/google.golang.org/protobuf/encoding/protojson/encode.go
index 66b95870e97..3f75098b6fb 100644
--- a/vendor/google.golang.org/protobuf/encoding/protojson/encode.go
+++ b/vendor/google.golang.org/protobuf/encoding/protojson/encode.go
@@ -31,7 +31,7 @@ func Format(m proto.Message) string {
 	return MarshalOptions{Multiline: true}.Format(m)
 }
 
-// Marshal writes the given proto.Message in JSON format using default options.
+// Marshal writes the given [proto.Message] in JSON format using default options.
 // Do not depend on the output being stable. It may change over time across
 // different versions of the program.
 func Marshal(m proto.Message) ([]byte, error) {
@@ -81,6 +81,25 @@ type MarshalOptions struct {
 	//  ╚═══════╧════════════════════════════╝
 	EmitUnpopulated bool
 
+	// EmitDefaultValues specifies whether to emit default-valued primitive fields,
+	// empty lists, and empty maps. The fields affected are as follows:
+	//  ╔═══════╤════════════════════════════════════════╗
+	//  ║ JSON  │ Protobuf field                         ║
+	//  ╠═══════╪════════════════════════════════════════╣
+	//  ║ false │ non-optional scalar boolean fields     ║
+	//  ║ 0     │ non-optional scalar numeric fields     ║
+	//  ║ ""    │ non-optional scalar string/byte fields ║
+	//  ║ []    │ empty repeated fields                  ║
+	//  ║ {}    │ empty map fields                       ║
+	//  ╚═══════╧════════════════════════════════════════╝
+	//
+	// Behaves similarly to EmitUnpopulated, but does not emit "null"-value fields,
+	// i.e. presence-sensing fields that are omitted will remain omitted to preserve
+	// presence-sensing.
+	// EmitUnpopulated takes precedence over EmitDefaultValues since the former generates
+	// a strict superset of the latter.
+	EmitDefaultValues bool
+
 	// Resolver is used for looking up types when expanding google.protobuf.Any
 	// messages. If nil, this defaults to using protoregistry.GlobalTypes.
 	Resolver interface {
@@ -102,7 +121,7 @@ func (o MarshalOptions) Format(m proto.Message) string {
 	return string(b)
 }
 
-// Marshal marshals the given proto.Message in the JSON format using options in
+// Marshal marshals the given [proto.Message] in the JSON format using options in
 // MarshalOptions. Do not depend on the output being stable. It may change over
 // time across different versions of the program.
 func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
@@ -178,7 +197,11 @@ func (m typeURLFieldRanger) Range(f func(protoreflect.FieldDescriptor, protorefl
 
 // unpopulatedFieldRanger wraps a protoreflect.Message and modifies its Range
 // method to additionally iterate over unpopulated fields.
-type unpopulatedFieldRanger struct{ protoreflect.Message }
+type unpopulatedFieldRanger struct {
+	protoreflect.Message
+
+	skipNull bool
+}
 
 func (m unpopulatedFieldRanger) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
 	fds := m.Descriptor().Fields()
@@ -192,6 +215,9 @@ func (m unpopulatedFieldRanger) Range(f func(protoreflect.FieldDescriptor, proto
 		isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()
 		isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Message() != nil
 		if isProto2Scalar || isSingularMessage {
+			if m.skipNull {
+				continue
+			}
 			v = protoreflect.Value{} // use invalid value to emit null
 		}
 		if !f(fd, v) {
@@ -217,8 +243,11 @@ func (e encoder) marshalMessage(m protoreflect.Message, typeURL string) error {
 	defer e.EndObject()
 
 	var fields order.FieldRanger = m
-	if e.opts.EmitUnpopulated {
-		fields = unpopulatedFieldRanger{m}
+	switch {
+	case e.opts.EmitUnpopulated:
+		fields = unpopulatedFieldRanger{Message: m, skipNull: false}
+	case e.opts.EmitDefaultValues:
+		fields = unpopulatedFieldRanger{Message: m, skipNull: true}
 	}
 	if typeURL != "" {
 		fields = typeURLFieldRanger{fields, typeURL}
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/encode_test.go b/vendor/google.golang.org/protobuf/encoding/protojson/encode_test.go
deleted file mode 100644
index adda0762c16..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protojson/encode_test.go
+++ /dev/null
@@ -1,2353 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protojson_test
-
-import (
-	"bytes"
-	"math"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/testing/protopack"
-
-	pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
-	pb3 "google.golang.org/protobuf/internal/testprotos/textpb3"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/emptypb"
-	"google.golang.org/protobuf/types/known/fieldmaskpb"
-	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-// Disable detrand to enable direct comparisons on outputs.
-func init() { detrand.Disable() }
-
-func TestMarshal(t *testing.T) {
-	tests := []struct {
-		desc    string
-		mo      protojson.MarshalOptions
-		input   proto.Message
-		want    string
-		wantErr bool // TODO: Verify error message substring.
-		skip    bool
-	}{{
-		desc:  "proto2 optional scalars not set",
-		input: &pb2.Scalars{},
-		want:  "{}",
-	}, {
-		desc:  "proto3 scalars not set",
-		input: &pb3.Scalars{},
-		want:  "{}",
-	}, {
-		desc:  "proto3 optional not set",
-		input: &pb3.Proto3Optional{},
-		want:  "{}",
-	}, {
-		desc: "proto2 optional scalars set to zero values",
-		input: &pb2.Scalars{
-			OptBool:     proto.Bool(false),
-			OptInt32:    proto.Int32(0),
-			OptInt64:    proto.Int64(0),
-			OptUint32:   proto.Uint32(0),
-			OptUint64:   proto.Uint64(0),
-			OptSint32:   proto.Int32(0),
-			OptSint64:   proto.Int64(0),
-			OptFixed32:  proto.Uint32(0),
-			OptFixed64:  proto.Uint64(0),
-			OptSfixed32: proto.Int32(0),
-			OptSfixed64: proto.Int64(0),
-			OptFloat:    proto.Float32(0),
-			OptDouble:   proto.Float64(0),
-			OptBytes:    []byte{},
-			OptString:   proto.String(""),
-		},
-		want: `{
-  "optBool": false,
-  "optInt32": 0,
-  "optInt64": "0",
-  "optUint32": 0,
-  "optUint64": "0",
-  "optSint32": 0,
-  "optSint64": "0",
-  "optFixed32": 0,
-  "optFixed64": "0",
-  "optSfixed32": 0,
-  "optSfixed64": "0",
-  "optFloat": 0,
-  "optDouble": 0,
-  "optBytes": "",
-  "optString": ""
-}`,
-	}, {
-		desc: "proto3 optional set to zero values",
-		input: &pb3.Proto3Optional{
-			OptBool:    proto.Bool(false),
-			OptInt32:   proto.Int32(0),
-			OptInt64:   proto.Int64(0),
-			OptUint32:  proto.Uint32(0),
-			OptUint64:  proto.Uint64(0),
-			OptFloat:   proto.Float32(0),
-			OptDouble:  proto.Float64(0),
-			OptString:  proto.String(""),
-			OptBytes:   []byte{},
-			OptEnum:    pb3.Enum_ZERO.Enum(),
-			OptMessage: &pb3.Nested{},
-		},
-		want: `{
-  "optBool": false,
-  "optInt32": 0,
-  "optInt64": "0",
-  "optUint32": 0,
-  "optUint64": "0",
-  "optFloat": 0,
-  "optDouble": 0,
-  "optString": "",
-  "optBytes": "",
-  "optEnum": "ZERO",
-  "optMessage": {}
-}`,
-	}, {
-		desc: "proto2 optional scalars set to some values",
-		input: &pb2.Scalars{
-			OptBool:     proto.Bool(true),
-			OptInt32:    proto.Int32(0xff),
-			OptInt64:    proto.Int64(0xdeadbeef),
-			OptUint32:   proto.Uint32(47),
-			OptUint64:   proto.Uint64(0xdeadbeef),
-			OptSint32:   proto.Int32(-1001),
-			OptSint64:   proto.Int64(-0xffff),
-			OptFixed64:  proto.Uint64(64),
-			OptSfixed32: proto.Int32(-32),
-			OptFloat:    proto.Float32(1.02),
-			OptDouble:   proto.Float64(1.234),
-			OptBytes:    []byte("谷歌"),
-			OptString:   proto.String("谷歌"),
-		},
-		want: `{
-  "optBool": true,
-  "optInt32": 255,
-  "optInt64": "3735928559",
-  "optUint32": 47,
-  "optUint64": "3735928559",
-  "optSint32": -1001,
-  "optSint64": "-65535",
-  "optFixed64": "64",
-  "optSfixed32": -32,
-  "optFloat": 1.02,
-  "optDouble": 1.234,
-  "optBytes": "6LC35q2M",
-  "optString": "谷歌"
-}`,
-	}, {
-		desc: "string",
-		input: &pb3.Scalars{
-			SString: "谷歌",
-		},
-		want: `{
-  "sString": "谷歌"
-}`,
-	}, {
-		desc: "string with invalid UTF8",
-		input: &pb3.Scalars{
-			SString: "abc\xff",
-		},
-		wantErr: true,
-	}, {
-		desc: "float nan",
-		input: &pb3.Scalars{
-			SFloat: float32(math.NaN()),
-		},
-		want: `{
-  "sFloat": "NaN"
-}`,
-	}, {
-		desc: "float positive infinity",
-		input: &pb3.Scalars{
-			SFloat: float32(math.Inf(1)),
-		},
-		want: `{
-  "sFloat": "Infinity"
-}`,
-	}, {
-		desc: "float negative infinity",
-		input: &pb3.Scalars{
-			SFloat: float32(math.Inf(-1)),
-		},
-		want: `{
-  "sFloat": "-Infinity"
-}`,
-	}, {
-		desc: "double nan",
-		input: &pb3.Scalars{
-			SDouble: math.NaN(),
-		},
-		want: `{
-  "sDouble": "NaN"
-}`,
-	}, {
-		desc: "double positive infinity",
-		input: &pb3.Scalars{
-			SDouble: math.Inf(1),
-		},
-		want: `{
-  "sDouble": "Infinity"
-}`,
-	}, {
-		desc: "double negative infinity",
-		input: &pb3.Scalars{
-			SDouble: math.Inf(-1),
-		},
-		want: `{
-  "sDouble": "-Infinity"
-}`,
-	}, {
-		desc:  "proto2 enum not set",
-		input: &pb2.Enums{},
-		want:  "{}",
-	}, {
-		desc: "proto2 enum set to zero value",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(0).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(0).Enum(),
-		},
-		want: `{
-  "optEnum": 0,
-  "optNestedEnum": 0
-}`,
-	}, {
-		desc: "proto2 enum",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum_ONE.Enum(),
-			OptNestedEnum: pb2.Enums_UNO.Enum(),
-		},
-		want: `{
-  "optEnum": "ONE",
-  "optNestedEnum": "UNO"
-}`,
-	}, {
-		desc: "proto2 enum set to numeric values",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(2).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(2).Enum(),
-		},
-		want: `{
-  "optEnum": "TWO",
-  "optNestedEnum": "DOS"
-}`,
-	}, {
-		desc: "proto2 enum set to unnamed numeric values",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(101).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(-101).Enum(),
-		},
-		want: `{
-  "optEnum": 101,
-  "optNestedEnum": -101
-}`,
-	}, {
-		desc:  "proto3 enum not set",
-		input: &pb3.Enums{},
-		want:  "{}",
-	}, {
-		desc: "proto3 enum set to zero value",
-		input: &pb3.Enums{
-			SEnum:       pb3.Enum_ZERO,
-			SNestedEnum: pb3.Enums_CERO,
-		},
-		want: "{}",
-	}, {
-		desc: "proto3 enum",
-		input: &pb3.Enums{
-			SEnum:       pb3.Enum_ONE,
-			SNestedEnum: pb3.Enums_UNO,
-		},
-		want: `{
-  "sEnum": "ONE",
-  "sNestedEnum": "UNO"
-}`,
-	}, {
-		desc: "proto3 enum set to numeric values",
-		input: &pb3.Enums{
-			SEnum:       2,
-			SNestedEnum: 2,
-		},
-		want: `{
-  "sEnum": "TWO",
-  "sNestedEnum": "DOS"
-}`,
-	}, {
-		desc: "proto3 enum set to unnamed numeric values",
-		input: &pb3.Enums{
-			SEnum:       -47,
-			SNestedEnum: 47,
-		},
-		want: `{
-  "sEnum": -47,
-  "sNestedEnum": 47
-}`,
-	}, {
-		desc:  "proto2 nested message not set",
-		input: &pb2.Nests{},
-		want:  "{}",
-	}, {
-		desc: "proto2 nested message set to empty",
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-		want: `{
-  "optNested": {},
-  "optgroup": {}
-}`,
-	}, {
-		desc: "proto2 nested messages",
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{
-				OptString: proto.String("nested message"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested message"),
-				},
-			},
-		},
-		want: `{
-  "optNested": {
-    "optString": "nested message",
-    "optNested": {
-      "optString": "another nested message"
-    }
-  }
-}`,
-	}, {
-		desc: "proto2 groups",
-		input: &pb2.Nests{
-			Optgroup: &pb2.Nests_OptGroup{
-				OptString: proto.String("inside a group"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("nested message inside a group"),
-				},
-				Optnestedgroup: &pb2.Nests_OptGroup_OptNestedGroup{
-					OptFixed32: proto.Uint32(47),
-				},
-			},
-		},
-		want: `{
-  "optgroup": {
-    "optString": "inside a group",
-    "optNested": {
-      "optString": "nested message inside a group"
-    },
-    "optnestedgroup": {
-      "optFixed32": 47
-    }
-  }
-}`,
-	}, {
-		desc:  "proto3 nested message not set",
-		input: &pb3.Nests{},
-		want:  "{}",
-	}, {
-		desc: "proto3 nested message set to empty",
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{},
-		},
-		want: `{
-  "sNested": {}
-}`,
-	}, {
-		desc: "proto3 nested message",
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{
-				SString: "nested message",
-				SNested: &pb3.Nested{
-					SString: "another nested message",
-				},
-			},
-		},
-		want: `{
-  "sNested": {
-    "sString": "nested message",
-    "sNested": {
-      "sString": "another nested message"
-    }
-  }
-}`,
-	}, {
-		desc:  "oneof not set",
-		input: &pb3.Oneofs{},
-		want:  "{}",
-	}, {
-		desc: "oneof set to empty string",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{},
-		},
-		want: `{
-  "oneofString": ""
-}`,
-	}, {
-		desc: "oneof set to string",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{
-				OneofString: "hello",
-			},
-		},
-		want: `{
-  "oneofString": "hello"
-}`,
-	}, {
-		desc: "oneof set to enum",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofEnum{
-				OneofEnum: pb3.Enum_ZERO,
-			},
-		},
-		want: `{
-  "oneofEnum": "ZERO"
-}`,
-	}, {
-		desc: "oneof set to empty message",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{},
-			},
-		},
-		want: `{
-  "oneofNested": {}
-}`,
-	}, {
-		desc: "oneof set to message",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{
-					SString: "nested message",
-				},
-			},
-		},
-		want: `{
-  "oneofNested": {
-    "sString": "nested message"
-  }
-}`,
-	}, {
-		desc:  "repeated fields not set",
-		input: &pb2.Repeats{},
-		want:  "{}",
-	}, {
-		desc: "repeated fields set to empty slices",
-		input: &pb2.Repeats{
-			RptBool:   []bool{},
-			RptInt32:  []int32{},
-			RptInt64:  []int64{},
-			RptUint32: []uint32{},
-			RptUint64: []uint64{},
-			RptFloat:  []float32{},
-			RptDouble: []float64{},
-			RptBytes:  [][]byte{},
-		},
-		want: "{}",
-	}, {
-		desc: "repeated fields set to some values",
-		input: &pb2.Repeats{
-			RptBool:   []bool{true, false, true, true},
-			RptInt32:  []int32{1, 6, 0, 0},
-			RptInt64:  []int64{-64, 47},
-			RptUint32: []uint32{0xff, 0xffff},
-			RptUint64: []uint64{0xdeadbeef},
-			RptFloat:  []float32{float32(math.NaN()), float32(math.Inf(1)), float32(math.Inf(-1)), 1.034},
-			RptDouble: []float64{math.NaN(), math.Inf(1), math.Inf(-1), 1.23e-308},
-			RptString: []string{"hello", "世界"},
-			RptBytes: [][]byte{
-				[]byte("hello"),
-				[]byte("\xe4\xb8\x96\xe7\x95\x8c"),
-			},
-		},
-		want: `{
-  "rptBool": [
-    true,
-    false,
-    true,
-    true
-  ],
-  "rptInt32": [
-    1,
-    6,
-    0,
-    0
-  ],
-  "rptInt64": [
-    "-64",
-    "47"
-  ],
-  "rptUint32": [
-    255,
-    65535
-  ],
-  "rptUint64": [
-    "3735928559"
-  ],
-  "rptFloat": [
-    "NaN",
-    "Infinity",
-    "-Infinity",
-    1.034
-  ],
-  "rptDouble": [
-    "NaN",
-    "Infinity",
-    "-Infinity",
-    1.23e-308
-  ],
-  "rptString": [
-    "hello",
-    "世界"
-  ],
-  "rptBytes": [
-    "aGVsbG8=",
-    "5LiW55WM"
-  ]
-}`,
-	}, {
-		desc: "repeated enums",
-		input: &pb2.Enums{
-			RptEnum:       []pb2.Enum{pb2.Enum_ONE, 2, pb2.Enum_TEN, 42},
-			RptNestedEnum: []pb2.Enums_NestedEnum{2, 47, 10},
-		},
-		want: `{
-  "rptEnum": [
-    "ONE",
-    "TWO",
-    "TEN",
-    42
-  ],
-  "rptNestedEnum": [
-    "DOS",
-    47,
-    "DIEZ"
-  ]
-}`,
-	}, {
-		desc: "repeated messages set to empty",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{},
-			Rptgroup:  []*pb2.Nests_RptGroup{},
-		},
-		want: "{}",
-	}, {
-		desc: "repeated messages",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{
-					OptString: proto.String("repeat nested one"),
-				},
-				{
-					OptString: proto.String("repeat nested two"),
-					OptNested: &pb2.Nested{
-						OptString: proto.String("inside repeat nested two"),
-					},
-				},
-				{},
-			},
-		},
-		want: `{
-  "rptNested": [
-    {
-      "optString": "repeat nested one"
-    },
-    {
-      "optString": "repeat nested two",
-      "optNested": {
-        "optString": "inside repeat nested two"
-      }
-    },
-    {}
-  ]
-}`,
-	}, {
-		desc: "repeated messages contains nil value",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{nil, {}},
-		},
-		want: `{
-  "rptNested": [
-    {},
-    {}
-  ]
-}`,
-	}, {
-		desc: "repeated groups",
-		input: &pb2.Nests{
-			Rptgroup: []*pb2.Nests_RptGroup{
-				{
-					RptString: []string{"hello", "world"},
-				},
-				{},
-				nil,
-			},
-		},
-		want: `{
-  "rptgroup": [
-    {
-      "rptString": [
-        "hello",
-        "world"
-      ]
-    },
-    {},
-    {}
-  ]
-}`,
-	}, {
-		desc:  "map fields not set",
-		input: &pb3.Maps{},
-		want:  "{}",
-	}, {
-		desc: "map fields set to empty",
-		input: &pb3.Maps{
-			Int32ToStr:   map[int32]string{},
-			BoolToUint32: map[bool]uint32{},
-			Uint64ToEnum: map[uint64]pb3.Enum{},
-			StrToNested:  map[string]*pb3.Nested{},
-			StrToOneofs:  map[string]*pb3.Oneofs{},
-		},
-		want: "{}",
-	}, {
-		desc: "map fields 1",
-		input: &pb3.Maps{
-			BoolToUint32: map[bool]uint32{
-				true:  42,
-				false: 101,
-			},
-		},
-		want: `{
-  "boolToUint32": {
-    "false": 101,
-    "true": 42
-  }
-}`,
-	}, {
-		desc: "map fields 2",
-		input: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				-101: "-101",
-				0xff: "0xff",
-				0:    "zero",
-			},
-		},
-		want: `{
-  "int32ToStr": {
-    "-101": "-101",
-    "0": "zero",
-    "255": "0xff"
-  }
-}`,
-	}, {
-		desc: "map fields 3",
-		input: &pb3.Maps{
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				1:  pb3.Enum_ONE,
-				2:  pb3.Enum_TWO,
-				10: pb3.Enum_TEN,
-				47: 47,
-			},
-		},
-		want: `{
-  "uint64ToEnum": {
-    "1": "ONE",
-    "2": "TWO",
-    "10": "TEN",
-    "47": 47
-  }
-}`,
-	}, {
-		desc: "map fields 4",
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested": &pb3.Nested{
-					SString: "nested in a map",
-				},
-			},
-		},
-		want: `{
-  "strToNested": {
-    "nested": {
-      "sString": "nested in a map"
-    }
-  }
-}`,
-	}, {
-		desc: "map fields 5",
-		input: &pb3.Maps{
-			StrToOneofs: map[string]*pb3.Oneofs{
-				"string": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofString{
-						OneofString: "hello",
-					},
-				},
-				"nested": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofNested{
-						OneofNested: &pb3.Nested{
-							SString: "nested oneof in map field value",
-						},
-					},
-				},
-			},
-		},
-		want: `{
-  "strToOneofs": {
-    "nested": {
-      "oneofNested": {
-        "sString": "nested oneof in map field value"
-      }
-    },
-    "string": {
-      "oneofString": "hello"
-    }
-  }
-}`,
-	}, {
-		desc: "map field contains nil value",
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nil": nil,
-			},
-		},
-		want: `{
-  "strToNested": {
-    "nil": {}
-  }
-}`,
-	}, {
-		desc:    "required fields not set",
-		input:   &pb2.Requireds{},
-		want:    `{}`,
-		wantErr: true,
-	}, {
-		desc: "required fields partially set",
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0),
-			ReqDouble:   proto.Float64(1.23),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		want: `{
-  "reqBool": false,
-  "reqSfixed64": "0",
-  "reqDouble": 1.23,
-  "reqString": "hello",
-  "reqEnum": "ONE"
-}`,
-		wantErr: true,
-	}, {
-		desc: "required fields not set with AllowPartial",
-		mo:   protojson.MarshalOptions{AllowPartial: true},
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0),
-			ReqDouble:   proto.Float64(1.23),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		want: `{
-  "reqBool": false,
-  "reqSfixed64": "0",
-  "reqDouble": 1.23,
-  "reqString": "hello",
-  "reqEnum": "ONE"
-}`,
-	}, {
-		desc: "required fields all set",
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0),
-			ReqDouble:   proto.Float64(1.23),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-			ReqNested:   &pb2.Nested{},
-		},
-		want: `{
-  "reqBool": false,
-  "reqSfixed64": "0",
-  "reqDouble": 1.23,
-  "reqString": "hello",
-  "reqEnum": "ONE",
-  "reqNested": {}
-}`,
-	}, {
-		desc: "indirect required field",
-		input: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		want: `{
-  "optNested": {}
-}`,
-		wantErr: true,
-	}, {
-		desc: "indirect required field with AllowPartial",
-		mo:   protojson.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		want: `{
-  "optNested": {}
-}`,
-	}, {
-		desc: "indirect required field in empty repeated",
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{},
-		},
-		want: `{}`,
-	}, {
-		desc: "indirect required field in repeated",
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				&pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "rptNested": [
-    {}
-  ]
-}`,
-		wantErr: true,
-	}, {
-		desc: "indirect required field in repeated with AllowPartial",
-		mo:   protojson.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				&pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "rptNested": [
-    {}
-  ]
-}`,
-	}, {
-		desc: "indirect required field in empty map",
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{},
-		},
-		want: "{}",
-	}, {
-		desc: "indirect required field in map",
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"fail": &pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "strToNested": {
-    "fail": {}
-  }
-}`,
-		wantErr: true,
-	}, {
-		desc: "indirect required field in map with AllowPartial",
-		mo:   protojson.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"fail": &pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "strToNested": {
-    "fail": {}
-  }
-}`,
-	}, {
-		desc: "indirect required field in oneof",
-		input: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "oneofNested": {}
-}`,
-		wantErr: true,
-	}, {
-		desc: "indirect required field in oneof with AllowPartial",
-		mo:   protojson.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		want: `{
-  "oneofNested": {}
-}`,
-	}, {
-		desc: "unknown fields are ignored",
-		input: func() proto.Message {
-			m := &pb2.Scalars{
-				OptString: proto.String("no unknowns"),
-			}
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.BytesType}, protopack.String("hello world"),
-			}.Marshal())
-			return m
-		}(),
-		want: `{
-  "optString": "no unknowns"
-}`,
-	}, {
-		desc: "json_name",
-		input: &pb3.JSONNames{
-			SString: "json_name",
-		},
-		want: `{
-  "foo_bar": "json_name"
-}`,
-	}, {
-		desc: "extensions of non-repeated fields",
-		input: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-		want: `{
-  "optString": "non-extension field",
-  "optBool": true,
-  "optInt32": 42,
-  "[pb2.opt_ext_bool]": true,
-  "[pb2.opt_ext_enum]": "TEN",
-  "[pb2.opt_ext_nested]": {
-    "optString": "nested in an extension",
-    "optNested": {
-      "optString": "another nested in an extension"
-    }
-  },
-  "[pb2.opt_ext_string]": "extension field"
-}`,
-	}, {
-		desc: "extensions of repeated fields",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_RptExtFixed32, []uint32{42, 47})
-			proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-		want: `{
-  "[pb2.rpt_ext_enum]": [
-    "TEN",
-    101,
-    "ONE"
-  ],
-  "[pb2.rpt_ext_fixed32]": [
-    42,
-    47
-  ],
-  "[pb2.rpt_ext_nested]": [
-    {
-      "optString": "one"
-    },
-    {
-      "optString": "two"
-    },
-    {
-      "optString": "three"
-    }
-  ]
-}`,
-	}, {
-		desc: "extensions of non-repeated fields in another message",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-		want: `{
-  "[pb2.ExtensionsContainer.opt_ext_bool]": true,
-  "[pb2.ExtensionsContainer.opt_ext_enum]": "TEN",
-  "[pb2.ExtensionsContainer.opt_ext_nested]": {
-    "optString": "nested in an extension",
-    "optNested": {
-      "optString": "another nested in an extension"
-    }
-  },
-  "[pb2.ExtensionsContainer.opt_ext_string]": "extension field"
-}`,
-	}, {
-		desc: "extensions of repeated fields in another message",
-		input: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtString, []string{"hello", "world"})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-		want: `{
-  "optString": "non-extension field",
-  "optBool": true,
-  "optInt32": 42,
-  "[pb2.ExtensionsContainer.rpt_ext_enum]": [
-    "TEN",
-    101,
-    "ONE"
-  ],
-  "[pb2.ExtensionsContainer.rpt_ext_nested]": [
-    {
-      "optString": "one"
-    },
-    {
-      "optString": "two"
-    },
-    {
-      "optString": "three"
-    }
-  ],
-  "[pb2.ExtensionsContainer.rpt_ext_string]": [
-    "hello",
-    "world"
-  ]
-}`,
-	}, {
-		desc: "MessageSet",
-		input: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
-				OptString: proto.String("just a regular extension"),
-			})
-			return m
-		}(),
-		want: `{
-  "[pb2.MessageSetExtension.ext_nested]": {
-    "optString": "just a regular extension"
-  },
-  "[pb2.MessageSetExtension]": {
-    "optString": "a messageset extension"
-  },
-  "[pb2.MessageSetExtension.not_message_set_extension]": {
-    "optString": "not a messageset extension"
-  }
-}`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc: "not real MessageSet 1",
-		input: func() proto.Message {
-			m := &pb2.FakeMessageSet{}
-			proto.SetExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			return m
-		}(),
-		want: `{
-  "[pb2.FakeMessageSetExtension.message_set_extension]": {
-    "optString": "not a messageset extension"
-  }
-}`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc: "not real MessageSet 2",
-		input: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("another not a messageset extension"),
-			})
-			return m
-		}(),
-		want: `{
-  "[pb2.message_set_extension]": {
-    "optString": "another not a messageset extension"
-  }
-}`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:  "BoolValue empty",
-		input: &wrapperspb.BoolValue{},
-		want:  `false`,
-	}, {
-		desc:  "BoolValue",
-		input: &wrapperspb.BoolValue{Value: true},
-		want:  `true`,
-	}, {
-		desc:  "Int32Value empty",
-		input: &wrapperspb.Int32Value{},
-		want:  `0`,
-	}, {
-		desc:  "Int32Value",
-		input: &wrapperspb.Int32Value{Value: 42},
-		want:  `42`,
-	}, {
-		desc:  "Int64Value",
-		input: &wrapperspb.Int64Value{Value: 42},
-		want:  `"42"`,
-	}, {
-		desc:  "UInt32Value",
-		input: &wrapperspb.UInt32Value{Value: 42},
-		want:  `42`,
-	}, {
-		desc:  "UInt64Value",
-		input: &wrapperspb.UInt64Value{Value: 42},
-		want:  `"42"`,
-	}, {
-		desc:  "FloatValue",
-		input: &wrapperspb.FloatValue{Value: 1.02},
-		want:  `1.02`,
-	}, {
-		desc:  "FloatValue Infinity",
-		input: &wrapperspb.FloatValue{Value: float32(math.Inf(-1))},
-		want:  `"-Infinity"`,
-	}, {
-		desc:  "DoubleValue",
-		input: &wrapperspb.DoubleValue{Value: 1.02},
-		want:  `1.02`,
-	}, {
-		desc:  "DoubleValue NaN",
-		input: &wrapperspb.DoubleValue{Value: math.NaN()},
-		want:  `"NaN"`,
-	}, {
-		desc:  "StringValue empty",
-		input: &wrapperspb.StringValue{},
-		want:  `""`,
-	}, {
-		desc:  "StringValue",
-		input: &wrapperspb.StringValue{Value: "谷歌"},
-		want:  `"谷歌"`,
-	}, {
-		desc:    "StringValue with invalid UTF8 error",
-		input:   &wrapperspb.StringValue{Value: "abc\xff"},
-		wantErr: true,
-	}, {
-		desc: "StringValue field with invalid UTF8 error",
-		input: &pb2.KnownTypes{
-			OptString: &wrapperspb.StringValue{Value: "abc\xff"},
-		},
-		wantErr: true,
-	}, {
-		desc:  "BytesValue",
-		input: &wrapperspb.BytesValue{Value: []byte("hello")},
-		want:  `"aGVsbG8="`,
-	}, {
-		desc:  "Empty",
-		input: &emptypb.Empty{},
-		want:  `{}`,
-	}, {
-		desc:  "NullValue field",
-		input: &pb2.KnownTypes{OptNull: new(structpb.NullValue)},
-		want: `{
-  "optNull": null
-}`,
-	}, {
-		desc:    "Value empty",
-		input:   &structpb.Value{},
-		wantErr: true,
-	}, {
-		desc: "Value empty field",
-		input: &pb2.KnownTypes{
-			OptValue: &structpb.Value{},
-		},
-		wantErr: true,
-	}, {
-		desc:  "Value contains NullValue",
-		input: &structpb.Value{Kind: &structpb.Value_NullValue{}},
-		want:  `null`,
-	}, {
-		desc:  "Value contains BoolValue",
-		input: &structpb.Value{Kind: &structpb.Value_BoolValue{}},
-		want:  `false`,
-	}, {
-		desc:  "Value contains NumberValue",
-		input: &structpb.Value{Kind: &structpb.Value_NumberValue{1.02}},
-		want:  `1.02`,
-	}, {
-		desc:  "Value contains StringValue",
-		input: &structpb.Value{Kind: &structpb.Value_StringValue{"hello"}},
-		want:  `"hello"`,
-	}, {
-		desc:    "Value contains StringValue with invalid UTF8",
-		input:   &structpb.Value{Kind: &structpb.Value_StringValue{"\xff"}},
-		wantErr: true,
-	}, {
-		desc: "Value contains Struct",
-		input: &structpb.Value{
-			Kind: &structpb.Value_StructValue{
-				&structpb.Struct{
-					Fields: map[string]*structpb.Value{
-						"null":   {Kind: &structpb.Value_NullValue{}},
-						"number": {Kind: &structpb.Value_NumberValue{}},
-						"string": {Kind: &structpb.Value_StringValue{}},
-						"struct": {Kind: &structpb.Value_StructValue{}},
-						"list":   {Kind: &structpb.Value_ListValue{}},
-						"bool":   {Kind: &structpb.Value_BoolValue{}},
-					},
-				},
-			},
-		},
-		want: `{
-  "bool": false,
-  "list": [],
-  "null": null,
-  "number": 0,
-  "string": "",
-  "struct": {}
-}`,
-	}, {
-		desc: "Value contains ListValue",
-		input: &structpb.Value{
-			Kind: &structpb.Value_ListValue{
-				&structpb.ListValue{
-					Values: []*structpb.Value{
-						{Kind: &structpb.Value_BoolValue{}},
-						{Kind: &structpb.Value_NullValue{}},
-						{Kind: &structpb.Value_NumberValue{}},
-						{Kind: &structpb.Value_StringValue{}},
-						{Kind: &structpb.Value_StructValue{}},
-						{Kind: &structpb.Value_ListValue{}},
-					},
-				},
-			},
-		},
-		want: `[
-  false,
-  null,
-  0,
-  "",
-  {},
-  []
-]`,
-	}, {
-		desc:    "Value with NaN",
-		input:   structpb.NewNumberValue(math.NaN()),
-		wantErr: true,
-	}, {
-		desc:    "Value with -Inf",
-		input:   structpb.NewNumberValue(math.Inf(-1)),
-		wantErr: true,
-	}, {
-		desc:    "Value with +Inf",
-		input:   structpb.NewNumberValue(math.Inf(+1)),
-		wantErr: true,
-	}, {
-		desc:  "Struct with nil map",
-		input: &structpb.Struct{},
-		want:  `{}`,
-	}, {
-		desc: "Struct with empty map",
-		input: &structpb.Struct{
-			Fields: map[string]*structpb.Value{},
-		},
-		want: `{}`,
-	}, {
-		desc: "Struct",
-		input: &structpb.Struct{
-			Fields: map[string]*structpb.Value{
-				"bool":   {Kind: &structpb.Value_BoolValue{true}},
-				"null":   {Kind: &structpb.Value_NullValue{}},
-				"number": {Kind: &structpb.Value_NumberValue{3.1415}},
-				"string": {Kind: &structpb.Value_StringValue{"hello"}},
-				"struct": {
-					Kind: &structpb.Value_StructValue{
-						&structpb.Struct{
-							Fields: map[string]*structpb.Value{
-								"string": {Kind: &structpb.Value_StringValue{"world"}},
-							},
-						},
-					},
-				},
-				"list": {
-					Kind: &structpb.Value_ListValue{
-						&structpb.ListValue{
-							Values: []*structpb.Value{
-								{Kind: &structpb.Value_BoolValue{}},
-								{Kind: &structpb.Value_NullValue{}},
-								{Kind: &structpb.Value_NumberValue{}},
-							},
-						},
-					},
-				},
-			},
-		},
-		want: `{
-  "bool": true,
-  "list": [
-    false,
-    null,
-    0
-  ],
-  "null": null,
-  "number": 3.1415,
-  "string": "hello",
-  "struct": {
-    "string": "world"
-  }
-}`,
-	}, {
-		desc: "Struct message with invalid UTF8 string",
-		input: &structpb.Struct{
-			Fields: map[string]*structpb.Value{
-				"string": {Kind: &structpb.Value_StringValue{"\xff"}},
-			},
-		},
-		wantErr: true,
-	}, {
-		desc:  "ListValue with nil values",
-		input: &structpb.ListValue{},
-		want:  `[]`,
-	}, {
-		desc: "ListValue with empty values",
-		input: &structpb.ListValue{
-			Values: []*structpb.Value{},
-		},
-		want: `[]`,
-	}, {
-		desc: "ListValue",
-		input: &structpb.ListValue{
-			Values: []*structpb.Value{
-				{Kind: &structpb.Value_BoolValue{true}},
-				{Kind: &structpb.Value_NullValue{}},
-				{Kind: &structpb.Value_NumberValue{3.1415}},
-				{Kind: &structpb.Value_StringValue{"hello"}},
-				{
-					Kind: &structpb.Value_ListValue{
-						&structpb.ListValue{
-							Values: []*structpb.Value{
-								{Kind: &structpb.Value_BoolValue{}},
-								{Kind: &structpb.Value_NullValue{}},
-								{Kind: &structpb.Value_NumberValue{}},
-							},
-						},
-					},
-				},
-				{
-					Kind: &structpb.Value_StructValue{
-						&structpb.Struct{
-							Fields: map[string]*structpb.Value{
-								"string": {Kind: &structpb.Value_StringValue{"world"}},
-							},
-						},
-					},
-				},
-			},
-		},
-		want: `[
-  true,
-  null,
-  3.1415,
-  "hello",
-  [
-    false,
-    null,
-    0
-  ],
-  {
-    "string": "world"
-  }
-]`,
-	}, {
-		desc: "ListValue with invalid UTF8 string",
-		input: &structpb.ListValue{
-			Values: []*structpb.Value{
-				{Kind: &structpb.Value_StringValue{"\xff"}},
-			},
-		},
-		wantErr: true,
-	}, {
-		desc:  "Duration empty",
-		input: &durationpb.Duration{},
-		want:  `"0s"`,
-	}, {
-		desc:  "Duration with secs",
-		input: &durationpb.Duration{Seconds: 3},
-		want:  `"3s"`,
-	}, {
-		desc:  "Duration with -secs",
-		input: &durationpb.Duration{Seconds: -3},
-		want:  `"-3s"`,
-	}, {
-		desc:  "Duration with nanos",
-		input: &durationpb.Duration{Nanos: 1e6},
-		want:  `"0.001s"`,
-	}, {
-		desc:  "Duration with -nanos",
-		input: &durationpb.Duration{Nanos: -1e6},
-		want:  `"-0.001s"`,
-	}, {
-		desc:  "Duration with large secs",
-		input: &durationpb.Duration{Seconds: 1e10, Nanos: 1},
-		want:  `"10000000000.000000001s"`,
-	}, {
-		desc:  "Duration with 6-digit nanos",
-		input: &durationpb.Duration{Nanos: 1e4},
-		want:  `"0.000010s"`,
-	}, {
-		desc:  "Duration with 3-digit nanos",
-		input: &durationpb.Duration{Nanos: 1e6},
-		want:  `"0.001s"`,
-	}, {
-		desc:  "Duration with -secs -nanos",
-		input: &durationpb.Duration{Seconds: -123, Nanos: -450},
-		want:  `"-123.000000450s"`,
-	}, {
-		desc:  "Duration max value",
-		input: &durationpb.Duration{Seconds: 315576000000, Nanos: 999999999},
-		want:  `"315576000000.999999999s"`,
-	}, {
-		desc:  "Duration min value",
-		input: &durationpb.Duration{Seconds: -315576000000, Nanos: -999999999},
-		want:  `"-315576000000.999999999s"`,
-	}, {
-		desc:    "Duration with +secs -nanos",
-		input:   &durationpb.Duration{Seconds: 1, Nanos: -1},
-		wantErr: true,
-	}, {
-		desc:    "Duration with -secs +nanos",
-		input:   &durationpb.Duration{Seconds: -1, Nanos: 1},
-		wantErr: true,
-	}, {
-		desc:    "Duration with +secs out of range",
-		input:   &durationpb.Duration{Seconds: 315576000001},
-		wantErr: true,
-	}, {
-		desc:    "Duration with -secs out of range",
-		input:   &durationpb.Duration{Seconds: -315576000001},
-		wantErr: true,
-	}, {
-		desc:    "Duration with +nanos out of range",
-		input:   &durationpb.Duration{Seconds: 0, Nanos: 1e9},
-		wantErr: true,
-	}, {
-		desc:    "Duration with -nanos out of range",
-		input:   &durationpb.Duration{Seconds: 0, Nanos: -1e9},
-		wantErr: true,
-	}, {
-		desc:  "Timestamp zero",
-		input: &timestamppb.Timestamp{},
-		want:  `"1970-01-01T00:00:00Z"`,
-	}, {
-		desc:  "Timestamp",
-		input: &timestamppb.Timestamp{Seconds: 1553036601},
-		want:  `"2019-03-19T23:03:21Z"`,
-	}, {
-		desc:  "Timestamp with nanos",
-		input: &timestamppb.Timestamp{Seconds: 1553036601, Nanos: 1},
-		want:  `"2019-03-19T23:03:21.000000001Z"`,
-	}, {
-		desc:  "Timestamp with 6-digit nanos",
-		input: &timestamppb.Timestamp{Nanos: 1e3},
-		want:  `"1970-01-01T00:00:00.000001Z"`,
-	}, {
-		desc:  "Timestamp with 3-digit nanos",
-		input: &timestamppb.Timestamp{Nanos: 1e7},
-		want:  `"1970-01-01T00:00:00.010Z"`,
-	}, {
-		desc:  "Timestamp max value",
-		input: &timestamppb.Timestamp{Seconds: 253402300799, Nanos: 999999999},
-		want:  `"9999-12-31T23:59:59.999999999Z"`,
-	}, {
-		desc:  "Timestamp min value",
-		input: &timestamppb.Timestamp{Seconds: -62135596800},
-		want:  `"0001-01-01T00:00:00Z"`,
-	}, {
-		desc:    "Timestamp with +secs out of range",
-		input:   &timestamppb.Timestamp{Seconds: 253402300800},
-		wantErr: true,
-	}, {
-		desc:    "Timestamp with -secs out of range",
-		input:   &timestamppb.Timestamp{Seconds: -62135596801},
-		wantErr: true,
-	}, {
-		desc:    "Timestamp with -nanos",
-		input:   &timestamppb.Timestamp{Nanos: -1},
-		wantErr: true,
-	}, {
-		desc:    "Timestamp with +nanos out of range",
-		input:   &timestamppb.Timestamp{Nanos: 1e9},
-		wantErr: true,
-	}, {
-		desc:  "FieldMask empty",
-		input: &fieldmaskpb.FieldMask{},
-		want:  `""`,
-	}, {
-		desc: "FieldMask",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{
-				"foo",
-				"foo_bar",
-				"foo.bar_qux",
-				"_foo",
-			},
-		},
-		want: `"foo,fooBar,foo.barQux,Foo"`,
-	}, {
-		desc: "FieldMask empty string path",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{""},
-		},
-		wantErr: true,
-	}, {
-		desc: "FieldMask path contains spaces only",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{"  "},
-		},
-		wantErr: true,
-	}, {
-		desc: "FieldMask irreversible error 1",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{"foo_"},
-		},
-		wantErr: true,
-	}, {
-		desc: "FieldMask irreversible error 2",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{"foo__bar"},
-		},
-		wantErr: true,
-	}, {
-		desc: "FieldMask invalid char",
-		input: &fieldmaskpb.FieldMask{
-			Paths: []string{"foo@bar"},
-		},
-		wantErr: true,
-	}, {
-		desc:  "Any empty",
-		input: &anypb.Any{},
-		want:  `{}`,
-	}, {
-		desc: "Any with non-custom message",
-		input: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "foo/pb2.Nested",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "foo/pb2.Nested",
-  "optString": "embedded inside Any",
-  "optNested": {
-    "optString": "inception"
-  }
-}`,
-	}, {
-		desc:  "Any with empty embedded message",
-		input: &anypb.Any{TypeUrl: "foo/pb2.Nested"},
-		want: `{
-  "@type": "foo/pb2.Nested"
-}`,
-	}, {
-		desc:    "Any without registered type",
-		mo:      protojson.MarshalOptions{Resolver: new(protoregistry.Types)},
-		input:   &anypb.Any{TypeUrl: "foo/pb2.Nested"},
-		wantErr: true,
-	}, {
-		desc: "Any with missing required",
-		input: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				AllowPartial:  true,
-				Deterministic: true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "pb2.PartialRequired",
-  "optString": "embedded inside Any"
-}`,
-	}, {
-		desc: "Any with partial required and AllowPartial",
-		mo: protojson.MarshalOptions{
-			AllowPartial: true,
-		},
-		input: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				AllowPartial:  true,
-				Deterministic: true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "pb2.PartialRequired",
-  "optString": "embedded inside Any"
-}`,
-	}, {
-		desc: "Any with EmitUnpopulated",
-		mo: protojson.MarshalOptions{
-			EmitUnpopulated: true,
-		},
-		input: func() proto.Message {
-			return &anypb.Any{
-				TypeUrl: string(new(pb3.Scalars).ProtoReflect().Descriptor().FullName()),
-			}
-		}(),
-		want: `{
-  "@type": "pb3.Scalars",
-  "sBool": false,
-  "sInt32": 0,
-  "sInt64": "0",
-  "sUint32": 0,
-  "sUint64": "0",
-  "sSint32": 0,
-  "sSint64": "0",
-  "sFixed32": 0,
-  "sFixed64": "0",
-  "sSfixed32": 0,
-  "sSfixed64": "0",
-  "sFloat": 0,
-  "sDouble": 0,
-  "sBytes": "",
-  "sString": ""
-}`,
-	}, {
-		desc: "Any with invalid UTF8",
-		input: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("abc\xff"),
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "foo/pb2.Nested",
-				Value:   b,
-			}
-		}(),
-		wantErr: true,
-	}, {
-		desc: "Any with invalid value",
-		input: &anypb.Any{
-			TypeUrl: "foo/pb2.Nested",
-			Value:   []byte("\x80"),
-		},
-		wantErr: true,
-	}, {
-		desc: "Any with BoolValue",
-		input: func() proto.Message {
-			m := &wrapperspb.BoolValue{Value: true}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.BoolValue",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "type.googleapis.com/google.protobuf.BoolValue",
-  "value": true
-}`,
-	}, {
-		desc: "Any with Empty",
-		input: func() proto.Message {
-			m := &emptypb.Empty{}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Empty",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "type.googleapis.com/google.protobuf.Empty",
-  "value": {}
-}`,
-	}, {
-		desc: "Any with StringValue containing invalid UTF8",
-		input: func() proto.Message {
-			m := &wrapperspb.StringValue{Value: "abcd"}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.StringValue",
-				Value:   bytes.Replace(b, []byte("abcd"), []byte("abc\xff"), -1),
-			}
-		}(),
-		wantErr: true,
-	}, {
-		desc: "Any with Int64Value",
-		input: func() proto.Message {
-			m := &wrapperspb.Int64Value{Value: 42}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.Int64Value",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "google.protobuf.Int64Value",
-  "value": "42"
-}`,
-	}, {
-		desc: "Any with Duration",
-		input: func() proto.Message {
-			m := &durationpb.Duration{}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Duration",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "type.googleapis.com/google.protobuf.Duration",
-  "value": "0s"
-}`,
-	}, {
-		desc: "Any with empty Value",
-		input: func() proto.Message {
-			m := &structpb.Value{}
-			b, err := proto.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Value",
-				Value:   b,
-			}
-		}(),
-		wantErr: true,
-	}, {
-		desc: "Any with Value of StringValue",
-		input: func() proto.Message {
-			m := &structpb.Value{Kind: &structpb.Value_StringValue{"abcd"}}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Value",
-				Value:   bytes.Replace(b, []byte("abcd"), []byte("abc\xff"), -1),
-			}
-		}(),
-		wantErr: true,
-	}, {
-		desc: "Any with Value of NullValue",
-		input: func() proto.Message {
-			m := &structpb.Value{Kind: &structpb.Value_NullValue{}}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.Value",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "type.googleapis.com/google.protobuf.Value",
-  "value": null
-}`,
-	}, {
-		desc: "Any with Struct",
-		input: func() proto.Message {
-			m := &structpb.Struct{
-				Fields: map[string]*structpb.Value{
-					"bool":   {Kind: &structpb.Value_BoolValue{true}},
-					"null":   {Kind: &structpb.Value_NullValue{}},
-					"string": {Kind: &structpb.Value_StringValue{"hello"}},
-					"struct": {
-						Kind: &structpb.Value_StructValue{
-							&structpb.Struct{
-								Fields: map[string]*structpb.Value{
-									"string": {Kind: &structpb.Value_StringValue{"world"}},
-								},
-							},
-						},
-					},
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "google.protobuf.Struct",
-				Value:   b,
-			}
-		}(),
-		want: `{
-  "@type": "google.protobuf.Struct",
-  "value": {
-    "bool": true,
-    "null": null,
-    "string": "hello",
-    "struct": {
-      "string": "world"
-    }
-  }
-}`,
-	}, {
-		desc: "Any with missing type_url",
-		input: func() proto.Message {
-			m := &wrapperspb.BoolValue{Value: true}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				Value: b,
-			}
-		}(),
-		wantErr: true,
-	}, {
-		desc: "well known types as field values",
-		input: &pb2.KnownTypes{
-			OptBool:      &wrapperspb.BoolValue{Value: false},
-			OptInt32:     &wrapperspb.Int32Value{Value: 42},
-			OptInt64:     &wrapperspb.Int64Value{Value: 42},
-			OptUint32:    &wrapperspb.UInt32Value{Value: 42},
-			OptUint64:    &wrapperspb.UInt64Value{Value: 42},
-			OptFloat:     &wrapperspb.FloatValue{Value: 1.23},
-			OptDouble:    &wrapperspb.DoubleValue{Value: 3.1415},
-			OptString:    &wrapperspb.StringValue{Value: "hello"},
-			OptBytes:     &wrapperspb.BytesValue{Value: []byte("hello")},
-			OptDuration:  &durationpb.Duration{Seconds: 123},
-			OptTimestamp: &timestamppb.Timestamp{Seconds: 1553036601},
-			OptStruct: &structpb.Struct{
-				Fields: map[string]*structpb.Value{
-					"string": {Kind: &structpb.Value_StringValue{"hello"}},
-				},
-			},
-			OptList: &structpb.ListValue{
-				Values: []*structpb.Value{
-					{Kind: &structpb.Value_NullValue{}},
-					{Kind: &structpb.Value_StringValue{}},
-					{Kind: &structpb.Value_StructValue{}},
-					{Kind: &structpb.Value_ListValue{}},
-				},
-			},
-			OptValue: &structpb.Value{
-				Kind: &structpb.Value_StringValue{"world"},
-			},
-			OptEmpty: &emptypb.Empty{},
-			OptAny: &anypb.Any{
-				TypeUrl: "google.protobuf.Empty",
-			},
-			OptFieldmask: &fieldmaskpb.FieldMask{
-				Paths: []string{"foo_bar", "bar_foo"},
-			},
-		},
-		want: `{
-  "optBool": false,
-  "optInt32": 42,
-  "optInt64": "42",
-  "optUint32": 42,
-  "optUint64": "42",
-  "optFloat": 1.23,
-  "optDouble": 3.1415,
-  "optString": "hello",
-  "optBytes": "aGVsbG8=",
-  "optDuration": "123s",
-  "optTimestamp": "2019-03-19T23:03:21Z",
-  "optStruct": {
-    "string": "hello"
-  },
-  "optList": [
-    null,
-    "",
-    {},
-    []
-  ],
-  "optValue": "world",
-  "optEmpty": {},
-  "optAny": {
-    "@type": "google.protobuf.Empty",
-    "value": {}
-  },
-  "optFieldmask": "fooBar,barFoo"
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto2 optional scalars",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Scalars{},
-		want: `{
-  "optBool": null,
-  "optInt32": null,
-  "optInt64": null,
-  "optUint32": null,
-  "optUint64": null,
-  "optSint32": null,
-  "optSint64": null,
-  "optFixed32": null,
-  "optFixed64": null,
-  "optSfixed32": null,
-  "optSfixed64": null,
-  "optFloat": null,
-  "optDouble": null,
-  "optBytes": null,
-  "optString": null
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto3 scalars",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Scalars{},
-		want: `{
-  "sBool": false,
-  "sInt32": 0,
-  "sInt64": "0",
-  "sUint32": 0,
-  "sUint64": "0",
-  "sSint32": 0,
-  "sSint64": "0",
-  "sFixed32": 0,
-  "sFixed64": "0",
-  "sSfixed32": 0,
-  "sSfixed64": "0",
-  "sFloat": 0,
-  "sDouble": 0,
-  "sBytes": "",
-  "sString": ""
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto2 enum",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Enums{},
-		want: `{
-  "optEnum": null,
-  "rptEnum": [],
-  "optNestedEnum": null,
-  "rptNestedEnum": []
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto3 enum",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Enums{},
-		want: `{
-  "sEnum": "ZERO",
-  "sNestedEnum": "CERO"
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto2 message and group fields",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Nests{},
-		want: `{
-  "optNested": null,
-  "optgroup": null,
-  "rptNested": [],
-  "rptgroup": []
-}`,
-	}, {
-		desc:  "EmitUnpopulated: proto3 message field",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Nests{},
-		want: `{
-  "sNested": null
-}`,
-	}, {
-		desc: "EmitUnpopulated: proto2 empty message and group fields",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-		want: `{
-  "optNested": {
-    "optString": null,
-    "optNested": null
-  },
-  "optgroup": {
-    "optString": null,
-    "optNested": null,
-    "optnestedgroup": null
-  },
-  "rptNested": [],
-  "rptgroup": []
-}`,
-	}, {
-		desc: "EmitUnpopulated: proto3 empty message field",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{},
-		},
-		want: `{
-  "sNested": {
-    "sString": "",
-    "sNested": null
-  }
-}`,
-	}, {
-		desc: "EmitUnpopulated: proto2 required fields",
-		mo: protojson.MarshalOptions{
-			AllowPartial:    true,
-			EmitUnpopulated: true,
-		},
-		input: &pb2.Requireds{},
-		want: `{
-  "reqBool": null,
-  "reqSfixed64": null,
-  "reqDouble": null,
-  "reqString": null,
-  "reqEnum": null,
-  "reqNested": null
-}`,
-	}, {
-		desc:  "EmitUnpopulated: repeated fields",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Repeats{},
-		want: `{
-  "rptBool": [],
-  "rptInt32": [],
-  "rptInt64": [],
-  "rptUint32": [],
-  "rptUint64": [],
-  "rptFloat": [],
-  "rptDouble": [],
-  "rptString": [],
-  "rptBytes": []
-}`,
-	}, {
-		desc: "EmitUnpopulated: repeated containing empty message",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{nil, {}},
-		},
-		want: `{
-  "optNested": null,
-  "optgroup": null,
-  "rptNested": [
-    {
-      "optString": null,
-      "optNested": null
-    },
-    {
-      "optString": null,
-      "optNested": null
-    }
-  ],
-  "rptgroup": []
-}`,
-	}, {
-		desc:  "EmitUnpopulated: map fields",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Maps{},
-		want: `{
-  "int32ToStr": {},
-  "boolToUint32": {},
-  "uint64ToEnum": {},
-  "strToNested": {},
-  "strToOneofs": {}
-}`,
-	}, {
-		desc: "EmitUnpopulated: map containing empty message",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested": &pb3.Nested{},
-			},
-			StrToOneofs: map[string]*pb3.Oneofs{
-				"nested": &pb3.Oneofs{},
-			},
-		},
-		want: `{
-  "int32ToStr": {},
-  "boolToUint32": {},
-  "uint64ToEnum": {},
-  "strToNested": {
-    "nested": {
-      "sString": "",
-      "sNested": null
-    }
-  },
-  "strToOneofs": {
-    "nested": {}
-  }
-}`,
-	}, {
-		desc:  "EmitUnpopulated: oneof fields",
-		mo:    protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb3.Oneofs{},
-		want:  `{}`,
-	}, {
-		desc: "EmitUnpopulated: extensions",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{})
-			proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
-				nil,
-				{},
-			})
-			return m
-		}(),
-		want: `{
-  "optString": null,
-  "optBool": null,
-  "optInt32": null,
-  "[pb2.opt_ext_nested]": {
-    "optString": null,
-    "optNested": null
-  },
-  "[pb2.rpt_ext_nested]": [
-    {
-      "optString": null,
-      "optNested": null
-    },
-    {
-      "optString": null,
-      "optNested": null
-    }
-  ]
-}`,
-	}, {
-		desc: "EmitUnpopulated: with populated fields",
-		mo:   protojson.MarshalOptions{EmitUnpopulated: true},
-		input: &pb2.Scalars{
-			OptInt32:    proto.Int32(0xff),
-			OptUint32:   proto.Uint32(47),
-			OptSint32:   proto.Int32(-1001),
-			OptFixed32:  proto.Uint32(32),
-			OptSfixed32: proto.Int32(-32),
-			OptFloat:    proto.Float32(1.02),
-			OptBytes:    []byte("谷歌"),
-		},
-		want: `{
-  "optBool": null,
-  "optInt32": 255,
-  "optInt64": null,
-  "optUint32": 47,
-  "optUint64": null,
-  "optSint32": -1001,
-  "optSint64": null,
-  "optFixed32": 32,
-  "optFixed64": null,
-  "optSfixed32": -32,
-  "optSfixed64": null,
-  "optFloat": 1.02,
-  "optDouble": null,
-  "optBytes": "6LC35q2M",
-  "optString": null
-}`,
-	}, {
-		desc: "UseEnumNumbers in singular field",
-		mo:   protojson.MarshalOptions{UseEnumNumbers: true},
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum_ONE.Enum(),
-			OptNestedEnum: pb2.Enums_UNO.Enum(),
-		},
-		want: `{
-  "optEnum": 1,
-  "optNestedEnum": 1
-}`,
-	}, {
-		desc: "UseEnumNumbers in repeated field",
-		mo:   protojson.MarshalOptions{UseEnumNumbers: true},
-		input: &pb2.Enums{
-			RptEnum:       []pb2.Enum{pb2.Enum_ONE, 2, pb2.Enum_TEN, 42},
-			RptNestedEnum: []pb2.Enums_NestedEnum{pb2.Enums_UNO, pb2.Enums_DOS, 47},
-		},
-		want: `{
-  "rptEnum": [
-    1,
-    2,
-    10,
-    42
-  ],
-  "rptNestedEnum": [
-    1,
-    2,
-    47
-  ]
-}`,
-	}, {
-		desc: "UseEnumNumbers in map field",
-		mo:   protojson.MarshalOptions{UseEnumNumbers: true},
-		input: &pb3.Maps{
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				1:  pb3.Enum_ONE,
-				2:  pb3.Enum_TWO,
-				10: pb3.Enum_TEN,
-				47: 47,
-			},
-		},
-		want: `{
-  "uint64ToEnum": {
-    "1": 1,
-    "2": 2,
-    "10": 10,
-    "47": 47
-  }
-}`,
-	}, {
-		desc: "UseProtoNames",
-		mo:   protojson.MarshalOptions{UseProtoNames: true},
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup: &pb2.Nests_OptGroup{
-				OptString: proto.String("inside a group"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("nested message inside a group"),
-				},
-				Optnestedgroup: &pb2.Nests_OptGroup_OptNestedGroup{
-					OptFixed32: proto.Uint32(47),
-				},
-			},
-			Rptgroup: []*pb2.Nests_RptGroup{
-				{
-					RptString: []string{"hello", "world"},
-				},
-			},
-		},
-		want: `{
-  "opt_nested": {},
-  "OptGroup": {
-    "opt_string": "inside a group",
-    "opt_nested": {
-      "opt_string": "nested message inside a group"
-    },
-    "OptNestedGroup": {
-      "opt_fixed32": 47
-    }
-  },
-  "RptGroup": [
-    {
-      "rpt_string": [
-        "hello",
-        "world"
-      ]
-    }
-  ]
-}`,
-	}}
-
-	for _, tt := range tests {
-		tt := tt
-		if tt.skip {
-			continue
-		}
-		t.Run(tt.desc, func(t *testing.T) {
-			// Use 2-space indentation on all MarshalOptions.
-			tt.mo.Indent = "  "
-			b, err := tt.mo.Marshal(tt.input)
-			if err != nil && !tt.wantErr {
-				t.Errorf("Marshal() returned error: %v\n", err)
-			}
-			if err == nil && tt.wantErr {
-				t.Errorf("Marshal() got nil error, want error\n")
-			}
-			got := string(b)
-			if got != tt.want {
-				t.Errorf("Marshal()\n<got>\n%v\n<want>\n%v\n", got, tt.want)
-				if diff := cmp.Diff(tt.want, got); diff != "" {
-					t.Errorf("Marshal() diff -want +got\n%v\n", diff)
-				}
-			}
-		})
-	}
-}
-
-func TestEncodeAppend(t *testing.T) {
-	want := []byte("prefix")
-	got := append([]byte(nil), want...)
-	got, err := protojson.MarshalOptions{}.MarshalAppend(got, &pb3.Scalars{
-		SString: "value",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.HasPrefix(got, want) {
-		t.Fatalf("MarshalAppend modified prefix: got %v, want prefix %v", got, want)
-	}
-}
-
-func TestMarshalAppendAllocations(t *testing.T) {
-	m := &pb3.Scalars{SInt32: 1}
-	const count = 1000
-	size := 12
-	b := make([]byte, size)
-	// AllocsPerRun returns an integral value.
-	marshalAllocs := testing.AllocsPerRun(count, func() {
-		_, err := protojson.MarshalOptions{}.MarshalAppend(b[:0], m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	b = nil
-	marshalAppendAllocs := testing.AllocsPerRun(count, func() {
-		var err error
-		b, err = protojson.MarshalOptions{}.MarshalAppend(b, m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	if marshalAllocs != marshalAppendAllocs {
-		t.Errorf("%v allocs/op when writing to a preallocated buffer", marshalAllocs)
-		t.Errorf("%v allocs/op when repeatedly appending to a slice", marshalAppendAllocs)
-		t.Errorf("expect amortized allocs/op to be identical")
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/gotest/ya.make b/vendor/google.golang.org/protobuf/encoding/protojson/gotest/ya.make
deleted file mode 100644
index 87a03c69b41..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protojson/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/encoding/protojson)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
index 6c37d417449..25329b7692e 100644
--- a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
+++ b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
@@ -176,7 +176,7 @@ func (d decoder) unmarshalAny(m protoreflect.Message) error {
 	// Use another decoder to parse the unread bytes for @type field. This
 	// avoids advancing a read from current decoder because the current JSON
 	// object may contain the fields of the embedded type.
-	dec := decoder{d.Clone(), UnmarshalOptions{}}
+	dec := decoder{d.Clone(), UnmarshalOptions{RecursionLimit: d.opts.RecursionLimit}}
 	tok, err := findTypeURL(dec)
 	switch err {
 	case errEmptyObject:
@@ -308,48 +308,25 @@ Loop:
 // array) in order to advance the read to the next JSON value. It relies on
 // the decoder returning an error if the types are not in valid sequence.
 func (d decoder) skipJSONValue() error {
-	tok, err := d.Read()
-	if err != nil {
-		return err
-	}
-	// Only need to continue reading for objects and arrays.
-	switch tok.Kind() {
-	case json.ObjectOpen:
-		for {
-			tok, err := d.Read()
-			if err != nil {
-				return err
-			}
-			switch tok.Kind() {
-			case json.ObjectClose:
-				return nil
-			case json.Name:
-				// Skip object field value.
-				if err := d.skipJSONValue(); err != nil {
-					return err
-				}
-			}
+	var open int
+	for {
+		tok, err := d.Read()
+		if err != nil {
+			return err
 		}
-
-	case json.ArrayOpen:
-		for {
-			tok, err := d.Peek()
-			if err != nil {
-				return err
-			}
-			switch tok.Kind() {
-			case json.ArrayClose:
-				d.Read()
-				return nil
-			default:
-				// Skip array item.
-				if err := d.skipJSONValue(); err != nil {
-					return err
-				}
+		switch tok.Kind() {
+		case json.ObjectClose, json.ArrayClose:
+			open--
+		case json.ObjectOpen, json.ArrayOpen:
+			open++
+			if open > d.opts.RecursionLimit {
+				return errors.New("exceeded max recursion depth")
 			}
 		}
+		if open == 0 {
+			return nil
+		}
 	}
-	return nil
 }
 
 // unmarshalAnyValue unmarshals the given custom-type message from the JSON
diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/ya.make b/vendor/google.golang.org/protobuf/encoding/protojson/ya.make
index 37dff49ad6c..dde79bb87cc 100644
--- a/vendor/google.golang.org/protobuf/encoding/protojson/ya.make
+++ b/vendor/google.golang.org/protobuf/encoding/protojson/ya.make
@@ -9,12 +9,4 @@ SRCS(
     well_known_types.go
 )
 
-GO_XTEST_SRCS(
-    bench_test.go
-    decode_test.go
-    encode_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go
index 4921b2d4a76..a45f112bce3 100644
--- a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go
+++ b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go
@@ -21,7 +21,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
-// Unmarshal reads the given []byte into the given proto.Message.
+// Unmarshal reads the given []byte into the given [proto.Message].
 // The provided message must be mutable (e.g., a non-nil pointer to a message).
 func Unmarshal(b []byte, m proto.Message) error {
 	return UnmarshalOptions{}.Unmarshal(b, m)
@@ -51,7 +51,7 @@ type UnmarshalOptions struct {
 	}
 }
 
-// Unmarshal reads the given []byte and populates the given proto.Message
+// Unmarshal reads the given []byte and populates the given [proto.Message]
 // using options in the UnmarshalOptions object.
 // The provided message must be mutable (e.g., a non-nil pointer to a message).
 func (o UnmarshalOptions) Unmarshal(b []byte, m proto.Message) error {
@@ -739,7 +739,9 @@ func (d decoder) skipValue() error {
 			case text.ListClose:
 				return nil
 			case text.MessageOpen:
-				return d.skipMessageValue()
+				if err := d.skipMessageValue(); err != nil {
+					return err
+				}
 			default:
 				// Skip items. This will not validate whether skipped values are
 				// of the same type or not, same behavior as C++
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/decode_test.go b/vendor/google.golang.org/protobuf/encoding/prototext/decode_test.go
deleted file mode 100644
index 2f8b59607df..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/prototext/decode_test.go
+++ /dev/null
@@ -1,1706 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package prototext_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoregistry"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	weakpb "google.golang.org/protobuf/internal/testprotos/test/weak1"
-	pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
-	pb3 "google.golang.org/protobuf/internal/testprotos/textpb3"
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-func TestUnmarshal(t *testing.T) {
-	tests := []struct {
-		desc         string
-		umo          prototext.UnmarshalOptions
-		inputMessage proto.Message
-		inputText    string
-		wantMessage  proto.Message
-		wantErr      string // Expected error substring.
-		skip         bool
-	}{{
-		desc:         "proto2 empty message",
-		inputMessage: &pb2.Scalars{},
-		wantMessage:  &pb2.Scalars{},
-	}, {
-		desc:         "proto2 optional scalars set to zero values",
-		inputMessage: &pb2.Scalars{},
-		inputText: `opt_bool: false
-opt_int32: 0
-opt_int64: 0
-opt_uint32: 0
-opt_uint64: 0
-opt_sint32: 0
-opt_sint64: 0
-opt_fixed32: 0
-opt_fixed64: 0
-opt_sfixed32: 0
-opt_sfixed64: 0
-opt_float: 0
-opt_double: 0
-opt_bytes: ""
-opt_string: ""
-`,
-		wantMessage: &pb2.Scalars{
-			OptBool:     proto.Bool(false),
-			OptInt32:    proto.Int32(0),
-			OptInt64:    proto.Int64(0),
-			OptUint32:   proto.Uint32(0),
-			OptUint64:   proto.Uint64(0),
-			OptSint32:   proto.Int32(0),
-			OptSint64:   proto.Int64(0),
-			OptFixed32:  proto.Uint32(0),
-			OptFixed64:  proto.Uint64(0),
-			OptSfixed32: proto.Int32(0),
-			OptSfixed64: proto.Int64(0),
-			OptFloat:    proto.Float32(0),
-			OptDouble:   proto.Float64(0),
-			OptBytes:    []byte{},
-			OptString:   proto.String(""),
-		},
-	}, {
-		desc:         "proto3 scalars set to zero values",
-		inputMessage: &pb3.Scalars{},
-		inputText: `s_bool: false
-s_int32: 0
-s_int64: 0
-s_uint32: 0
-s_uint64: 0
-s_sint32: 0
-s_sint64: 0
-s_fixed32: 0
-s_fixed64: 0
-s_sfixed32: 0
-s_sfixed64: 0
-s_float: 0
-s_double: 0
-s_bytes: ""
-s_string: ""
-`,
-		wantMessage: &pb3.Scalars{},
-	}, {
-		desc:         "proto3 optional set to zero values",
-		inputMessage: &pb3.Proto3Optional{},
-		inputText: `opt_bool: false
-opt_int32: 0
-opt_int64: 0
-opt_uint32: 0
-opt_uint64: 0
-opt_float: 0
-opt_double: 0
-opt_string: ""
-opt_bytes: ""
-opt_enum: ZERO
-opt_message: {}
-`,
-		wantMessage: &pb3.Proto3Optional{
-			OptBool:    proto.Bool(false),
-			OptInt32:   proto.Int32(0),
-			OptInt64:   proto.Int64(0),
-			OptUint32:  proto.Uint32(0),
-			OptUint64:  proto.Uint64(0),
-			OptFloat:   proto.Float32(0),
-			OptDouble:  proto.Float64(0),
-			OptString:  proto.String(""),
-			OptBytes:   []byte{},
-			OptEnum:    pb3.Enum_ZERO.Enum(),
-			OptMessage: &pb3.Nested{},
-		},
-	}, {
-		desc:         "proto2 optional scalars",
-		inputMessage: &pb2.Scalars{},
-		inputText: `opt_bool: true
-opt_int32: 255
-opt_int64: 3735928559
-opt_uint32: 0xff
-opt_uint64: 0xdeadbeef
-opt_sint32: -1001
-opt_sint64: -   0xffff
-opt_fixed64: 64
-opt_sfixed32: -		32
-opt_float: 1.234
-opt_double: 1.23e+100
-opt_bytes: "\xe8\xb0\xb7\xe6\xad\x8c"
-opt_string: "谷歌"
-`,
-		wantMessage: &pb2.Scalars{
-			OptBool:     proto.Bool(true),
-			OptInt32:    proto.Int32(0xff),
-			OptInt64:    proto.Int64(0xdeadbeef),
-			OptUint32:   proto.Uint32(0xff),
-			OptUint64:   proto.Uint64(0xdeadbeef),
-			OptSint32:   proto.Int32(-1001),
-			OptSint64:   proto.Int64(-0xffff),
-			OptFixed64:  proto.Uint64(64),
-			OptSfixed32: proto.Int32(-32),
-			OptFloat:    proto.Float32(1.234),
-			OptDouble:   proto.Float64(1.23e100),
-			OptBytes:    []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
-			OptString:   proto.String("谷歌"),
-		},
-	}, {
-		desc:         "case sensitive",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `S_BOOL: true`,
-		wantErr:      "unknown field: S_BOOL",
-	}, {
-		desc:         "proto3 scalars",
-		inputMessage: &pb3.Scalars{},
-		inputText: `s_bool: true
-s_int32: 255
-s_int64: 3735928559
-s_uint32: 0xff
-s_uint64: 0xdeadbeef
-s_sint32: -1001
-s_sint64: -  #
-             0xffff
-s_fixed64: 64
-s_sfixed32: -32
-s_float: 1.234
-s_double: 1.23e+100
-s_bytes: "\xe8\xb0\xb7\xe6\xad\x8c"
-s_string: "谷歌"
-`,
-		wantMessage: &pb3.Scalars{
-			SBool:     true,
-			SInt32:    0xff,
-			SInt64:    0xdeadbeef,
-			SUint32:   0xff,
-			SUint64:   0xdeadbeef,
-			SSint32:   -1001,
-			SSint64:   -0xffff,
-			SFixed64:  64,
-			SSfixed32: -32,
-			SFloat:    1.234,
-			SDouble:   1.23e100,
-			SBytes:    []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
-			SString:   "谷歌",
-		},
-	}, {
-		desc:         "proto2 string with invalid UTF-8",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `opt_string: "abc\xff"`,
-		wantMessage: &pb2.Scalars{
-			OptString: proto.String("abc\xff"),
-		},
-	}, {
-		desc:         "proto3 string with invalid UTF-8",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `s_string: "abc\xff"`,
-		wantErr:      "(line 1:11): contains invalid UTF-8",
-	}, {
-		desc:         "proto2 message contains unknown field",
-		inputMessage: &pb2.Scalars{},
-		inputText:    "unknown_field: 123",
-		wantErr:      "unknown field",
-	}, {
-		desc:         "proto3 message contains unknown field",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "unknown_field: 456",
-		wantErr:      "unknown field",
-	}, {
-		desc:         "proto2 message contains discarded unknown field",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Scalars{},
-		inputText:    `unknown_field:123 1000:"hello"`,
-	}, {
-		desc:         "proto3 message contains discarded unknown field",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb3.Scalars{},
-		inputText:    `unknown_field:456 1000:"goodbye"`,
-	}, {
-		desc:         "proto2 message cannot parse field number",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Scalars{},
-		inputText:    `13:"hello"`,
-		wantErr:      "cannot specify field by number",
-	}, {
-		desc:         "unknown list field",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Scalars{},
-		inputText:    `unknown_field: { strings: [ "" ] }`,
-	}, {
-		desc:         "unknown list of list field",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb2.Scalars{},
-		inputText:    `unknown_field: { strings: [ [ ] ] }`,
-		wantErr:      `(line 1:29): invalid scalar value: [`,
-	}, {
-		desc:         "proto3 message cannot parse field number",
-		umo:          prototext.UnmarshalOptions{DiscardUnknown: true},
-		inputMessage: &pb3.Scalars{},
-		inputText:    `13:"goodbye"`,
-		wantErr:      "cannot specify field by number",
-	}, {
-		desc:         "proto2 numeric key field",
-		inputMessage: &pb2.Scalars{},
-		inputText:    "1: true",
-		wantErr:      "cannot specify field by number",
-	}, {
-		desc:         "proto3 numeric key field",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "1: true",
-		wantErr:      "cannot specify field by number",
-	}, {
-		desc:         "invalid bool value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_bool: 123",
-		wantErr:      "invalid value for bool",
-	}, {
-		desc:         "invalid int32 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_int32: not_a_num",
-		wantErr:      "invalid value for int32",
-	}, {
-		desc:         "invalid int64 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_int64: 'not a num either'",
-		wantErr:      "invalid value for int64",
-	}, {
-		desc:         "invalid uint32 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_fixed32: -42",
-		wantErr:      "invalid value for fixed32",
-	}, {
-		desc:         "invalid uint64 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_uint64: -47",
-		wantErr:      "invalid value for uint64",
-	}, {
-		desc:         "invalid sint32 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_sint32: '42'",
-		wantErr:      "invalid value for sint32",
-	}, {
-		desc:         "invalid sint64 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_sint64: '-47'",
-		wantErr:      "invalid value for sint64",
-	}, {
-		desc:         "invalid fixed32 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_fixed32: -42",
-		wantErr:      "invalid value for fixed32",
-	}, {
-		desc:         "invalid fixed64 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_fixed64: -42",
-		wantErr:      "invalid value for fixed64",
-	}, {
-		desc:         "invalid sfixed32 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_sfixed32: 'not valid'",
-		wantErr:      "invalid value for sfixed32",
-	}, {
-		desc:         "invalid sfixed64 value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_sfixed64: bad",
-		wantErr:      "invalid value for sfixed64",
-	}, {
-		desc:         "incomplete number value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    `s_int32: - `,
-		wantErr:      "(line 1:10): invalid scalar value: -",
-	}, {
-		desc:         "conformance: FloatFieldMaxValue",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `opt_float: 3.4028235e+38`,
-		wantMessage: &pb2.Scalars{
-			OptFloat: proto.Float32(3.40282347e+38),
-		},
-	}, {
-		desc:         "conformance: FloatFieldLargerThanUint64",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `opt_float: 18446744073709551616`,
-		wantMessage: &pb2.Scalars{
-			OptFloat: proto.Float32(1.84467441e+19),
-		},
-	}, {
-		desc:         "conformance: FloatFieldTooLarge",
-		inputMessage: &pb2.Scalars{},
-		inputText:    `opt_float: 3.4028235e+39`,
-		wantMessage: &pb2.Scalars{
-			OptFloat: proto.Float32(float32(math.Inf(1))),
-		},
-	}, {
-		desc:         "invalid string value",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_string: invalid_string",
-		wantErr:      "invalid value for string type",
-	}, {
-		desc:         "proto2 bytes set to empty string",
-		inputMessage: &pb2.Scalars{},
-		inputText:    "opt_bytes: ''",
-		wantMessage: &pb2.Scalars{
-			OptBytes: []byte(""),
-		},
-	}, {
-		desc:         "proto3 bytes set to empty string",
-		inputMessage: &pb3.Scalars{},
-		inputText:    "s_bytes: ''",
-		wantMessage:  &pb3.Scalars{},
-	}, {
-		desc:         "proto2 duplicate singular field",
-		inputMessage: &pb2.Scalars{},
-		inputText: `
-opt_bool: true
-opt_bool: false
-`,
-		wantErr: `(line 3:1): non-repeated field "opt_bool" is repeated`,
-	}, {
-		desc:         "proto2 more duplicate singular field",
-		inputMessage: &pb2.Scalars{},
-		inputText: `
-opt_bool: true
-opt_string: "hello"
-opt_bool: false
-`,
-		wantErr: `(line 4:1): non-repeated field "opt_bool" is repeated`,
-	}, {
-		desc:         "proto2 invalid singular field",
-		inputMessage: &pb2.Scalars{},
-		inputText: `
-opt_bool: [true, false]
-`,
-		wantErr: "(line 2:11): unexpected token: [",
-	}, {
-		desc:         "proto3 duplicate singular field",
-		inputMessage: &pb3.Scalars{},
-		inputText: `
-s_bool: false
-s_bool: true
-`,
-		wantErr: `non-repeated field "s_bool" is repeated`,
-	}, {
-		desc:         "proto3 more duplicate singular field",
-		inputMessage: &pb3.Scalars{},
-		inputText: `
-s_bool: false
-s_string: ""
-s_bool: true
-`,
-		wantErr: `non-repeated field "s_bool" is repeated`,
-	}, {
-		desc:         "proto2 enum",
-		inputMessage: &pb2.Enums{},
-		inputText: `
-opt_enum: ONE
-opt_nested_enum: UNO
-`,
-		wantMessage: &pb2.Enums{
-			OptEnum:       pb2.Enum_ONE.Enum(),
-			OptNestedEnum: pb2.Enums_UNO.Enum(),
-		},
-	}, {
-		desc:         "proto2 enum set to numeric values",
-		inputMessage: &pb2.Enums{},
-		inputText: `
-opt_enum: 2
-opt_nested_enum: 2
-`,
-		wantMessage: &pb2.Enums{
-			OptEnum:       pb2.Enum_TWO.Enum(),
-			OptNestedEnum: pb2.Enums_DOS.Enum(),
-		},
-	}, {
-		desc:         "proto2 enum set to unnamed numeric values",
-		inputMessage: &pb2.Enums{},
-		inputText: `
-opt_enum: 101
-opt_nested_enum: -101
-`,
-		wantMessage: &pb2.Enums{
-			OptEnum:       pb2.Enum(101).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(-101).Enum(),
-		},
-	}, {
-		desc:         "proto2 enum set to invalid named",
-		inputMessage: &pb2.Enums{},
-		inputText: `
-opt_enum: UNNAMED
-opt_nested_enum: UNNAMED_TOO
-`,
-		wantErr: "invalid value for enum type: UNNAMED",
-	}, {
-		desc:         "proto3 enum name value",
-		inputMessage: &pb3.Enums{},
-		inputText: `
-s_enum: ONE
-s_nested_enum: DIEZ
-`,
-		wantMessage: &pb3.Enums{
-			SEnum:       pb3.Enum_ONE,
-			SNestedEnum: pb3.Enums_DIEZ,
-		},
-	}, {
-		desc:         "proto3 enum numeric value",
-		inputMessage: &pb3.Enums{},
-		inputText: `
-s_enum: 2
-s_nested_enum: 2
-`,
-		wantMessage: &pb3.Enums{
-			SEnum:       pb3.Enum_TWO,
-			SNestedEnum: pb3.Enums_DOS,
-		},
-	}, {
-		desc:         "proto3 enum unnamed numeric value",
-		inputMessage: &pb3.Enums{},
-		inputText: `
-s_enum: 0x7fffffff
-s_nested_enum: -0x80000000
-`,
-		wantMessage: &pb3.Enums{
-			SEnum:       0x7fffffff,
-			SNestedEnum: -0x80000000,
-		},
-	}, {
-		desc:         "proto2 nested empty messages",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-opt_nested: {}
-OptGroup: {}
-`,
-		wantMessage: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-	}, {
-		desc:         "message fields with no field separator",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-opt_nested {}
-OptGroup {}
-`,
-		wantMessage: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-	}, {
-		desc:         "group field name",
-		inputMessage: &pb2.Nests{},
-		inputText:    `optgroup: {}`,
-		wantErr:      "unknown field: optgroup",
-	}, {
-		desc:         "proto2 nested messages",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-opt_nested: {
-  opt_string: "nested message"
-  opt_nested: {
-    opt_string: "another nested message"
-  }
-}
-`,
-		wantMessage: &pb2.Nests{
-			OptNested: &pb2.Nested{
-				OptString: proto.String("nested message"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested message"),
-				},
-			},
-		},
-	}, {
-		desc:         "proto3 nested empty message",
-		inputMessage: &pb3.Nests{},
-		inputText:    "s_nested: {}",
-		wantMessage: &pb3.Nests{
-			SNested: &pb3.Nested{},
-		},
-	}, {
-		desc:         "proto3 nested message",
-		inputMessage: &pb3.Nests{},
-		inputText: `
-s_nested: {
-  s_string: "nested message"
-  s_nested: {
-    s_string: "another nested message"
-  }
-}
-`,
-		wantMessage: &pb3.Nests{
-			SNested: &pb3.Nested{
-				SString: "nested message",
-				SNested: &pb3.Nested{
-					SString: "another nested message",
-				},
-			},
-		},
-	}, {
-		desc:         "proto3 nested message contains invalid UTF-8",
-		inputMessage: &pb3.Nests{},
-		inputText: `s_nested: {
-  s_string: "abc\xff"
-}
-`,
-		wantErr: "contains invalid UTF-8",
-	}, {
-		desc:         "oneof set to empty string",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    "oneof_string: ''",
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{},
-		},
-	}, {
-		desc:         "oneof set to string",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    "oneof_string: 'hello'",
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{
-				OneofString: "hello",
-			},
-		},
-	}, {
-		desc:         "oneof set to enum",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    "oneof_enum: TEN",
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofEnum{
-				OneofEnum: pb3.Enum_TEN,
-			},
-		},
-	}, {
-		desc:         "oneof set to empty message",
-		inputMessage: &pb3.Oneofs{},
-		inputText:    "oneof_nested: {}",
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{},
-			},
-		},
-	}, {
-		desc:         "oneof set to message",
-		inputMessage: &pb3.Oneofs{},
-		inputText: `
-oneof_nested: {
-  s_string: "nested message"
-}
-`,
-		wantMessage: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{
-					SString: "nested message",
-				},
-			},
-		},
-	}, {
-		desc:         "oneof set to more than one field",
-		inputMessage: &pb3.Oneofs{},
-		inputText: `
-oneof_enum: ZERO
-oneof_string: "hello"
-`,
-		wantErr: `error parsing "oneof_string", oneof pb3.Oneofs.union is already set`,
-	}, {
-		desc:         "repeated scalar using same field name",
-		inputMessage: &pb2.Repeats{},
-		inputText: `
-rpt_string: "a"
-rpt_string: "b"
-rpt_int32: 0xff
-rpt_float: 1.23
-rpt_bytes: "bytes"
-`,
-		wantMessage: &pb2.Repeats{
-			RptString: []string{"a", "b"},
-			RptInt32:  []int32{0xff},
-			RptFloat:  []float32{1.23},
-			RptBytes:  [][]byte{[]byte("bytes")},
-		},
-	}, {
-		desc:         "repeated using mix of [] and repeated field name",
-		inputMessage: &pb2.Repeats{},
-		inputText: `
-rpt_string: "a"
-rpt_bool: true
-rpt_string: ["x", "y"]
-rpt_bool: [ false, true ]
-rpt_string: "b"
-`,
-		wantMessage: &pb2.Repeats{
-			RptString: []string{"a", "x", "y", "b"},
-			RptBool:   []bool{true, false, true},
-		},
-	}, {
-		desc:         "repeated proto2 contains invalid UTF-8",
-		inputMessage: &pb2.Repeats{},
-		inputText:    `rpt_string: "abc\xff"`,
-		wantMessage: &pb2.Repeats{
-			RptString: []string{"abc\xff"},
-		},
-	}, {
-		desc:         "repeated proto3 contains invalid UTF-8",
-		inputMessage: &pb3.Repeats{},
-		inputText:    `rpt_string: "abc\xff"`,
-		wantErr:      "contains invalid UTF-8",
-	}, {
-		desc:         "repeated enums",
-		inputMessage: &pb2.Enums{},
-		inputText: `
-rpt_enum: TEN
-rpt_enum: 1
-rpt_nested_enum: [DOS, 2]
-rpt_enum: 42
-rpt_nested_enum: -47
-`,
-		wantMessage: &pb2.Enums{
-			RptEnum:       []pb2.Enum{pb2.Enum_TEN, pb2.Enum_ONE, 42},
-			RptNestedEnum: []pb2.Enums_NestedEnum{pb2.Enums_DOS, pb2.Enums_DOS, -47},
-		},
-	}, {
-		desc:         "repeated nested messages",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-rpt_nested: {
-  opt_string: "repeat nested one"
-}
-rpt_nested: {
-  opt_string: "repeat nested two"
-  opt_nested: {
-    opt_string: "inside repeat nested two"
-  }
-}
-rpt_nested: {}
-`,
-		wantMessage: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{
-					OptString: proto.String("repeat nested one"),
-				},
-				{
-					OptString: proto.String("repeat nested two"),
-					OptNested: &pb2.Nested{
-						OptString: proto.String("inside repeat nested two"),
-					},
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "repeated group fields",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-RptGroup: {
-  rpt_string: "hello"
-  rpt_string: "world"
-}
-RptGroup: {}
-`,
-		wantMessage: &pb2.Nests{
-			Rptgroup: []*pb2.Nests_RptGroup{
-				{
-					RptString: []string{"hello", "world"},
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "repeated message fields without field separator",
-		inputMessage: &pb2.Nests{},
-		inputText: `
-rpt_nested {
-  opt_string: "repeat nested one"
-}
-rpt_nested: [
-  {
-    opt_string: "repeat nested two"
-  },
-  {}
-]
-`,
-		wantMessage: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{
-					OptString: proto.String("repeat nested one"),
-				},
-				{
-					OptString: proto.String("repeat nested two"),
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "bools",
-		inputMessage: &pb2.Repeats{},
-		inputText: `
-rpt_bool: [ True, true, t, 1, False, false, f, 0 ]
-`,
-		wantMessage: &pb2.Repeats{
-			RptBool: []bool{true, true, true, true, false, false, false, false},
-		},
-	}, {
-		desc:         "special floats and doubles",
-		inputMessage: &pb2.Repeats{},
-		inputText: `
-rpt_float: [ inf, Inf, infinity, InFiniTy, -inf, -inF, -infinitY, -InfinitY, nan, NaN, Nan ],
-rpt_double: [ inf, Inf, infinity, InFiniTy, -inf, -inF, -infinitY, -InfinitY, nan, NaN, Nan ],
-`,
-		wantMessage: &pb2.Repeats{
-			RptFloat: []float32{
-				float32(math.Inf(1)),
-				float32(math.Inf(1)),
-				float32(math.Inf(1)),
-				float32(math.Inf(1)),
-				float32(math.Inf(-1)),
-				float32(math.Inf(-1)),
-				float32(math.Inf(-1)),
-				float32(math.Inf(-1)),
-				float32(math.NaN()),
-				float32(math.NaN()),
-				float32(math.NaN()),
-			},
-			RptDouble: []float64{
-				math.Inf(1),
-				math.Inf(1),
-				math.Inf(1),
-				math.Inf(1),
-				math.Inf(-1),
-				math.Inf(-1),
-				math.Inf(-1),
-				math.Inf(-1),
-				math.NaN(),
-				math.NaN(),
-				math.NaN(),
-			},
-		},
-	}, {
-		desc:         "map fields 1",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: -101
-  value: "-101"
-}
-int32_to_str {
-  key: 0
-  value: "zero"
-}
-bool_to_uint32: {
-  key: false
-  value: 101
-}
-int32_to_str: {
-  key: 255
-  value: "0xff"
-}
-bool_to_uint32 {
-  key: true
-  value: 42
-}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				-101: "-101",
-				0xff: "0xff",
-				0:    "zero",
-			},
-			BoolToUint32: map[bool]uint32{
-				true:  42,
-				false: 101,
-			},
-		},
-	}, {
-		desc:         "map fields 2",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-uint64_to_enum: {
-  key: 1
-  value: ONE
-}
-uint64_to_enum: {
-  key: 2
-  value: 2
-}
-uint64_to_enum: {
-  key: 10
-  value: 101
-}
-`,
-		wantMessage: &pb3.Maps{
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				1:  pb3.Enum_ONE,
-				2:  pb3.Enum_TWO,
-				10: 101,
-			},
-		},
-	}, {
-		desc:         "map fields 3",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-str_to_nested: {
-  key: "nested_one"
-  value {
-    s_string: "nested in a map"
-  }
-}
-`,
-		wantMessage: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested_one": &pb3.Nested{
-					SString: "nested in a map",
-				},
-			},
-		},
-	}, {
-		desc:         "map fields 4",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-str_to_oneofs: {
-  key: "nested"
-  value: {
-    oneof_nested: {
-      s_string: "nested oneof in map field value"
-    }
-  }
-}
-str_to_oneofs: {
-  key: "string"
-  value: {
-    oneof_string: "hello"
-  }
-}
-`,
-		wantMessage: &pb3.Maps{
-			StrToOneofs: map[string]*pb3.Oneofs{
-				"string": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofString{
-						OneofString: "hello",
-					},
-				},
-				"nested": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofNested{
-						OneofNested: &pb3.Nested{
-							SString: "nested oneof in map field value",
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:         "map contains duplicate keys",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 0
-  value: "cero"
-}
-int32_to_str: {
-  key: 0
-  value: "zero"
-}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				0: "zero",
-			},
-		},
-	}, {
-		desc:         "map contains duplicate key fields",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 0
-  key: 1
-  value: "cero"
-}
-`,
-		wantErr: `map entry "key" cannot be repeated`,
-	}, {
-		desc:         "map contains duplicate value fields",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 1
-  value: "cero"
-  value: "uno"
-}
-`,
-		wantErr: `map entry "value" cannot be repeated`,
-	}, {
-		desc:         "map contains missing key",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  value: "zero"
-}
-bool_to_uint32: {
-  value: 47
-}
-str_to_nested: {
-  value: {}
-}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				0: "zero",
-			},
-			BoolToUint32: map[bool]uint32{
-				false: 47,
-			},
-			StrToNested: map[string]*pb3.Nested{
-				"": {},
-			},
-		},
-	}, {
-		desc:         "map contains missing value",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 100
-}
-bool_to_uint32: {
-  key: true
-}
-uint64_to_enum: {
-  key: 101
-}
-str_to_nested: {
-  key: "hello"
-}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				100: "",
-			},
-			BoolToUint32: map[bool]uint32{
-				true: 0,
-			},
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				101: pb3.Enum_ZERO,
-			},
-			StrToNested: map[string]*pb3.Nested{
-				"hello": {},
-			},
-		},
-	}, {
-		desc:         "map contains missing key and value",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {}
-bool_to_uint32: {}
-uint64_to_enum: {}
-str_to_nested: {}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				0: "",
-			},
-			BoolToUint32: map[bool]uint32{
-				false: 0,
-			},
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				0: pb3.Enum_ZERO,
-			},
-			StrToNested: map[string]*pb3.Nested{
-				"": {},
-			},
-		},
-	}, {
-		desc:         "map contains overriding entries",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 0
-}
-int32_to_str: {
-  value: "empty"
-}
-int32_to_str: {}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				0: "",
-			},
-		},
-	}, {
-		desc:         "proto2 map field value contains invalid UTF-8",
-		inputMessage: &pb2.Maps{},
-		inputText: `int32_to_str: {
-  key: 101
-  value: "abc\xff"
-}
-`,
-		wantMessage: &pb2.Maps{
-			Int32ToStr: map[int32]string{101: "abc\xff"},
-		},
-	}, {
-		desc:         "proto2 map field key contains invalid UTF-8",
-		inputMessage: &pb2.Maps{},
-		inputText: `str_to_nested: {
-  key: "abc\xff"
-  value: {}
-}
-`,
-		wantMessage: &pb2.Maps{
-			StrToNested: map[string]*pb2.Nested{"abc\xff": {}},
-		},
-	}, {
-		desc:         "proto3 map field value contains invalid UTF-8",
-		inputMessage: &pb3.Maps{},
-		inputText: `int32_to_str: {
-  key: 101
-  value: "abc\xff"
-}
-`,
-		wantErr: "contains invalid UTF-8",
-	}, {
-		desc:         "proto3 map field key contains invalid UTF-8",
-		inputMessage: &pb3.Maps{},
-		inputText: `str_to_nested: {
-  key: "abc\xff"
-  value: {}
-}
-`,
-		wantErr: "contains invalid UTF-8",
-	}, {
-		desc:         "map contains unknown field",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 0
-  value: "cero"
-  unknown: "bad"
-}
-`,
-		wantErr: `(line 5:3): unknown map entry field "unknown"`,
-	}, {
-		desc:         "map contains extension-like key field",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  [key]: 10
-  value: "ten"
-}
-`,
-		wantErr: `unknown map entry field "[key]"`,
-	}, {
-		desc:         "map contains invalid key",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: "invalid"
-  value: "cero"
-}
-`,
-		wantErr: "(line 3:8): invalid value for int32 type",
-	}, {
-		desc:         "map contains invalid value",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 100
-  value: 101
-}
-`,
-		wantErr: "(line 4:10): invalid value for string type",
-	}, {
-		desc:         "map contains invalid message value",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-str_to_nested: {
-  key: "one"
-  value: 1
-}
-`,
-		wantErr: "syntax error (line 4:10): unexpected token: 1",
-	}, {
-		desc:         "map using mix of [] and repeated",
-		inputMessage: &pb3.Maps{},
-		inputText: `
-int32_to_str: {
-  key: 1
-  value: "one"
-}
-int32_to_str: [
-  {
-    key: 2
-    value: "not this"
-  },
-  {
-  },
-  {
-    key: 3
-    value: "three"
-  }
-]
-int32_to_str: {
-  key: 2
-  value: "two"
-}
-`,
-		wantMessage: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				0: "",
-				1: "one",
-				2: "two",
-				3: "three",
-			},
-		},
-	}, {
-		desc:         "required fields not set",
-		inputMessage: &pb2.Requireds{},
-		wantErr:      "required field",
-	}, {
-		desc:         "required field set",
-		inputMessage: &pb2.PartialRequired{},
-		inputText:    "req_string: 'this is required'",
-		wantMessage: &pb2.PartialRequired{
-			ReqString: proto.String("this is required"),
-		},
-	}, {
-		desc:         "required fields partially set",
-		inputMessage: &pb2.Requireds{},
-		inputText: `
-req_bool: false
-req_sfixed64: 3203386110
-req_string: "hello"
-req_enum: ONE
-`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0xbeefcafe),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		wantErr: "required field",
-	}, {
-		desc:         "required fields partially set with AllowPartial",
-		umo:          prototext.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.Requireds{},
-		inputText: `
-req_bool: false
-req_sfixed64: 3203386110
-req_string: "hello"
-req_enum: ONE
-`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0xbeefcafe),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-	}, {
-		desc:         "required fields all set",
-		inputMessage: &pb2.Requireds{},
-		inputText: `
-req_bool: false
-req_sfixed64: 0
-req_double: 0
-req_string: ""
-req_enum: ONE
-req_nested: {}
-`,
-		wantMessage: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0),
-			ReqDouble:   proto.Float64(0),
-			ReqString:   proto.String(""),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-			ReqNested:   &pb2.Nested{},
-		},
-	}, {
-		desc:         "indirect required field",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText:    "opt_nested: {}",
-		wantMessage: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		wantErr: "required field",
-	}, {
-		desc:         "indirect required field with AllowPartial",
-		umo:          prototext.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText:    "opt_nested: {}",
-		wantMessage: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-	}, {
-		desc:         "indirect required field in repeated",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `
-rpt_nested: {
-  req_string: "one"
-}
-rpt_nested: {}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				{
-					ReqString: proto.String("one"),
-				},
-				{},
-			},
-		},
-		wantErr: "required field",
-	}, {
-		desc:         "indirect required field in repeated with AllowPartial",
-		umo:          prototext.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `
-rpt_nested: {
-  req_string: "one"
-}
-rpt_nested: {}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				{
-					ReqString: proto.String("one"),
-				},
-				{},
-			},
-		},
-	}, {
-		desc:         "indirect required field in map",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `
-str_to_nested: {
-  key: "missing"
-}
-str_to_nested: {
-  key: "contains"
-  value: {
-    req_string: "here"
-  }
-}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"missing": &pb2.NestedWithRequired{},
-				"contains": &pb2.NestedWithRequired{
-					ReqString: proto.String("here"),
-				},
-			},
-		},
-		wantErr: "required field",
-	}, {
-		desc:         "indirect required field in map with AllowPartial",
-		umo:          prototext.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `
-str_to_nested: {
-  key: "missing"
-}
-str_to_nested: {
-  key: "contains"
-  value: {
-    req_string: "here"
-  }
-}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"missing": &pb2.NestedWithRequired{},
-				"contains": &pb2.NestedWithRequired{
-					ReqString: proto.String("here"),
-				},
-			},
-		},
-	}, {
-		desc:         "indirect required field in oneof",
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `oneof_nested: {}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		wantErr: "required field",
-	}, {
-		desc:         "indirect required field in oneof with AllowPartial",
-		umo:          prototext.UnmarshalOptions{AllowPartial: true},
-		inputMessage: &pb2.IndirectRequired{},
-		inputText: `oneof_nested: {}
-`,
-		wantMessage: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-	}, {
-		desc:         "ignore reserved field",
-		inputMessage: &pb2.Nests{},
-		inputText:    "reserved_field: 'ignore this'",
-		wantMessage:  &pb2.Nests{},
-	}, {
-		desc:         "extensions of non-repeated fields",
-		inputMessage: &pb2.Extensions{},
-		inputText: `opt_string: "non-extension field"
-[pb2.opt_ext_bool]: true
-opt_bool: true
-[pb2.opt_ext_nested]: {
-  opt_string: "nested in an extension"
-  opt_nested: {
-    opt_string: "another nested in an extension"
-  }
-}
-[pb2.opt_ext_string]: "extension field"
-opt_int32: 42
-[pb2.opt_ext_enum]: TEN
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extension field contains invalid UTF-8",
-		inputMessage: &pb2.Extensions{},
-		inputText:    `[pb2.opt_ext_string]: "abc\xff"`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtString, "abc\xff")
-			return m
-		}(),
-	}, {
-		desc:         "extensions of repeated fields",
-		inputMessage: &pb2.Extensions{},
-		inputText: `[pb2.rpt_ext_enum]: TEN
-[pb2.rpt_ext_enum]: 101
-[pb2.rpt_ext_fixed32]: 42
-[pb2.rpt_ext_enum]: ONE
-[pb2.rpt_ext_nested]: {
-  opt_string: "one"
-}
-[pb2.rpt_ext_nested]: {
-  opt_string: "two"
-}
-[pb2.rpt_ext_fixed32]: 47
-[pb2.rpt_ext_nested]: {
-  opt_string: "three"
-}
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_RptExtFixed32, []uint32{42, 47})
-			proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extensions of non-repeated fields in another message",
-		inputMessage: &pb2.Extensions{},
-		inputText: `[pb2.ExtensionsContainer.opt_ext_bool]: true
-[pb2.ExtensionsContainer.opt_ext_enum]: TEN
-[pb2.ExtensionsContainer.opt_ext_nested]: {
-  opt_string: "nested in an extension"
-  opt_nested: {
-    opt_string: "another nested in an extension"
-  }
-}
-[pb2.ExtensionsContainer.opt_ext_string]: "extension field"
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "extensions of repeated fields in another message",
-		inputMessage: &pb2.Extensions{},
-		inputText: `opt_string: "non-extension field"
-opt_bool: true
-opt_int32: 42
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "one"
-}
-[pb2.ExtensionsContainer.rpt_ext_enum]: TEN
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "two"
-}
-[pb2.ExtensionsContainer.rpt_ext_enum]: 101
-[pb2.ExtensionsContainer.rpt_ext_string]: "hello"
-[pb2.ExtensionsContainer.rpt_ext_enum]: ONE
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "three"
-}
-[pb2.ExtensionsContainer.rpt_ext_string]: "world"
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtString, []string{"hello", "world"})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-	}, {
-		desc:         "invalid extension field name",
-		inputMessage: &pb2.Extensions{},
-		inputText:    "[pb2.invalid_message_field]: true",
-		wantErr:      "unknown field",
-	}, {
-		desc:         "MessageSet",
-		inputMessage: &pb2.MessageSet{},
-		inputText: `
-[pb2.MessageSetExtension]: {
-  opt_string: "a messageset extension"
-}
-[pb2.MessageSetExtension.ext_nested]: {
-  opt_string: "just a regular extension"
-}
-[pb2.MessageSetExtension.not_message_set_extension]: {
-  opt_string: "not a messageset extension"
-}
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
-				OptString: proto.String("just a regular extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 1",
-		inputMessage: &pb2.FakeMessageSet{},
-		inputText: `
-[pb2.FakeMessageSetExtension.message_set_extension]: {
-  opt_string: "not a messageset extension"
-}
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.FakeMessageSet{}
-			proto.SetExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 2",
-		inputMessage: &pb2.FakeMessageSet{},
-		inputText: `
-[pb2.FakeMessageSetExtension]: {
-  opt_string: "not a messageset extension"
-}
-`,
-		wantErr: `unable to resolve [[pb2.FakeMessageSetExtension]]: found wrong type`,
-		skip:    !flags.ProtoLegacy,
-	}, {
-		desc:         "not real MessageSet 3",
-		inputMessage: &pb2.MessageSet{},
-		inputText: `
-[pb2.message_set_extension]: {
-  opt_string: "another not a messageset extension"
-}`,
-		wantMessage: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("another not a messageset extension"),
-			})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "Any not expanded",
-		inputMessage: &anypb.Any{},
-		inputText: `
-type_url: "pb2.Nested"
-value: "some bytes"
-`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "pb2.Nested",
-			Value:   []byte("some bytes"),
-		},
-	}, {
-		desc:         "Any not expanded missing value",
-		inputMessage: &anypb.Any{},
-		inputText:    `type_url: "pb2.Nested"`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "pb2.Nested",
-		},
-	}, {
-		desc:         "Any not expanded missing type_url",
-		inputMessage: &anypb.Any{},
-		inputText:    `value: "some bytes"`,
-		wantMessage: &anypb.Any{
-			Value: []byte("some bytes"),
-		},
-	}, {
-		desc:         "Any expanded",
-		inputMessage: &anypb.Any{},
-		inputText: `
-[foobar/pb2.Nested]: {
-  opt_string: "embedded inside Any"
-  opt_nested: {
-    opt_string: "inception"
-  }
-}
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "foobar/pb2.Nested",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any expanded with empty value",
-		inputMessage: &anypb.Any{},
-		inputText:    `[foo.com/pb2.Nested]: {}`,
-		wantMessage: &anypb.Any{
-			TypeUrl: "foo.com/pb2.Nested",
-		},
-	}, {
-		desc:         "Any expanded with missing required",
-		inputMessage: &anypb.Any{},
-		inputText: `
-[pb2.PartialRequired]: {
-  opt_string: "embedded inside Any"
-}
-`,
-		wantMessage: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				AllowPartial:  true,
-				Deterministic: true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "pb2.PartialRequired",
-				Value:   b,
-			}
-		}(),
-	}, {
-		desc:         "Any with invalid UTF-8",
-		inputMessage: &anypb.Any{},
-		inputText: `
-[pb3.Nested]: {
-  s_string: "abc\xff"
-}
-`,
-		wantErr: "contains invalid UTF-8",
-	}, {
-		desc:         "Any expanded with unregistered type",
-		umo:          prototext.UnmarshalOptions{Resolver: new(protoregistry.Types)},
-		inputMessage: &anypb.Any{},
-		inputText:    `[SomeMessage]: {}`,
-		wantErr:      "unable to resolve message [SomeMessage]",
-	}, {
-		desc:         "Any expanded with invalid value",
-		inputMessage: &anypb.Any{},
-		inputText:    `[pb2.Nested]: 123`,
-		wantErr:      "unexpected token: 123",
-	}, {
-		desc:         "Any expanded with unknown fields",
-		inputMessage: &anypb.Any{},
-		inputText: `
-[pb2.Nested]: {}
-unknown: ""
-`,
-		wantErr: `invalid field name "unknown" in google.protobuf.Any message`,
-	}, {
-		desc:         "Any contains expanded and unexpanded fields",
-		inputMessage: &anypb.Any{},
-		inputText: `
-[pb2.Nested]: {}
-type_url: "pb2.Nested"
-`,
-		wantErr: "(line 3:1): conflict with [pb2.Nested] field",
-	}, {
-		desc:         "weak fields",
-		inputMessage: &testpb.TestWeak{},
-		inputText:    `weak_message1:{a:1}`,
-		wantMessage: func() *testpb.TestWeak {
-			m := new(testpb.TestWeak)
-			m.SetWeakMessage1(&weakpb.WeakImportMessage1{A: proto.Int32(1)})
-			return m
-		}(),
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc:         "weak fields; unknown field",
-		inputMessage: &testpb.TestWeak{},
-		inputText:    `weak_message1:{a:1} weak_message2:{a:1}`,
-		wantErr:      "unknown field: weak_message2", // weak_message2 is unknown since the package containing it is not imported
-		skip:         !flags.ProtoLegacy,
-	}}
-
-	for _, tt := range tests {
-		tt := tt
-		if tt.skip {
-			continue
-		}
-		t.Run(tt.desc, func(t *testing.T) {
-			err := tt.umo.Unmarshal([]byte(tt.inputText), tt.inputMessage)
-			if err != nil {
-				if tt.wantErr == "" {
-					t.Errorf("Unmarshal() got unexpected error: %v", err)
-				} else if !strings.Contains(err.Error(), tt.wantErr) {
-					t.Errorf("Unmarshal() error got %q, want %q", err, tt.wantErr)
-				}
-				return
-			}
-			if tt.wantErr != "" {
-				t.Errorf("Unmarshal() got nil error, want error %q", tt.wantErr)
-				return
-			}
-			if tt.wantMessage != nil && !proto.Equal(tt.inputMessage, tt.wantMessage) {
-				t.Errorf("Unmarshal()\n<got>\n%v\n<want>\n%v\n", tt.inputMessage, tt.wantMessage)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/encode.go b/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
index 722a7b41df3..95967e8112a 100644
--- a/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
+++ b/vendor/google.golang.org/protobuf/encoding/prototext/encode.go
@@ -33,7 +33,7 @@ func Format(m proto.Message) string {
 	return MarshalOptions{Multiline: true}.Format(m)
 }
 
-// Marshal writes the given proto.Message in textproto format using default
+// Marshal writes the given [proto.Message] in textproto format using default
 // options. Do not depend on the output being stable. It may change over time
 // across different versions of the program.
 func Marshal(m proto.Message) ([]byte, error) {
@@ -97,7 +97,7 @@ func (o MarshalOptions) Format(m proto.Message) string {
 	return string(b)
 }
 
-// Marshal writes the given proto.Message in textproto format using options in
+// Marshal writes the given [proto.Message] in textproto format using options in
 // MarshalOptions object. Do not depend on the output being stable. It may
 // change over time across different versions of the program.
 func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/encode_test.go b/vendor/google.golang.org/protobuf/encoding/prototext/encode_test.go
deleted file mode 100644
index 65b93cb4073..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/prototext/encode_test.go
+++ /dev/null
@@ -1,1479 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package prototext_test
-
-import (
-	"bytes"
-	"math"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/testing/protopack"
-
-	pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
-	pb3 "google.golang.org/protobuf/internal/testprotos/textpb3"
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-func init() {
-	// Disable detrand to enable direct comparisons on outputs.
-	detrand.Disable()
-}
-
-func TestMarshal(t *testing.T) {
-	tests := []struct {
-		desc    string
-		mo      prototext.MarshalOptions
-		input   proto.Message
-		want    string
-		wantErr bool // TODO: Verify error message content.
-		skip    bool
-	}{{
-		desc:  "proto2 optional scalars not set",
-		input: &pb2.Scalars{},
-		want:  "",
-	}, {
-		desc:  "proto3 scalars not set",
-		input: &pb3.Scalars{},
-		want:  "",
-	}, {
-		desc:  "proto3 optional not set",
-		input: &pb3.Proto3Optional{},
-		want:  "",
-	}, {
-		desc: "proto2 optional scalars set to zero values",
-		input: &pb2.Scalars{
-			OptBool:     proto.Bool(false),
-			OptInt32:    proto.Int32(0),
-			OptInt64:    proto.Int64(0),
-			OptUint32:   proto.Uint32(0),
-			OptUint64:   proto.Uint64(0),
-			OptSint32:   proto.Int32(0),
-			OptSint64:   proto.Int64(0),
-			OptFixed32:  proto.Uint32(0),
-			OptFixed64:  proto.Uint64(0),
-			OptSfixed32: proto.Int32(0),
-			OptSfixed64: proto.Int64(0),
-			OptFloat:    proto.Float32(0),
-			OptDouble:   proto.Float64(0),
-			OptBytes:    []byte{},
-			OptString:   proto.String(""),
-		},
-		want: `opt_bool: false
-opt_int32: 0
-opt_int64: 0
-opt_uint32: 0
-opt_uint64: 0
-opt_sint32: 0
-opt_sint64: 0
-opt_fixed32: 0
-opt_fixed64: 0
-opt_sfixed32: 0
-opt_sfixed64: 0
-opt_float: 0
-opt_double: 0
-opt_bytes: ""
-opt_string: ""
-`,
-	}, {
-		desc: "proto3 optional set to zero values",
-		input: &pb3.Proto3Optional{
-			OptBool:    proto.Bool(false),
-			OptInt32:   proto.Int32(0),
-			OptInt64:   proto.Int64(0),
-			OptUint32:  proto.Uint32(0),
-			OptUint64:  proto.Uint64(0),
-			OptFloat:   proto.Float32(0),
-			OptDouble:  proto.Float64(0),
-			OptString:  proto.String(""),
-			OptBytes:   []byte{},
-			OptEnum:    pb3.Enum_ZERO.Enum(),
-			OptMessage: &pb3.Nested{},
-		},
-		want: `opt_bool: false
-opt_int32: 0
-opt_int64: 0
-opt_uint32: 0
-opt_uint64: 0
-opt_float: 0
-opt_double: 0
-opt_string: ""
-opt_bytes: ""
-opt_enum: ZERO
-opt_message: {}
-`,
-	}, {
-		desc: "proto3 scalars set to zero values",
-		input: &pb3.Scalars{
-			SBool:     false,
-			SInt32:    0,
-			SInt64:    0,
-			SUint32:   0,
-			SUint64:   0,
-			SSint32:   0,
-			SSint64:   0,
-			SFixed32:  0,
-			SFixed64:  0,
-			SSfixed32: 0,
-			SSfixed64: 0,
-			SFloat:    0,
-			SDouble:   0,
-			SBytes:    []byte{},
-			SString:   "",
-		},
-		want: "",
-	}, {
-		desc: "proto2 optional scalars set to some values",
-		input: &pb2.Scalars{
-			OptBool:     proto.Bool(true),
-			OptInt32:    proto.Int32(0xff),
-			OptInt64:    proto.Int64(0xdeadbeef),
-			OptUint32:   proto.Uint32(47),
-			OptUint64:   proto.Uint64(0xdeadbeef),
-			OptSint32:   proto.Int32(-1001),
-			OptSint64:   proto.Int64(-0xffff),
-			OptFixed64:  proto.Uint64(64),
-			OptSfixed32: proto.Int32(-32),
-			OptFloat:    proto.Float32(1.02),
-			OptDouble:   proto.Float64(1.0199999809265137),
-			OptBytes:    []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
-			OptString:   proto.String("谷歌"),
-		},
-		want: `opt_bool: true
-opt_int32: 255
-opt_int64: 3735928559
-opt_uint32: 47
-opt_uint64: 3735928559
-opt_sint32: -1001
-opt_sint64: -65535
-opt_fixed64: 64
-opt_sfixed32: -32
-opt_float: 1.02
-opt_double: 1.0199999809265137
-opt_bytes: "谷歌"
-opt_string: "谷歌"
-`,
-	}, {
-		desc: "proto2 string with invalid UTF-8",
-		input: &pb2.Scalars{
-			OptString: proto.String("abc\xff"),
-		},
-		want: `opt_string: "abc\xff"
-`,
-	}, {
-		desc: "proto3 string with invalid UTF-8",
-		input: &pb3.Scalars{
-			SString: "abc\xff",
-		},
-		wantErr: true,
-	}, {
-		desc: "float nan",
-		input: &pb3.Scalars{
-			SFloat: float32(math.NaN()),
-		},
-		want: "s_float: nan\n",
-	}, {
-		desc: "float positive infinity",
-		input: &pb3.Scalars{
-			SFloat: float32(math.Inf(1)),
-		},
-		want: "s_float: inf\n",
-	}, {
-		desc: "float negative infinity",
-		input: &pb3.Scalars{
-			SFloat: float32(math.Inf(-1)),
-		},
-		want: "s_float: -inf\n",
-	}, {
-		desc: "double nan",
-		input: &pb3.Scalars{
-			SDouble: math.NaN(),
-		},
-		want: "s_double: nan\n",
-	}, {
-		desc: "double positive infinity",
-		input: &pb3.Scalars{
-			SDouble: math.Inf(1),
-		},
-		want: "s_double: inf\n",
-	}, {
-		desc: "double negative infinity",
-		input: &pb3.Scalars{
-			SDouble: math.Inf(-1),
-		},
-		want: "s_double: -inf\n",
-	}, {
-		desc:  "proto2 enum not set",
-		input: &pb2.Enums{},
-		want:  "",
-	}, {
-		desc: "proto2 enum set to zero value",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(0).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(0).Enum(),
-		},
-		want: `opt_enum: 0
-opt_nested_enum: 0
-`,
-	}, {
-		desc: "proto2 enum",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum_ONE.Enum(),
-			OptNestedEnum: pb2.Enums_UNO.Enum(),
-		},
-		want: `opt_enum: ONE
-opt_nested_enum: UNO
-`,
-	}, {
-		desc: "proto2 enum set to numeric values",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(2).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(2).Enum(),
-		},
-		want: `opt_enum: TWO
-opt_nested_enum: DOS
-`,
-	}, {
-		desc: "proto2 enum set to unnamed numeric values",
-		input: &pb2.Enums{
-			OptEnum:       pb2.Enum(101).Enum(),
-			OptNestedEnum: pb2.Enums_NestedEnum(-101).Enum(),
-		},
-		want: `opt_enum: 101
-opt_nested_enum: -101
-`,
-	}, {
-		desc:  "proto3 enum not set",
-		input: &pb3.Enums{},
-		want:  "",
-	}, {
-		desc: "proto3 enum set to zero value",
-		input: &pb3.Enums{
-			SEnum:       pb3.Enum_ZERO,
-			SNestedEnum: pb3.Enums_CERO,
-		},
-		want: "",
-	}, {
-		desc: "proto3 enum",
-		input: &pb3.Enums{
-			SEnum:       pb3.Enum_ONE,
-			SNestedEnum: pb3.Enums_UNO,
-		},
-		want: `s_enum: ONE
-s_nested_enum: UNO
-`,
-	}, {
-		desc: "proto3 enum set to numeric values",
-		input: &pb3.Enums{
-			SEnum:       2,
-			SNestedEnum: 2,
-		},
-		want: `s_enum: TWO
-s_nested_enum: DOS
-`,
-	}, {
-		desc: "proto3 enum set to unnamed numeric values",
-		input: &pb3.Enums{
-			SEnum:       -47,
-			SNestedEnum: 47,
-		},
-		want: `s_enum: -47
-s_nested_enum: 47
-`,
-	}, {
-		desc:  "proto2 nested message not set",
-		input: &pb2.Nests{},
-		want:  "",
-	}, {
-		desc: "proto2 nested message set to empty",
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{},
-			Optgroup:  &pb2.Nests_OptGroup{},
-		},
-		want: `opt_nested: {}
-OptGroup: {}
-`,
-	}, {
-		desc: "proto2 nested messages",
-		input: &pb2.Nests{
-			OptNested: &pb2.Nested{
-				OptString: proto.String("nested message"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested message"),
-				},
-			},
-		},
-		want: `opt_nested: {
-  opt_string: "nested message"
-  opt_nested: {
-    opt_string: "another nested message"
-  }
-}
-`,
-	}, {
-		desc: "proto2 groups",
-		input: &pb2.Nests{
-			Optgroup: &pb2.Nests_OptGroup{
-				OptString: proto.String("inside a group"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("nested message inside a group"),
-				},
-				Optnestedgroup: &pb2.Nests_OptGroup_OptNestedGroup{
-					OptFixed32: proto.Uint32(47),
-				},
-			},
-		},
-		want: `OptGroup: {
-  opt_string: "inside a group"
-  opt_nested: {
-    opt_string: "nested message inside a group"
-  }
-  OptNestedGroup: {
-    opt_fixed32: 47
-  }
-}
-`,
-	}, {
-		desc:  "proto3 nested message not set",
-		input: &pb3.Nests{},
-		want:  "",
-	}, {
-		desc: "proto3 nested message set to empty",
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{},
-		},
-		want: "s_nested: {}\n",
-	}, {
-		desc: "proto3 nested message",
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{
-				SString: "nested message",
-				SNested: &pb3.Nested{
-					SString: "another nested message",
-				},
-			},
-		},
-		want: `s_nested: {
-  s_string: "nested message"
-  s_nested: {
-    s_string: "another nested message"
-  }
-}
-`,
-	}, {
-		desc: "proto3 nested message contains invalid UTF-8",
-		input: &pb3.Nests{
-			SNested: &pb3.Nested{
-				SString: "abc\xff",
-			},
-		},
-		wantErr: true,
-	}, {
-		desc:  "oneof not set",
-		input: &pb3.Oneofs{},
-		want:  "",
-	}, {
-		desc: "oneof set to empty string",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{},
-		},
-		want: `oneof_string: ""
-`,
-	}, {
-		desc: "oneof set to string",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofString{
-				OneofString: "hello",
-			},
-		},
-		want: `oneof_string: "hello"
-`,
-	}, {
-		desc: "oneof set to enum",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofEnum{
-				OneofEnum: pb3.Enum_ZERO,
-			},
-		},
-		want: `oneof_enum: ZERO
-`,
-	}, {
-		desc: "oneof set to empty message",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{},
-			},
-		},
-		want: "oneof_nested: {}\n",
-	}, {
-		desc: "oneof set to message",
-		input: &pb3.Oneofs{
-			Union: &pb3.Oneofs_OneofNested{
-				OneofNested: &pb3.Nested{
-					SString: "nested message",
-				},
-			},
-		},
-		want: `oneof_nested: {
-  s_string: "nested message"
-}
-`,
-	}, {
-		desc:  "repeated fields not set",
-		input: &pb2.Repeats{},
-		want:  "",
-	}, {
-		desc: "repeated fields set to empty slices",
-		input: &pb2.Repeats{
-			RptBool:   []bool{},
-			RptInt32:  []int32{},
-			RptInt64:  []int64{},
-			RptUint32: []uint32{},
-			RptUint64: []uint64{},
-			RptFloat:  []float32{},
-			RptDouble: []float64{},
-			RptBytes:  [][]byte{},
-		},
-		want: "",
-	}, {
-		desc: "repeated fields set to some values",
-		input: &pb2.Repeats{
-			RptBool:   []bool{true, false, true, true},
-			RptInt32:  []int32{1, 6, 0, 0},
-			RptInt64:  []int64{-64, 47},
-			RptUint32: []uint32{0xff, 0xffff},
-			RptUint64: []uint64{0xdeadbeef},
-			RptFloat:  []float32{float32(math.NaN()), float32(math.Inf(1)), float32(math.Inf(-1)), 1.034},
-			RptDouble: []float64{math.NaN(), math.Inf(1), math.Inf(-1), 1.23e-308},
-			RptString: []string{"hello", "世界"},
-			RptBytes: [][]byte{
-				[]byte("hello"),
-				[]byte("\xe4\xb8\x96\xe7\x95\x8c"),
-			},
-		},
-		want: `rpt_bool: true
-rpt_bool: false
-rpt_bool: true
-rpt_bool: true
-rpt_int32: 1
-rpt_int32: 6
-rpt_int32: 0
-rpt_int32: 0
-rpt_int64: -64
-rpt_int64: 47
-rpt_uint32: 255
-rpt_uint32: 65535
-rpt_uint64: 3735928559
-rpt_float: nan
-rpt_float: inf
-rpt_float: -inf
-rpt_float: 1.034
-rpt_double: nan
-rpt_double: inf
-rpt_double: -inf
-rpt_double: 1.23e-308
-rpt_string: "hello"
-rpt_string: "世界"
-rpt_bytes: "hello"
-rpt_bytes: "世界"
-`,
-	}, {
-		desc: "repeated proto2 contains invalid UTF-8",
-		input: &pb2.Repeats{
-			RptString: []string{"abc\xff"},
-		},
-		want: `rpt_string: "abc\xff"
-`,
-	}, {
-		desc: "repeated proto3 contains invalid UTF-8",
-		input: &pb3.Repeats{
-			RptString: []string{"abc\xff"},
-		},
-		wantErr: true,
-	}, {
-		desc: "repeated enums",
-		input: &pb2.Enums{
-			RptEnum:       []pb2.Enum{pb2.Enum_ONE, 2, pb2.Enum_TEN, 42},
-			RptNestedEnum: []pb2.Enums_NestedEnum{2, 47, 10},
-		},
-		want: `rpt_enum: ONE
-rpt_enum: TWO
-rpt_enum: TEN
-rpt_enum: 42
-rpt_nested_enum: DOS
-rpt_nested_enum: 47
-rpt_nested_enum: DIEZ
-`,
-	}, {
-		desc: "repeated messages set to empty",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{},
-			Rptgroup:  []*pb2.Nests_RptGroup{},
-		},
-		want: "",
-	}, {
-		desc: "repeated messages",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{
-				{
-					OptString: proto.String("repeat nested one"),
-				},
-				{
-					OptString: proto.String("repeat nested two"),
-					OptNested: &pb2.Nested{
-						OptString: proto.String("inside repeat nested two"),
-					},
-				},
-				{},
-			},
-		},
-		want: `rpt_nested: {
-  opt_string: "repeat nested one"
-}
-rpt_nested: {
-  opt_string: "repeat nested two"
-  opt_nested: {
-    opt_string: "inside repeat nested two"
-  }
-}
-rpt_nested: {}
-`,
-	}, {
-		desc: "repeated messages contains nil value",
-		input: &pb2.Nests{
-			RptNested: []*pb2.Nested{nil, {}},
-		},
-		want: `rpt_nested: {}
-rpt_nested: {}
-`,
-	}, {
-		desc: "repeated groups",
-		input: &pb2.Nests{
-			Rptgroup: []*pb2.Nests_RptGroup{
-				{
-					RptString: []string{"hello", "world"},
-				},
-				{},
-				nil,
-			},
-		},
-		want: `RptGroup: {
-  rpt_string: "hello"
-  rpt_string: "world"
-}
-RptGroup: {}
-RptGroup: {}
-`,
-	}, {
-		desc:  "map fields not set",
-		input: &pb3.Maps{},
-		want:  "",
-	}, {
-		desc: "map fields set to empty",
-		input: &pb3.Maps{
-			Int32ToStr:   map[int32]string{},
-			BoolToUint32: map[bool]uint32{},
-			Uint64ToEnum: map[uint64]pb3.Enum{},
-			StrToNested:  map[string]*pb3.Nested{},
-			StrToOneofs:  map[string]*pb3.Oneofs{},
-		},
-		want: "",
-	}, {
-		desc: "map fields 1",
-		input: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				-101: "-101",
-				0xff: "0xff",
-				0:    "zero",
-			},
-			BoolToUint32: map[bool]uint32{
-				true:  42,
-				false: 101,
-			},
-		},
-		want: `int32_to_str: {
-  key: -101
-  value: "-101"
-}
-int32_to_str: {
-  key: 0
-  value: "zero"
-}
-int32_to_str: {
-  key: 255
-  value: "0xff"
-}
-bool_to_uint32: {
-  key: false
-  value: 101
-}
-bool_to_uint32: {
-  key: true
-  value: 42
-}
-`,
-	}, {
-		desc: "map fields 2",
-		input: &pb3.Maps{
-			Uint64ToEnum: map[uint64]pb3.Enum{
-				1:  pb3.Enum_ONE,
-				2:  pb3.Enum_TWO,
-				10: pb3.Enum_TEN,
-				47: 47,
-			},
-		},
-		want: `uint64_to_enum: {
-  key: 1
-  value: ONE
-}
-uint64_to_enum: {
-  key: 2
-  value: TWO
-}
-uint64_to_enum: {
-  key: 10
-  value: TEN
-}
-uint64_to_enum: {
-  key: 47
-  value: 47
-}
-`,
-	}, {
-		desc: "map fields 3",
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nested": &pb3.Nested{
-					SString: "nested in a map",
-				},
-			},
-		},
-		want: `str_to_nested: {
-  key: "nested"
-  value: {
-    s_string: "nested in a map"
-  }
-}
-`,
-	}, {
-		desc: "map fields 4",
-		input: &pb3.Maps{
-			StrToOneofs: map[string]*pb3.Oneofs{
-				"string": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofString{
-						OneofString: "hello",
-					},
-				},
-				"nested": &pb3.Oneofs{
-					Union: &pb3.Oneofs_OneofNested{
-						OneofNested: &pb3.Nested{
-							SString: "nested oneof in map field value",
-						},
-					},
-				},
-			},
-		},
-		want: `str_to_oneofs: {
-  key: "nested"
-  value: {
-    oneof_nested: {
-      s_string: "nested oneof in map field value"
-    }
-  }
-}
-str_to_oneofs: {
-  key: "string"
-  value: {
-    oneof_string: "hello"
-  }
-}
-`,
-	}, {
-		desc: "proto2 map field value contains invalid UTF-8",
-		input: &pb2.Maps{
-			Int32ToStr: map[int32]string{
-				101: "abc\xff",
-			},
-		},
-		want: `int32_to_str: {
-  key: 101
-  value: "abc\xff"
-}
-`,
-	}, {
-		desc: "proto2 map field key contains invalid UTF-8",
-		input: &pb2.Maps{
-			StrToNested: map[string]*pb2.Nested{
-				"abc\xff": {},
-			},
-		},
-		want: `str_to_nested: {
-  key: "abc\xff"
-  value: {}
-}
-`,
-	}, {
-		desc: "proto3 map field value contains invalid UTF-8",
-		input: &pb3.Maps{
-			Int32ToStr: map[int32]string{
-				101: "abc\xff",
-			},
-		},
-		wantErr: true,
-	}, {
-		desc: "proto3 map field key contains invalid UTF-8",
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"abc\xff": {},
-			},
-		},
-		wantErr: true,
-	}, {
-		desc: "map field contains nil value",
-		input: &pb3.Maps{
-			StrToNested: map[string]*pb3.Nested{
-				"nil": nil,
-			},
-		},
-		want: `str_to_nested: {
-  key: "nil"
-  value: {}
-}
-`,
-	}, {
-		desc:    "required fields not set",
-		input:   &pb2.Requireds{},
-		want:    "",
-		wantErr: true,
-	}, {
-		desc: "required fields partially set",
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0xbeefcafe),
-			ReqDouble:   proto.Float64(math.NaN()),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		want: `req_bool: false
-req_sfixed64: 3203386110
-req_double: nan
-req_string: "hello"
-req_enum: ONE
-`,
-		wantErr: true,
-	}, {
-		desc: "required fields not set with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0xbeefcafe),
-			ReqDouble:   proto.Float64(math.NaN()),
-			ReqString:   proto.String("hello"),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-		},
-		want: `req_bool: false
-req_sfixed64: 3203386110
-req_double: nan
-req_string: "hello"
-req_enum: ONE
-`,
-	}, {
-		desc: "required fields all set",
-		input: &pb2.Requireds{
-			ReqBool:     proto.Bool(false),
-			ReqSfixed64: proto.Int64(0),
-			ReqDouble:   proto.Float64(1.23),
-			ReqString:   proto.String(""),
-			ReqEnum:     pb2.Enum_ONE.Enum(),
-			ReqNested:   &pb2.Nested{},
-		},
-		want: `req_bool: false
-req_sfixed64: 0
-req_double: 1.23
-req_string: ""
-req_enum: ONE
-req_nested: {}
-`,
-	}, {
-		desc: "indirect required field",
-		input: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		want:    "opt_nested: {}\n",
-		wantErr: true,
-	}, {
-		desc: "indirect required field with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			OptNested: &pb2.NestedWithRequired{},
-		},
-		want: "opt_nested: {}\n",
-	}, {
-		desc: "indirect required field in empty repeated",
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{},
-		},
-		want: "",
-	}, {
-		desc: "indirect required field in repeated",
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				&pb2.NestedWithRequired{},
-			},
-		},
-		want:    "rpt_nested: {}\n",
-		wantErr: true,
-	}, {
-		desc: "indirect required field in repeated with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			RptNested: []*pb2.NestedWithRequired{
-				&pb2.NestedWithRequired{},
-			},
-		},
-		want: "rpt_nested: {}\n",
-	}, {
-		desc: "indirect required field in empty map",
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{},
-		},
-		want: "",
-	}, {
-		desc: "indirect required field in map",
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"fail": &pb2.NestedWithRequired{},
-			},
-		},
-		want: `str_to_nested: {
-  key: "fail"
-  value: {}
-}
-`,
-		wantErr: true,
-	}, {
-		desc: "indirect required field in map with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			StrToNested: map[string]*pb2.NestedWithRequired{
-				"fail": &pb2.NestedWithRequired{},
-			},
-		},
-		want: `str_to_nested: {
-  key: "fail"
-  value: {}
-}
-`,
-	}, {
-		desc: "indirect required field in oneof",
-		input: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		want:    "oneof_nested: {}\n",
-		wantErr: true,
-	}, {
-		desc: "indirect required field in oneof with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: &pb2.IndirectRequired{
-			Union: &pb2.IndirectRequired_OneofNested{
-				OneofNested: &pb2.NestedWithRequired{},
-			},
-		},
-		want: "oneof_nested: {}\n",
-	}, {
-		desc: "unknown fields not printed",
-		input: func() proto.Message {
-			m := &pb2.Scalars{
-				OptString: proto.String("this message contains unknown fields"),
-			}
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
-				protopack.Tag{102, protopack.VarintType}, protopack.Varint(0xff),
-				protopack.Tag{103, protopack.Fixed32Type}, protopack.Uint32(47),
-				protopack.Tag{104, protopack.Fixed64Type}, protopack.Int64(0xdeadbeef),
-			}.Marshal())
-			return m
-		}(),
-		want: `opt_string: "this message contains unknown fields"
-`,
-	}, {
-		desc: "unknown varint and fixed types",
-		mo:   prototext.MarshalOptions{EmitUnknown: true},
-		input: func() proto.Message {
-			m := &pb2.Scalars{
-				OptString: proto.String("this message contains unknown fields"),
-			}
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
-				protopack.Tag{102, protopack.VarintType}, protopack.Varint(0xff),
-				protopack.Tag{103, protopack.Fixed32Type}, protopack.Uint32(0x47),
-				protopack.Tag{104, protopack.Fixed64Type}, protopack.Int64(0xdeadbeef),
-			}.Marshal())
-			return m
-		}(),
-		want: `opt_string: "this message contains unknown fields"
-101: 1
-102: 255
-103: 0x47
-104: 0xdeadbeef
-`,
-	}, {
-		desc: "unknown length-delimited",
-		mo:   prototext.MarshalOptions{EmitUnknown: true},
-		input: func() proto.Message {
-			m := new(pb2.Scalars)
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{protopack.Bool(true), protopack.Bool(false)},
-				protopack.Tag{102, protopack.BytesType}, protopack.String("hello world"),
-				protopack.Tag{103, protopack.BytesType}, protopack.Bytes("\xe4\xb8\x96\xe7\x95\x8c"),
-			}.Marshal())
-			return m
-		}(),
-		want: `101: "\x01\x00"
-102: "hello world"
-103: "世界"
-`,
-	}, {
-		desc: "unknown group type",
-		mo:   prototext.MarshalOptions{EmitUnknown: true},
-		input: func() proto.Message {
-			m := new(pb2.Scalars)
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.StartGroupType}, protopack.Tag{101, protopack.EndGroupType},
-				protopack.Tag{102, protopack.StartGroupType},
-				protopack.Tag{101, protopack.VarintType}, protopack.Bool(false),
-				protopack.Tag{102, protopack.BytesType}, protopack.String("inside a group"),
-				protopack.Tag{102, protopack.EndGroupType},
-			}.Marshal())
-			return m
-		}(),
-		want: `101: {}
-102: {
-  101: 0
-  102: "inside a group"
-}
-`,
-	}, {
-		desc: "unknown unpack repeated field",
-		mo:   prototext.MarshalOptions{EmitUnknown: true},
-		input: func() proto.Message {
-			m := new(pb2.Scalars)
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{protopack.Bool(true), protopack.Bool(false), protopack.Bool(true)},
-				protopack.Tag{102, protopack.BytesType}, protopack.String("hello"),
-				protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
-				protopack.Tag{102, protopack.BytesType}, protopack.String("世界"),
-			}.Marshal())
-			return m
-		}(),
-		want: `101: "\x01\x00\x01"
-102: "hello"
-101: 1
-102: "世界"
-`,
-	}, {
-		desc: "extensions of non-repeated fields",
-		input: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-		want: `opt_string: "non-extension field"
-opt_bool: true
-opt_int32: 42
-[pb2.opt_ext_bool]: true
-[pb2.opt_ext_enum]: TEN
-[pb2.opt_ext_nested]: {
-  opt_string: "nested in an extension"
-  opt_nested: {
-    opt_string: "another nested in an extension"
-  }
-}
-[pb2.opt_ext_string]: "extension field"
-`,
-	}, {
-		desc: "proto2 extension field contains invalid UTF-8",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtString, "abc\xff")
-			return m
-		}(),
-		want: `[pb2.opt_ext_string]: "abc\xff"
-`,
-	}, {
-		desc: "extension partial returns error",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtPartial, &pb2.PartialRequired{
-				OptString: proto.String("partial1"),
-			})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtPartial, &pb2.PartialRequired{
-				OptString: proto.String("partial2"),
-			})
-			return m
-		}(),
-		want: `[pb2.ExtensionsContainer.opt_ext_partial]: {
-  opt_string: "partial2"
-}
-[pb2.opt_ext_partial]: {
-  opt_string: "partial1"
-}
-`,
-		wantErr: true,
-	}, {
-		desc: "extension partial with AllowPartial",
-		mo:   prototext.MarshalOptions{AllowPartial: true},
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_OptExtPartial, &pb2.PartialRequired{
-				OptString: proto.String("partial1"),
-			})
-			return m
-		}(),
-		want: `[pb2.opt_ext_partial]: {
-  opt_string: "partial1"
-}
-`,
-	}, {
-		desc: "extensions of repeated fields",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_RptExtFixed32, []uint32{42, 47})
-			proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-		want: `[pb2.rpt_ext_enum]: TEN
-[pb2.rpt_ext_enum]: 101
-[pb2.rpt_ext_enum]: ONE
-[pb2.rpt_ext_fixed32]: 42
-[pb2.rpt_ext_fixed32]: 47
-[pb2.rpt_ext_nested]: {
-  opt_string: "one"
-}
-[pb2.rpt_ext_nested]: {
-  opt_string: "two"
-}
-[pb2.rpt_ext_nested]: {
-  opt_string: "three"
-}
-`,
-	}, {
-		desc: "extensions of non-repeated fields in another message",
-		input: func() proto.Message {
-			m := &pb2.Extensions{}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
-				OptString: proto.String("nested in an extension"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("another nested in an extension"),
-				},
-			})
-			return m
-		}(),
-		want: `[pb2.ExtensionsContainer.opt_ext_bool]: true
-[pb2.ExtensionsContainer.opt_ext_enum]: TEN
-[pb2.ExtensionsContainer.opt_ext_nested]: {
-  opt_string: "nested in an extension"
-  opt_nested: {
-    opt_string: "another nested in an extension"
-  }
-}
-[pb2.ExtensionsContainer.opt_ext_string]: "extension field"
-`,
-	}, {
-		desc: "extensions of repeated fields in another message",
-		input: func() proto.Message {
-			m := &pb2.Extensions{
-				OptString: proto.String("non-extension field"),
-				OptBool:   proto.Bool(true),
-				OptInt32:  proto.Int32(42),
-			}
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtString, []string{"hello", "world"})
-			proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtNested, []*pb2.Nested{
-				&pb2.Nested{OptString: proto.String("one")},
-				&pb2.Nested{OptString: proto.String("two")},
-				&pb2.Nested{OptString: proto.String("three")},
-			})
-			return m
-		}(),
-		want: `opt_string: "non-extension field"
-opt_bool: true
-opt_int32: 42
-[pb2.ExtensionsContainer.rpt_ext_enum]: TEN
-[pb2.ExtensionsContainer.rpt_ext_enum]: 101
-[pb2.ExtensionsContainer.rpt_ext_enum]: ONE
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "one"
-}
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "two"
-}
-[pb2.ExtensionsContainer.rpt_ext_nested]: {
-  opt_string: "three"
-}
-[pb2.ExtensionsContainer.rpt_ext_string]: "hello"
-[pb2.ExtensionsContainer.rpt_ext_string]: "world"
-`,
-	}, {
-		desc: "MessageSet",
-		input: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			proto.SetExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
-				OptString: proto.String("just a regular extension"),
-			})
-			return m
-		}(),
-		want: `[pb2.MessageSetExtension.ext_nested]: {
-  opt_string: "just a regular extension"
-}
-[pb2.MessageSetExtension]: {
-  opt_string: "a messageset extension"
-}
-[pb2.MessageSetExtension.not_message_set_extension]: {
-  opt_string: "not a messageset extension"
-}
-`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc: "not real MessageSet 1",
-		input: func() proto.Message {
-			m := &pb2.FakeMessageSet{}
-			proto.SetExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("not a messageset extension"),
-			})
-			return m
-		}(),
-		want: `[pb2.FakeMessageSetExtension.message_set_extension]: {
-  opt_string: "not a messageset extension"
-}
-`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc: "not real MessageSet 2",
-		input: func() proto.Message {
-			m := &pb2.MessageSet{}
-			proto.SetExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
-				OptString: proto.String("another not a messageset extension"),
-			})
-			return m
-		}(),
-		want: `[pb2.message_set_extension]: {
-  opt_string: "another not a messageset extension"
-}
-`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		desc: "Any not expanded",
-		mo: prototext.MarshalOptions{
-			Resolver: new(protoregistry.Types),
-		},
-		input: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "pb2.Nested",
-				Value:   b,
-			}
-		}(),
-		want: `type_url: "pb2.Nested"
-value: "\n\x13embedded inside Any\x12\x0b\n\tinception"
-`,
-	}, {
-		desc: "Any expanded",
-		input: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: "foo/pb2.Nested",
-				Value:   b,
-			}
-		}(),
-		want: `[foo/pb2.Nested]: {
-  opt_string: "embedded inside Any"
-  opt_nested: {
-    opt_string: "inception"
-  }
-}
-`,
-	}, {
-		desc: "Any expanded with missing required",
-		input: func() proto.Message {
-			m := &pb2.PartialRequired{
-				OptString: proto.String("embedded inside Any"),
-			}
-			b, err := proto.MarshalOptions{
-				AllowPartial:  true,
-				Deterministic: true,
-			}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &anypb.Any{
-				TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-				Value:   b,
-			}
-		}(),
-		want: `[pb2.PartialRequired]: {
-  opt_string: "embedded inside Any"
-}
-`,
-	}, {
-		desc: "Any with invalid value",
-		input: &anypb.Any{
-			TypeUrl: "foo/pb2.Nested",
-			Value:   []byte("\x80"),
-		},
-		want: `type_url: "foo/pb2.Nested"
-value: "\x80"
-`,
-	}, {
-		desc: "Any expanded in another message",
-		input: func() *pb2.KnownTypes {
-			m1 := &pb2.Nested{
-				OptString: proto.String("message inside Any of another Any field"),
-			}
-			b1, err := proto.MarshalOptions{Deterministic: true}.Marshal(m1)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			m2 := &anypb.Any{
-				TypeUrl: "pb2.Nested",
-				Value:   b1,
-			}
-			b2, err := proto.MarshalOptions{Deterministic: true}.Marshal(m2)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "google.protobuf.Any",
-					Value:   b2,
-				},
-			}
-		}(),
-		want: `opt_any: {
-  [google.protobuf.Any]: {
-    [pb2.Nested]: {
-      opt_string: "message inside Any of another Any field"
-    }
-  }
-}
-`,
-	}, {
-		desc: "Any expanded with invalid UTF-8 in proto2",
-		input: func() *pb2.KnownTypes {
-			m := &pb2.Nested{
-				OptString: proto.String("invalid UTF-8 abc\xff"),
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "pb2.Nested",
-					Value:   b,
-				},
-			}
-		}(),
-		want: `opt_any: {
-  [pb2.Nested]: {
-    opt_string: "invalid UTF-8 abc\xff"
-  }
-}
-`,
-	}, {
-		desc: "Any not expanded due to invalid data",
-		mo:   prototext.MarshalOptions{EmitASCII: true},
-		input: func() *pb2.KnownTypes {
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "pb3.Scalar",
-					Value:   []byte("\xde\xad\xbe\xef"),
-				},
-			}
-		}(),
-		want: `opt_any: {
-  type_url: "pb3.Scalar"
-  value: "\u07ad\xbe\xef"
-}
-`,
-	}, {
-		desc: "Any inside Any expanded",
-		input: func() *pb2.KnownTypes {
-			m1 := &pb2.Nested{
-				OptString: proto.String("invalid UTF-8 abc\xff"),
-			}
-			b1, err := proto.MarshalOptions{Deterministic: true}.Marshal(m1)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			m2 := &anypb.Any{
-				TypeUrl: "pb2.Nested",
-				Value:   b1,
-			}
-			b2, err := proto.MarshalOptions{Deterministic: true}.Marshal(m2)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "google.protobuf.Any",
-					Value:   b2,
-				},
-			}
-		}(),
-		want: `opt_any: {
-  [google.protobuf.Any]: {
-    [pb2.Nested]: {
-      opt_string: "invalid UTF-8 abc\xff"
-    }
-  }
-}
-`,
-	}, {
-		desc: "Any inside Any not expanded due to invalid data",
-		mo:   prototext.MarshalOptions{EmitASCII: true},
-		input: func() *pb2.KnownTypes {
-			m := &anypb.Any{
-				TypeUrl: "pb2.Nested",
-				Value:   []byte("\xde\xad\xbe\xef"),
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "google.protobuf.Any",
-					Value:   b,
-				},
-			}
-		}(),
-		want: `opt_any: {
-  [google.protobuf.Any]: {
-    type_url: "pb2.Nested"
-    value: "\u07ad\xbe\xef"
-  }
-}
-`,
-	}}
-
-	for _, tt := range tests {
-		tt := tt
-		if tt.skip {
-			continue
-		}
-		t.Run(tt.desc, func(t *testing.T) {
-			// Use 2-space indentation on all MarshalOptions.
-			tt.mo.Indent = "  "
-			b, err := tt.mo.Marshal(tt.input)
-			if err != nil && !tt.wantErr {
-				t.Errorf("Marshal() returned error: %v\n", err)
-			}
-			if err == nil && tt.wantErr {
-				t.Error("Marshal() got nil error, want error\n")
-			}
-			got := string(b)
-			if tt.want != "" && got != tt.want {
-				t.Errorf("Marshal()\n<got>\n%v\n<want>\n%v\n", got, tt.want)
-				if diff := cmp.Diff(tt.want, got); diff != "" {
-					t.Errorf("Marshal() diff -want +got\n%v\n", diff)
-				}
-			}
-		})
-	}
-}
-
-func TestEncodeAppend(t *testing.T) {
-	want := []byte("prefix")
-	got := append([]byte(nil), want...)
-	got, err := prototext.MarshalOptions{}.MarshalAppend(got, &pb3.Scalars{
-		SString: "value",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.HasPrefix(got, want) {
-		t.Fatalf("MarshalAppend modified prefix: got %v, want prefix %v", got, want)
-	}
-}
-
-func TestMarshalAppendAllocations(t *testing.T) {
-	m := &pb3.Scalars{SInt32: 1}
-	const count = 1000
-	size := 9
-	b := make([]byte, size)
-	// AllocsPerRun returns an integral value.
-	marshalAllocs := testing.AllocsPerRun(count, func() {
-		_, err := prototext.MarshalOptions{}.MarshalAppend(b[:0], m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	b = nil
-	marshalAppendAllocs := testing.AllocsPerRun(count, func() {
-		var err error
-		b, err = prototext.MarshalOptions{}.MarshalAppend(b, m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	if marshalAllocs != marshalAppendAllocs {
-		t.Errorf("%v allocs/op when writing to a preallocated buffer", marshalAllocs)
-		t.Errorf("%v allocs/op when repeatedly appending to a slice", marshalAppendAllocs)
-		t.Errorf("expect amortized allocs/op to be identical")
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/gotest/ya.make b/vendor/google.golang.org/protobuf/encoding/prototext/gotest/ya.make
deleted file mode 100644
index 3c69da63d55..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/prototext/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/encoding/prototext)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/other_test.go b/vendor/google.golang.org/protobuf/encoding/prototext/other_test.go
deleted file mode 100644
index 5cebffdcdc8..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/prototext/other_test.go
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package prototext_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoregistry"
-
-	pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/emptypb"
-	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func TestRoundTrip(t *testing.T) {
-	tests := []struct {
-		desc     string
-		resolver *protoregistry.Types
-		message  proto.Message
-	}{{
-		desc: "well-known type fields set to empty messages",
-		message: &pb2.KnownTypes{
-			OptBool:      &wrapperspb.BoolValue{},
-			OptInt32:     &wrapperspb.Int32Value{},
-			OptInt64:     &wrapperspb.Int64Value{},
-			OptUint32:    &wrapperspb.UInt32Value{},
-			OptUint64:    &wrapperspb.UInt64Value{},
-			OptFloat:     &wrapperspb.FloatValue{},
-			OptDouble:    &wrapperspb.DoubleValue{},
-			OptString:    &wrapperspb.StringValue{},
-			OptBytes:     &wrapperspb.BytesValue{},
-			OptDuration:  &durationpb.Duration{},
-			OptTimestamp: &timestamppb.Timestamp{},
-			OptStruct:    &structpb.Struct{},
-			OptList:      &structpb.ListValue{},
-			OptValue:     &structpb.Value{},
-			OptEmpty:     &emptypb.Empty{},
-			OptAny:       &anypb.Any{},
-		},
-	}, {
-		desc: "well-known type scalar fields",
-		message: &pb2.KnownTypes{
-			OptBool: &wrapperspb.BoolValue{
-				Value: true,
-			},
-			OptInt32: &wrapperspb.Int32Value{
-				Value: -42,
-			},
-			OptInt64: &wrapperspb.Int64Value{
-				Value: -42,
-			},
-			OptUint32: &wrapperspb.UInt32Value{
-				Value: 0xff,
-			},
-			OptUint64: &wrapperspb.UInt64Value{
-				Value: 0xffff,
-			},
-			OptFloat: &wrapperspb.FloatValue{
-				Value: 1.234,
-			},
-			OptDouble: &wrapperspb.DoubleValue{
-				Value: 1.23e308,
-			},
-			OptString: &wrapperspb.StringValue{
-				Value: "谷歌",
-			},
-			OptBytes: &wrapperspb.BytesValue{
-				Value: []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
-			},
-		},
-	}, {
-		desc: "well-known type time-related fields",
-		message: &pb2.KnownTypes{
-			OptDuration: &durationpb.Duration{
-				Seconds: -3600,
-				Nanos:   -123,
-			},
-			OptTimestamp: &timestamppb.Timestamp{
-				Seconds: 1257894000,
-				Nanos:   123,
-			},
-		},
-	}, {
-		desc: "Struct field and different Value types",
-		message: &pb2.KnownTypes{
-			OptStruct: &structpb.Struct{
-				Fields: map[string]*structpb.Value{
-					"bool": &structpb.Value{
-						Kind: &structpb.Value_BoolValue{
-							BoolValue: true,
-						},
-					},
-					"double": &structpb.Value{
-						Kind: &structpb.Value_NumberValue{
-							NumberValue: 3.1415,
-						},
-					},
-					"null": &structpb.Value{
-						Kind: &structpb.Value_NullValue{
-							NullValue: structpb.NullValue_NULL_VALUE,
-						},
-					},
-					"string": &structpb.Value{
-						Kind: &structpb.Value_StringValue{
-							StringValue: "string",
-						},
-					},
-					"struct": &structpb.Value{
-						Kind: &structpb.Value_StructValue{
-							StructValue: &structpb.Struct{
-								Fields: map[string]*structpb.Value{
-									"bool": &structpb.Value{
-										Kind: &structpb.Value_BoolValue{
-											BoolValue: false,
-										},
-									},
-								},
-							},
-						},
-					},
-					"list": &structpb.Value{
-						Kind: &structpb.Value_ListValue{
-							ListValue: &structpb.ListValue{
-								Values: []*structpb.Value{
-									{
-										Kind: &structpb.Value_BoolValue{
-											BoolValue: false,
-										},
-									},
-									{
-										Kind: &structpb.Value_StringValue{
-											StringValue: "hello",
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}, {
-		desc:     "Any field without registered type",
-		resolver: new(protoregistry.Types),
-		message: func() proto.Message {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-					Value:   b,
-				},
-			}
-		}(),
-	}, {
-		desc: "Any field with registered type",
-		message: func() *pb2.KnownTypes {
-			m := &pb2.Nested{
-				OptString: proto.String("embedded inside Any"),
-				OptNested: &pb2.Nested{
-					OptString: proto.String("inception"),
-				},
-			}
-			b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
-					Value:   b,
-				},
-			}
-		}(),
-	}, {
-		desc: "Any field containing Any message",
-		message: func() *pb2.KnownTypes {
-			m1 := &pb2.Nested{
-				OptString: proto.String("message inside Any of another Any field"),
-			}
-			b1, err := proto.MarshalOptions{Deterministic: true}.Marshal(m1)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			m2 := &anypb.Any{
-				TypeUrl: "pb2.Nested",
-				Value:   b1,
-			}
-			b2, err := proto.MarshalOptions{Deterministic: true}.Marshal(m2)
-			if err != nil {
-				t.Fatalf("error in binary marshaling message for Any.value: %v", err)
-			}
-			return &pb2.KnownTypes{
-				OptAny: &anypb.Any{
-					TypeUrl: "google.protobuf.Any",
-					Value:   b2,
-				},
-			}
-		}(),
-	}}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.desc, func(t *testing.T) {
-			t.Parallel()
-			b, err := prototext.MarshalOptions{Resolver: tt.resolver}.Marshal(tt.message)
-			if err != nil {
-				t.Errorf("Marshal() returned error: %v\n\n", err)
-			}
-
-			gotMessage := new(pb2.KnownTypes)
-			err = prototext.UnmarshalOptions{Resolver: tt.resolver}.Unmarshal(b, gotMessage)
-			if err != nil {
-				t.Errorf("Unmarshal() returned error: %v\n\n", err)
-			}
-
-			if !proto.Equal(gotMessage, tt.message) {
-				t.Errorf("Unmarshal()\n<got>\n%v\n<want>\n%v\n", gotMessage, tt.message)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/ya.make b/vendor/google.golang.org/protobuf/encoding/prototext/ya.make
index 6eab62f09e4..14ea8e575d7 100644
--- a/vendor/google.golang.org/protobuf/encoding/prototext/ya.make
+++ b/vendor/google.golang.org/protobuf/encoding/prototext/ya.make
@@ -8,12 +8,4 @@ SRCS(
     encode.go
 )
 
-GO_XTEST_SRCS(
-    decode_test.go
-    encode_test.go
-    other_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/gotest/ya.make b/vendor/google.golang.org/protobuf/encoding/protowire/gotest/ya.make
deleted file mode 100644
index b19c44c1bb8..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protowire/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/encoding/protowire)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
index f4b4686cf9d..e942bc983ee 100644
--- a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
+++ b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
@@ -6,7 +6,7 @@
 // See https://protobuf.dev/programming-guides/encoding.
 //
 // For marshaling and unmarshaling entire protobuf messages,
-// use the "google.golang.org/protobuf/proto" package instead.
+// use the [google.golang.org/protobuf/proto] package instead.
 package protowire
 
 import (
@@ -87,7 +87,7 @@ func ParseError(n int) error {
 
 // ConsumeField parses an entire field record (both tag and value) and returns
 // the field number, the wire type, and the total length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 //
 // The total length includes the tag header and the end group marker (if the
 // field is a group).
@@ -104,8 +104,8 @@ func ConsumeField(b []byte) (Number, Type, int) {
 }
 
 // ConsumeFieldValue parses a field value and returns its length.
-// This assumes that the field Number and wire Type have already been parsed.
-// This returns a negative length upon an error (see ParseError).
+// This assumes that the field [Number] and wire [Type] have already been parsed.
+// This returns a negative length upon an error (see [ParseError]).
 //
 // When parsing a group, the length includes the end group marker and
 // the end group is verified to match the starting field number.
@@ -164,7 +164,7 @@ func AppendTag(b []byte, num Number, typ Type) []byte {
 }
 
 // ConsumeTag parses b as a varint-encoded tag, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeTag(b []byte) (Number, Type, int) {
 	v, n := ConsumeVarint(b)
 	if n < 0 {
@@ -263,7 +263,7 @@ func AppendVarint(b []byte, v uint64) []byte {
 }
 
 // ConsumeVarint parses b as a varint-encoded uint64, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeVarint(b []byte) (v uint64, n int) {
 	var y uint64
 	if len(b) <= 0 {
@@ -384,7 +384,7 @@ func AppendFixed32(b []byte, v uint32) []byte {
 }
 
 // ConsumeFixed32 parses b as a little-endian uint32, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeFixed32(b []byte) (v uint32, n int) {
 	if len(b) < 4 {
 		return 0, errCodeTruncated
@@ -412,7 +412,7 @@ func AppendFixed64(b []byte, v uint64) []byte {
 }
 
 // ConsumeFixed64 parses b as a little-endian uint64, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeFixed64(b []byte) (v uint64, n int) {
 	if len(b) < 8 {
 		return 0, errCodeTruncated
@@ -432,7 +432,7 @@ func AppendBytes(b []byte, v []byte) []byte {
 }
 
 // ConsumeBytes parses b as a length-prefixed bytes value, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeBytes(b []byte) (v []byte, n int) {
 	m, n := ConsumeVarint(b)
 	if n < 0 {
@@ -456,7 +456,7 @@ func AppendString(b []byte, v string) []byte {
 }
 
 // ConsumeString parses b as a length-prefixed bytes value, reporting its length.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeString(b []byte) (v string, n int) {
 	bb, n := ConsumeBytes(b)
 	return string(bb), n
@@ -471,7 +471,7 @@ func AppendGroup(b []byte, num Number, v []byte) []byte {
 // ConsumeGroup parses b as a group value until the trailing end group marker,
 // and verifies that the end marker matches the provided num. The value v
 // does not contain the end marker, while the length does contain the end marker.
-// This returns a negative length upon an error (see ParseError).
+// This returns a negative length upon an error (see [ParseError]).
 func ConsumeGroup(num Number, b []byte) (v []byte, n int) {
 	n = ConsumeFieldValue(num, StartGroupType, b)
 	if n < 0 {
@@ -495,8 +495,8 @@ func SizeGroup(num Number, n int) int {
 	return n + SizeTag(num)
 }
 
-// DecodeTag decodes the field Number and wire Type from its unified form.
-// The Number is -1 if the decoded field number overflows int32.
+// DecodeTag decodes the field [Number] and wire [Type] from its unified form.
+// The [Number] is -1 if the decoded field number overflows int32.
 // Other than overflow, this does not check for field number validity.
 func DecodeTag(x uint64) (Number, Type) {
 	// NOTE: MessageSet allows for larger field numbers than normal.
@@ -506,7 +506,7 @@ func DecodeTag(x uint64) (Number, Type) {
 	return Number(x >> 3), Type(x & 7)
 }
 
-// EncodeTag encodes the field Number and wire Type into its unified form.
+// EncodeTag encodes the field [Number] and wire [Type] into its unified form.
 func EncodeTag(num Number, typ Type) uint64 {
 	return uint64(num)<<3 | uint64(typ&7)
 }
diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/wire_test.go b/vendor/google.golang.org/protobuf/encoding/protowire/wire_test.go
deleted file mode 100644
index 10ec7f80506..00000000000
--- a/vendor/google.golang.org/protobuf/encoding/protowire/wire_test.go
+++ /dev/null
@@ -1,680 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protowire
-
-import (
-	"bytes"
-	"encoding/hex"
-	"io"
-	"math"
-	"strings"
-	"testing"
-)
-
-type (
-	testOps struct {
-		// appendOps is a sequence of append operations, each appending to
-		// the output of the previous append operation.
-		appendOps []appendOp
-
-		// wantRaw (if not nil) is the bytes that the appendOps should produce.
-		wantRaw []byte
-
-		// consumeOps are a sequence of consume operations, each consuming the
-		// remaining output after the previous consume operation.
-		// The first consume operation starts with the output of appendOps.
-		consumeOps []consumeOp
-	}
-
-	// appendOp represents an Append operation.
-	appendOp  = interface{}
-	appendTag struct {
-		inNum  Number
-		inType Type
-	}
-	appendVarint struct {
-		inVal uint64
-	}
-	appendFixed32 struct {
-		inVal uint32
-	}
-	appendFixed64 struct {
-		inVal uint64
-	}
-	appendBytes struct {
-		inVal []byte
-	}
-	appendGroup struct {
-		inNum Number
-		inVal []byte
-	}
-	appendRaw []byte
-
-	// consumeOp represents an Consume operation.
-	consumeOp    = interface{}
-	consumeField struct {
-		wantNum  Number
-		wantType Type
-		wantCnt  int
-		wantErr  error
-	}
-	consumeFieldValue struct {
-		inNum   Number
-		inType  Type
-		wantCnt int
-		wantErr error
-	}
-	consumeTag struct {
-		wantNum  Number
-		wantType Type
-		wantCnt  int
-		wantErr  error
-	}
-	consumeVarint struct {
-		wantVal uint64
-		wantCnt int
-		wantErr error
-	}
-	consumeFixed32 struct {
-		wantVal uint32
-		wantCnt int
-		wantErr error
-	}
-	consumeFixed64 struct {
-		wantVal uint64
-		wantCnt int
-		wantErr error
-	}
-	consumeBytes struct {
-		wantVal []byte
-		wantCnt int
-		wantErr error
-	}
-	consumeGroup struct {
-		inNum   Number
-		wantVal []byte
-		wantCnt int
-		wantErr error
-	}
-
-	ops []interface{}
-)
-
-// dhex decodes a hex-string and returns the bytes and panics if s is invalid.
-func dhex(s string) []byte {
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestTag(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeTag{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 0, inType: Fixed32Type}},
-		wantRaw:    dhex("05"),
-		consumeOps: ops{consumeTag{wantErr: errFieldNumber}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 1, inType: Fixed32Type}},
-		wantRaw:    dhex("0d"),
-		consumeOps: ops{consumeTag{wantNum: 1, wantType: Fixed32Type, wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendTag{inNum: FirstReservedNumber, inType: BytesType}},
-		wantRaw:    dhex("c2a309"),
-		consumeOps: ops{consumeTag{wantNum: FirstReservedNumber, wantType: BytesType, wantCnt: 3}},
-	}, {
-		appendOps:  ops{appendTag{inNum: LastReservedNumber, inType: StartGroupType}},
-		wantRaw:    dhex("fbe109"),
-		consumeOps: ops{consumeTag{wantNum: LastReservedNumber, wantType: StartGroupType, wantCnt: 3}},
-	}, {
-		appendOps:  ops{appendTag{inNum: MaxValidNumber, inType: VarintType}},
-		wantRaw:    dhex("f8ffffff0f"),
-		consumeOps: ops{consumeTag{wantNum: MaxValidNumber, wantType: VarintType, wantCnt: 5}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: ((math.MaxInt32+1)<<3 | uint64(VarintType))}},
-		wantRaw:    dhex("8080808040"),
-		consumeOps: ops{consumeTag{wantErr: errFieldNumber}},
-	}})
-}
-
-func TestVarint(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("80"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("80808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("808080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("80808080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8080808080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("808080808080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("80808080808080808080"))},
-		consumeOps: ops{consumeVarint{wantErr: errOverflow}},
-	}, {
-		// Test varints at various boundaries where the length changes.
-		appendOps:  ops{appendVarint{inVal: 0x0}},
-		wantRaw:    dhex("00"),
-		consumeOps: ops{consumeVarint{wantVal: 0, wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x1}},
-		wantRaw:    dhex("01"),
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7f}},
-		wantRaw:    dhex("7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7f, wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7f + 1}},
-		wantRaw:    dhex("8001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7f + 1, wantCnt: 2}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x3fff}},
-		wantRaw:    dhex("ff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x3fff, wantCnt: 2}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x3fff + 1}},
-		wantRaw:    dhex("808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x3fff + 1, wantCnt: 3}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x1fffff}},
-		wantRaw:    dhex("ffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x1fffff, wantCnt: 3}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x1fffff + 1}},
-		wantRaw:    dhex("80808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x1fffff + 1, wantCnt: 4}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0xfffffff}},
-		wantRaw:    dhex("ffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0xfffffff, wantCnt: 4}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0xfffffff + 1}},
-		wantRaw:    dhex("8080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0xfffffff + 1, wantCnt: 5}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7ffffffff}},
-		wantRaw:    dhex("ffffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7ffffffff, wantCnt: 5}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7ffffffff + 1}},
-		wantRaw:    dhex("808080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7ffffffff + 1, wantCnt: 6}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x3ffffffffff}},
-		wantRaw:    dhex("ffffffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x3ffffffffff, wantCnt: 6}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x3ffffffffff + 1}},
-		wantRaw:    dhex("80808080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x3ffffffffff + 1, wantCnt: 7}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x1ffffffffffff}},
-		wantRaw:    dhex("ffffffffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x1ffffffffffff, wantCnt: 7}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x1ffffffffffff + 1}},
-		wantRaw:    dhex("8080808080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x1ffffffffffff + 1, wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0xffffffffffffff}},
-		wantRaw:    dhex("ffffffffffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0xffffffffffffff, wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0xffffffffffffff + 1}},
-		wantRaw:    dhex("808080808080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0xffffffffffffff + 1, wantCnt: 9}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7fffffffffffffff}},
-		wantRaw:    dhex("ffffffffffffffff7f"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7fffffffffffffff, wantCnt: 9}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: 0x7fffffffffffffff + 1}},
-		wantRaw:    dhex("80808080808080808001"),
-		consumeOps: ops{consumeVarint{wantVal: 0x7fffffffffffffff + 1, wantCnt: 10}},
-	}, {
-		appendOps:  ops{appendVarint{inVal: math.MaxUint64}},
-		wantRaw:    dhex("ffffffffffffffffff01"),
-		consumeOps: ops{consumeVarint{wantVal: math.MaxUint64, wantCnt: 10}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("ffffffffffffffffff02"))},
-		consumeOps: ops{consumeVarint{wantErr: errOverflow}},
-	}, {
-		// Test denormalized varints; where the encoding, while valid, is
-		// larger than necessary.
-		appendOps:  ops{appendRaw(dhex("01"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8100"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 2}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("818000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 3}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("81808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 4}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8180808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 5}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("818080808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 6}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("81808080808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 7}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8180808080808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("818080808080808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 9}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("81808080808080808000"))},
-		consumeOps: ops{consumeVarint{wantVal: 1, wantCnt: 10}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("8180808080808080808000"))},
-		consumeOps: ops{consumeVarint{wantErr: errOverflow}},
-	}})
-}
-
-func TestFixed32(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeFixed32{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("000000"))},
-		consumeOps: ops{consumeFixed32{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendFixed32{0}},
-		wantRaw:    dhex("00000000"),
-		consumeOps: ops{consumeFixed32{wantVal: 0, wantCnt: 4}},
-	}, {
-		appendOps:  ops{appendFixed32{math.MaxUint32}},
-		wantRaw:    dhex("ffffffff"),
-		consumeOps: ops{consumeFixed32{wantVal: math.MaxUint32, wantCnt: 4}},
-	}, {
-		appendOps:  ops{appendFixed32{0xf0e1d2c3}},
-		wantRaw:    dhex("c3d2e1f0"),
-		consumeOps: ops{consumeFixed32{wantVal: 0xf0e1d2c3, wantCnt: 4}},
-	}})
-}
-
-func TestFixed64(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeFixed64{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("00000000000000"))},
-		consumeOps: ops{consumeFixed64{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendFixed64{0}},
-		wantRaw:    dhex("0000000000000000"),
-		consumeOps: ops{consumeFixed64{wantVal: 0, wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendFixed64{math.MaxUint64}},
-		wantRaw:    dhex("ffffffffffffffff"),
-		consumeOps: ops{consumeFixed64{wantVal: math.MaxUint64, wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendFixed64{0xf0e1d2c3b4a59687}},
-		wantRaw:    dhex("8796a5b4c3d2e1f0"),
-		consumeOps: ops{consumeFixed64{wantVal: 0xf0e1d2c3b4a59687, wantCnt: 8}},
-	}})
-}
-
-func TestBytes(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeBytes{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendRaw(dhex("01"))},
-		consumeOps: ops{consumeBytes{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendVarint{0}, appendRaw("")},
-		wantRaw:    dhex("00"),
-		consumeOps: ops{consumeBytes{wantVal: dhex(""), wantCnt: 1}},
-	}, {
-		appendOps:  ops{appendBytes{[]byte("hello")}},
-		wantRaw:    []byte("\x05hello"),
-		consumeOps: ops{consumeBytes{wantVal: []byte("hello"), wantCnt: 6}},
-	}, {
-		appendOps:  ops{appendBytes{[]byte(strings.Repeat("hello", 50))}},
-		wantRaw:    []byte("\xfa\x01" + strings.Repeat("hello", 50)),
-		consumeOps: ops{consumeBytes{wantVal: []byte(strings.Repeat("hello", 50)), wantCnt: 252}},
-	}, {
-		appendOps:  ops{appendRaw("\x85\x80\x00hello")},
-		consumeOps: ops{consumeBytes{wantVal: []byte("hello"), wantCnt: 8}},
-	}, {
-		appendOps:  ops{appendRaw("\x85\x80\x00hell")},
-		consumeOps: ops{consumeBytes{wantErr: io.ErrUnexpectedEOF}},
-	}})
-}
-
-func TestGroup(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeGroup{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 0, inType: StartGroupType}},
-		consumeOps: ops{consumeGroup{inNum: 1, wantErr: errFieldNumber}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 2, inType: EndGroupType}},
-		consumeOps: ops{consumeGroup{inNum: 1, wantErr: errEndGroup}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 1, inType: EndGroupType}},
-		consumeOps: ops{consumeGroup{inNum: 1, wantCnt: 1}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 5, inType: Fixed32Type},
-			appendFixed32{0xf0e1d2c3},
-			appendTag{inNum: 5, inType: EndGroupType},
-		},
-		wantRaw:    dhex("2dc3d2e1f02c"),
-		consumeOps: ops{consumeGroup{inNum: 5, wantVal: dhex("2dc3d2e1f0"), wantCnt: 6}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 5, inType: Fixed32Type},
-			appendFixed32{0xf0e1d2c3},
-			appendRaw(dhex("ac808000")),
-		},
-		consumeOps: ops{consumeGroup{inNum: 5, wantVal: dhex("2dc3d2e1f0"), wantCnt: 9}},
-	}})
-}
-
-func TestField(t *testing.T) {
-	runTests(t, []testOps{{
-		appendOps:  ops{appendRaw(dhex(""))},
-		consumeOps: ops{consumeField{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 5000, inType: StartGroupType},
-			appendTag{inNum: 1, inType: VarintType},
-			appendVarint{123456789},
-			appendTag{inNum: 12, inType: Fixed32Type},
-			appendFixed32{123456789},
-			appendTag{inNum: 123, inType: Fixed64Type},
-			appendFixed64{123456789},
-			appendTag{inNum: 1234, inType: BytesType},
-			appendBytes{[]byte("hello")},
-			appendTag{inNum: 12345, inType: StartGroupType},
-			appendTag{inNum: 11, inType: VarintType},
-			appendVarint{123456789},
-			appendTag{inNum: 1212, inType: Fixed32Type},
-			appendFixed32{123456789},
-			appendTag{inNum: 123123, inType: Fixed64Type},
-			appendFixed64{123456789},
-			appendTag{inNum: 12341234, inType: BytesType},
-			appendBytes{[]byte("goodbye")},
-			appendTag{inNum: 12345, inType: EndGroupType},
-			appendTag{inNum: 5000, inType: EndGroupType},
-		},
-		wantRaw: dhex("c3b80208959aef3a6515cd5b07d90715cd5b0700000000924d0568656c6c6fcb830658959aef3ae54b15cd5b07998f3c15cd5b070000000092ff892f07676f6f64627965cc8306c4b802"),
-		consumeOps: ops{
-			consumeTag{wantNum: 5000, wantType: StartGroupType, wantCnt: 3},
-			consumeTag{wantNum: 1, wantType: VarintType, wantCnt: 1},
-			consumeVarint{wantVal: 123456789, wantCnt: 4},
-			consumeTag{wantNum: 12, wantType: Fixed32Type, wantCnt: 1},
-			consumeFixed32{wantVal: 123456789, wantCnt: 4},
-			consumeTag{wantNum: 123, wantType: Fixed64Type, wantCnt: 2},
-			consumeFixed64{wantVal: 123456789, wantCnt: 8},
-			consumeTag{wantNum: 1234, wantType: BytesType, wantCnt: 2},
-			consumeBytes{wantVal: []byte("hello"), wantCnt: 6},
-			consumeTag{wantNum: 12345, wantType: StartGroupType, wantCnt: 3},
-			consumeTag{wantNum: 11, wantType: VarintType, wantCnt: 1},
-			consumeVarint{wantVal: 123456789, wantCnt: 4},
-			consumeTag{wantNum: 1212, wantType: Fixed32Type, wantCnt: 2},
-			consumeFixed32{wantVal: 123456789, wantCnt: 4},
-			consumeTag{wantNum: 123123, wantType: Fixed64Type, wantCnt: 3},
-			consumeFixed64{wantVal: 123456789, wantCnt: 8},
-			consumeTag{wantNum: 12341234, wantType: BytesType, wantCnt: 4},
-			consumeBytes{wantVal: []byte("goodbye"), wantCnt: 8},
-			consumeTag{wantNum: 12345, wantType: EndGroupType, wantCnt: 3},
-			consumeTag{wantNum: 5000, wantType: EndGroupType, wantCnt: 3},
-		},
-	}, {
-		appendOps:  ops{appendRaw(dhex("c3b80208959aef3a6515cd5b07d90715cd5b0700000000924d0568656c6c6fcb830658959aef3ae54b15cd5b07998f3c15cd5b070000000092ff892f07676f6f64627965cc8306c4b802"))},
-		consumeOps: ops{consumeField{wantNum: 5000, wantType: StartGroupType, wantCnt: 74}},
-	}, {
-		appendOps:  ops{appendTag{inNum: 5, inType: EndGroupType}},
-		wantRaw:    dhex("2c"),
-		consumeOps: ops{consumeField{wantErr: errEndGroup}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendTag{inNum: 22, inType: StartGroupType},
-			appendTag{inNum: 333, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: EndGroupType},
-			appendTag{inNum: 333, inType: EndGroupType},
-			appendTag{inNum: 22, inType: EndGroupType},
-			appendTag{inNum: 1, inType: EndGroupType},
-		},
-		wantRaw:    dhex("0bb301eb14e39502e49502ec14b4010c"),
-		consumeOps: ops{consumeField{wantNum: 1, wantType: StartGroupType, wantCnt: 16}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendGroup{inNum: 1, inVal: dhex("b301eb14e39502e49502ec14b401")},
-		},
-		wantRaw:    dhex("0b" + "b301eb14e39502e49502ec14b401" + "0c"),
-		consumeOps: ops{consumeField{wantNum: 1, wantType: StartGroupType, wantCnt: 16}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendTag{inNum: 22, inType: StartGroupType},
-			appendTag{inNum: 333, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: StartGroupType},
-			appendTag{inNum: 333, inType: EndGroupType},
-			appendTag{inNum: 22, inType: EndGroupType},
-			appendTag{inNum: 1, inType: EndGroupType},
-		},
-		consumeOps: ops{consumeField{wantErr: errEndGroup}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendTag{inNum: 22, inType: StartGroupType},
-			appendTag{inNum: 333, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: EndGroupType},
-			appendTag{inNum: 333, inType: EndGroupType},
-			appendTag{inNum: 22, inType: EndGroupType},
-		},
-		consumeOps: ops{consumeField{wantErr: io.ErrUnexpectedEOF}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendTag{inNum: 22, inType: StartGroupType},
-			appendTag{inNum: 333, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: StartGroupType},
-			appendTag{inNum: 0, inType: VarintType},
-			appendTag{inNum: 4444, inType: EndGroupType},
-			appendTag{inNum: 333, inType: EndGroupType},
-			appendTag{inNum: 22, inType: EndGroupType},
-			appendTag{inNum: 1, inType: EndGroupType},
-		},
-		consumeOps: ops{consumeField{wantErr: errFieldNumber}},
-	}, {
-		appendOps: ops{
-			appendTag{inNum: 1, inType: StartGroupType},
-			appendTag{inNum: 22, inType: StartGroupType},
-			appendTag{inNum: 333, inType: StartGroupType},
-			appendTag{inNum: 4444, inType: StartGroupType},
-			appendTag{inNum: 1, inType: 6},
-			appendTag{inNum: 4444, inType: EndGroupType},
-			appendTag{inNum: 333, inType: EndGroupType},
-			appendTag{inNum: 22, inType: EndGroupType},
-			appendTag{inNum: 1, inType: EndGroupType},
-		},
-		consumeOps: ops{consumeField{wantErr: errReserved}},
-	}})
-}
-
-func runTests(t *testing.T, tests []testOps) {
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			var b []byte
-			for _, op := range tt.appendOps {
-				b0 := b
-				switch op := op.(type) {
-				case appendTag:
-					b = AppendTag(b, op.inNum, op.inType)
-				case appendVarint:
-					b = AppendVarint(b, op.inVal)
-				case appendFixed32:
-					b = AppendFixed32(b, op.inVal)
-				case appendFixed64:
-					b = AppendFixed64(b, op.inVal)
-				case appendBytes:
-					b = AppendBytes(b, op.inVal)
-				case appendGroup:
-					b = AppendGroup(b, op.inNum, op.inVal)
-				case appendRaw:
-					b = append(b, op...)
-				}
-
-				check := func(label string, want int) {
-					t.Helper()
-					if got := len(b) - len(b0); got != want {
-						t.Errorf("len(Append%v) and Size%v mismatch: got %v, want %v", label, label, got, want)
-					}
-				}
-				switch op := op.(type) {
-				case appendTag:
-					check("Tag", SizeTag(op.inNum))
-				case appendVarint:
-					check("Varint", SizeVarint(op.inVal))
-				case appendFixed32:
-					check("Fixed32", SizeFixed32())
-				case appendFixed64:
-					check("Fixed64", SizeFixed64())
-				case appendBytes:
-					check("Bytes", SizeBytes(len(op.inVal)))
-				case appendGroup:
-					check("Group", SizeGroup(op.inNum, len(op.inVal)))
-				}
-			}
-
-			if tt.wantRaw != nil && !bytes.Equal(b, tt.wantRaw) {
-				t.Errorf("raw output mismatch:\ngot  %x\nwant %x", b, tt.wantRaw)
-			}
-
-			for _, op := range tt.consumeOps {
-				check := func(label string, gotCnt, wantCnt int, wantErr error) {
-					t.Helper()
-					gotErr := ParseError(gotCnt)
-					if gotCnt < 0 {
-						gotCnt = 0
-					}
-					if gotCnt != wantCnt {
-						t.Errorf("Consume%v(): consumed %d bytes, want %d bytes consumed", label, gotCnt, wantCnt)
-					}
-					if gotErr != wantErr {
-						t.Errorf("Consume%v(): got %v error, want %v error", label, gotErr, wantErr)
-					}
-					b = b[gotCnt:]
-				}
-				switch op := op.(type) {
-				case consumeField:
-					gotNum, gotType, n := ConsumeField(b)
-					if gotNum != op.wantNum || gotType != op.wantType {
-						t.Errorf("ConsumeField() = (%d, %v), want (%d, %v)", gotNum, gotType, op.wantNum, op.wantType)
-					}
-					check("Field", n, op.wantCnt, op.wantErr)
-				case consumeFieldValue:
-					n := ConsumeFieldValue(op.inNum, op.inType, b)
-					check("FieldValue", n, op.wantCnt, op.wantErr)
-				case consumeTag:
-					gotNum, gotType, n := ConsumeTag(b)
-					if gotNum != op.wantNum || gotType != op.wantType {
-						t.Errorf("ConsumeTag() = (%d, %v), want (%d, %v)", gotNum, gotType, op.wantNum, op.wantType)
-					}
-					check("Tag", n, op.wantCnt, op.wantErr)
-				case consumeVarint:
-					gotVal, n := ConsumeVarint(b)
-					if gotVal != op.wantVal {
-						t.Errorf("ConsumeVarint() = %d, want %d", gotVal, op.wantVal)
-					}
-					check("Varint", n, op.wantCnt, op.wantErr)
-				case consumeFixed32:
-					gotVal, n := ConsumeFixed32(b)
-					if gotVal != op.wantVal {
-						t.Errorf("ConsumeFixed32() = %d, want %d", gotVal, op.wantVal)
-					}
-					check("Fixed32", n, op.wantCnt, op.wantErr)
-				case consumeFixed64:
-					gotVal, n := ConsumeFixed64(b)
-					if gotVal != op.wantVal {
-						t.Errorf("ConsumeFixed64() = %d, want %d", gotVal, op.wantVal)
-					}
-					check("Fixed64", n, op.wantCnt, op.wantErr)
-				case consumeBytes:
-					gotVal, n := ConsumeBytes(b)
-					if !bytes.Equal(gotVal, op.wantVal) {
-						t.Errorf("ConsumeBytes() = %x, want %x", gotVal, op.wantVal)
-					}
-					check("Bytes", n, op.wantCnt, op.wantErr)
-				case consumeGroup:
-					gotVal, n := ConsumeGroup(op.inNum, b)
-					if !bytes.Equal(gotVal, op.wantVal) {
-						t.Errorf("ConsumeGroup() = %x, want %x", gotVal, op.wantVal)
-					}
-					check("Group", n, op.wantCnt, op.wantErr)
-				}
-			}
-		})
-	}
-}
-
-func TestZigZag(t *testing.T) {
-	tests := []struct {
-		dec int64
-		enc uint64
-	}{
-		{math.MinInt64 + 0, math.MaxUint64 - 0},
-		{math.MinInt64 + 1, math.MaxUint64 - 2},
-		{math.MinInt64 + 2, math.MaxUint64 - 4},
-		{-3, 5},
-		{-2, 3},
-		{-1, 1},
-		{0, 0},
-		{+1, 2},
-		{+2, 4},
-		{+3, 6},
-		{math.MaxInt64 - 2, math.MaxUint64 - 5},
-		{math.MaxInt64 - 1, math.MaxUint64 - 3},
-		{math.MaxInt64 - 0, math.MaxUint64 - 1},
-	}
-
-	for _, tt := range tests {
-		if enc := EncodeZigZag(tt.dec); enc != tt.enc {
-			t.Errorf("EncodeZigZag(%d) = %d, want %d", tt.dec, enc, tt.enc)
-		}
-		if dec := DecodeZigZag(tt.enc); dec != tt.dec {
-			t.Errorf("DecodeZigZag(%d) = %d, want %d", tt.enc, dec, tt.dec)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/ya.make b/vendor/google.golang.org/protobuf/encoding/protowire/ya.make
index 577108ba464..74a3dc5f924 100644
--- a/vendor/google.golang.org/protobuf/encoding/protowire/ya.make
+++ b/vendor/google.golang.org/protobuf/encoding/protowire/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(wire.go)
-
-GO_TEST_SRCS(wire_test.go)
+SRCS(
+    wire.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/descfmt/desc_test.go b/vendor/google.golang.org/protobuf/internal/descfmt/desc_test.go
deleted file mode 100644
index c9b92f561bb..00000000000
--- a/vendor/google.golang.org/protobuf/internal/descfmt/desc_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package descfmt
-
-import (
-	"testing"
-)
-
-// TestDescriptorAccessors tests that descriptorAccessors is up-to-date.
-func TestDescriptorAccessors(t *testing.T) {
-	ignore := map[string]bool{
-		"ParentFile":    true,
-		"Parent":        true,
-		"Index":         true,
-		"Syntax":        true,
-		"Name":          true,
-		"FullName":      true,
-		"IsPlaceholder": true,
-		"Options":       true,
-		"ProtoInternal": true,
-		"ProtoType":     true,
-
-		"TextName":           true, // derived from other fields
-		"HasOptionalKeyword": true, // captured by HasPresence
-		"IsSynthetic":        true, // captured by HasPresence
-
-		"SourceLocations":       true, // specific to FileDescriptor
-		"ExtensionRangeOptions": true, // specific to MessageDescriptor
-		"DefaultEnumValue":      true, // specific to FieldDescriptor
-		"MapKey":                true, // specific to FieldDescriptor
-		"MapValue":              true, // specific to FieldDescriptor
-	}
-
-	for rt, m := range descriptorAccessors {
-		got := map[string]bool{}
-		for _, s := range m {
-			got[s] = true
-		}
-		want := map[string]bool{}
-		for i := 0; i < rt.NumMethod(); i++ {
-			want[rt.Method(i).Name] = true
-		}
-
-		// Check if descriptorAccessors contains a non-existent accessor.
-		// If this test fails, remove the accessor from descriptorAccessors.
-		for s := range got {
-			if !want[s] && !ignore[s] {
-				t.Errorf("%v.%v does not exist", rt, s)
-			}
-		}
-
-		// Check if there are new protoreflect interface methods that are not
-		// handled by the formatter. If this fails, either add the method to
-		// ignore or add them to descriptorAccessors.
-		for s := range want {
-			if !got[s] && !ignore[s] {
-				t.Errorf("%v.%v is not called by formatter", rt, s)
-			}
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/descfmt/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/descfmt/gotest/ya.make
deleted file mode 100644
index b40aded50ee..00000000000
--- a/vendor/google.golang.org/protobuf/internal/descfmt/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/descfmt)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/descfmt/stringer.go b/vendor/google.golang.org/protobuf/internal/descfmt/stringer.go
index db5248e1b51..a45625c8d1f 100644
--- a/vendor/google.golang.org/protobuf/internal/descfmt/stringer.go
+++ b/vendor/google.golang.org/protobuf/internal/descfmt/stringer.go
@@ -83,7 +83,13 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
 	case protoreflect.FileImports:
 		for i := 0; i < vs.Len(); i++ {
 			var rs records
-			rs.Append(reflect.ValueOf(vs.Get(i)), "Path", "Package", "IsPublic", "IsWeak")
+			rv := reflect.ValueOf(vs.Get(i))
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Path"), "Path"},
+				{rv.MethodByName("Package"), "Package"},
+				{rv.MethodByName("IsPublic"), "IsPublic"},
+				{rv.MethodByName("IsWeak"), "IsWeak"},
+			}...)
 			ss = append(ss, "{"+rs.Join()+"}")
 		}
 		return start + joinStrings(ss, allowMulti) + end
@@ -92,34 +98,26 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
 		for i := 0; i < vs.Len(); i++ {
 			m := reflect.ValueOf(vs).MethodByName("Get")
 			v := m.Call([]reflect.Value{reflect.ValueOf(i)})[0].Interface()
-			ss = append(ss, formatDescOpt(v.(protoreflect.Descriptor), false, allowMulti && !isEnumValue))
+			ss = append(ss, formatDescOpt(v.(protoreflect.Descriptor), false, allowMulti && !isEnumValue, nil))
 		}
 		return start + joinStrings(ss, allowMulti && isEnumValue) + end
 	}
 }
 
-// descriptorAccessors is a list of accessors to print for each descriptor.
-//
-// Do not print all accessors since some contain redundant information,
-// while others are pointers that we do not want to follow since the descriptor
-// is actually a cyclic graph.
-//
-// Using a list allows us to print the accessors in a sensible order.
-var descriptorAccessors = map[reflect.Type][]string{
-	reflect.TypeOf((*protoreflect.FileDescriptor)(nil)).Elem():      {"Path", "Package", "Imports", "Messages", "Enums", "Extensions", "Services"},
-	reflect.TypeOf((*protoreflect.MessageDescriptor)(nil)).Elem():   {"IsMapEntry", "Fields", "Oneofs", "ReservedNames", "ReservedRanges", "RequiredNumbers", "ExtensionRanges", "Messages", "Enums", "Extensions"},
-	reflect.TypeOf((*protoreflect.FieldDescriptor)(nil)).Elem():     {"Number", "Cardinality", "Kind", "HasJSONName", "JSONName", "HasPresence", "IsExtension", "IsPacked", "IsWeak", "IsList", "IsMap", "MapKey", "MapValue", "HasDefault", "Default", "ContainingOneof", "ContainingMessage", "Message", "Enum"},
-	reflect.TypeOf((*protoreflect.OneofDescriptor)(nil)).Elem():     {"Fields"}, // not directly used; must keep in sync with formatDescOpt
-	reflect.TypeOf((*protoreflect.EnumDescriptor)(nil)).Elem():      {"Values", "ReservedNames", "ReservedRanges"},
-	reflect.TypeOf((*protoreflect.EnumValueDescriptor)(nil)).Elem(): {"Number"},
-	reflect.TypeOf((*protoreflect.ServiceDescriptor)(nil)).Elem():   {"Methods"},
-	reflect.TypeOf((*protoreflect.MethodDescriptor)(nil)).Elem():    {"Input", "Output", "IsStreamingClient", "IsStreamingServer"},
+type methodAndName struct {
+	method reflect.Value
+	name   string
 }
 
 func FormatDesc(s fmt.State, r rune, t protoreflect.Descriptor) {
-	io.WriteString(s, formatDescOpt(t, true, r == 'v' && (s.Flag('+') || s.Flag('#'))))
+	io.WriteString(s, formatDescOpt(t, true, r == 'v' && (s.Flag('+') || s.Flag('#')), nil))
 }
-func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool) string {
+
+func InternalFormatDescOptForTesting(t protoreflect.Descriptor, isRoot, allowMulti bool, record func(string)) string {
+	return formatDescOpt(t, isRoot, allowMulti, record)
+}
+
+func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool, record func(string)) string {
 	rv := reflect.ValueOf(t)
 	rt := rv.MethodByName("ProtoType").Type().In(0)
 
@@ -129,26 +127,60 @@ func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool) string {
 	}
 
 	_, isFile := t.(protoreflect.FileDescriptor)
-	rs := records{allowMulti: allowMulti}
+	rs := records{
+		allowMulti: allowMulti,
+		record:     record,
+	}
 	if t.IsPlaceholder() {
 		if isFile {
-			rs.Append(rv, "Path", "Package", "IsPlaceholder")
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Path"), "Path"},
+				{rv.MethodByName("Package"), "Package"},
+				{rv.MethodByName("IsPlaceholder"), "IsPlaceholder"},
+			}...)
 		} else {
-			rs.Append(rv, "FullName", "IsPlaceholder")
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("FullName"), "FullName"},
+				{rv.MethodByName("IsPlaceholder"), "IsPlaceholder"},
+			}...)
 		}
 	} else {
 		switch {
 		case isFile:
-			rs.Append(rv, "Syntax")
+			rs.Append(rv, methodAndName{rv.MethodByName("Syntax"), "Syntax"})
 		case isRoot:
-			rs.Append(rv, "Syntax", "FullName")
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Syntax"), "Syntax"},
+				{rv.MethodByName("FullName"), "FullName"},
+			}...)
 		default:
-			rs.Append(rv, "Name")
+			rs.Append(rv, methodAndName{rv.MethodByName("Name"), "Name"})
 		}
 		switch t := t.(type) {
 		case protoreflect.FieldDescriptor:
-			for _, s := range descriptorAccessors[rt] {
-				switch s {
+			accessors := []methodAndName{
+				{rv.MethodByName("Number"), "Number"},
+				{rv.MethodByName("Cardinality"), "Cardinality"},
+				{rv.MethodByName("Kind"), "Kind"},
+				{rv.MethodByName("HasJSONName"), "HasJSONName"},
+				{rv.MethodByName("JSONName"), "JSONName"},
+				{rv.MethodByName("HasPresence"), "HasPresence"},
+				{rv.MethodByName("IsExtension"), "IsExtension"},
+				{rv.MethodByName("IsPacked"), "IsPacked"},
+				{rv.MethodByName("IsWeak"), "IsWeak"},
+				{rv.MethodByName("IsList"), "IsList"},
+				{rv.MethodByName("IsMap"), "IsMap"},
+				{rv.MethodByName("MapKey"), "MapKey"},
+				{rv.MethodByName("MapValue"), "MapValue"},
+				{rv.MethodByName("HasDefault"), "HasDefault"},
+				{rv.MethodByName("Default"), "Default"},
+				{rv.MethodByName("ContainingOneof"), "ContainingOneof"},
+				{rv.MethodByName("ContainingMessage"), "ContainingMessage"},
+				{rv.MethodByName("Message"), "Message"},
+				{rv.MethodByName("Enum"), "Enum"},
+			}
+			for _, s := range accessors {
+				switch s.name {
 				case "MapKey":
 					if k := t.MapKey(); k != nil {
 						rs.recs = append(rs.recs, [2]string{"MapKey", k.Kind().String()})
@@ -157,20 +189,20 @@ func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool) string {
 					if v := t.MapValue(); v != nil {
 						switch v.Kind() {
 						case protoreflect.EnumKind:
-							rs.recs = append(rs.recs, [2]string{"MapValue", string(v.Enum().FullName())})
+							rs.AppendRecs("MapValue", [2]string{"MapValue", string(v.Enum().FullName())})
 						case protoreflect.MessageKind, protoreflect.GroupKind:
-							rs.recs = append(rs.recs, [2]string{"MapValue", string(v.Message().FullName())})
+							rs.AppendRecs("MapValue", [2]string{"MapValue", string(v.Message().FullName())})
 						default:
-							rs.recs = append(rs.recs, [2]string{"MapValue", v.Kind().String()})
+							rs.AppendRecs("MapValue", [2]string{"MapValue", v.Kind().String()})
 						}
 					}
 				case "ContainingOneof":
 					if od := t.ContainingOneof(); od != nil {
-						rs.recs = append(rs.recs, [2]string{"Oneof", string(od.Name())})
+						rs.AppendRecs("ContainingOneof", [2]string{"Oneof", string(od.Name())})
 					}
 				case "ContainingMessage":
 					if t.IsExtension() {
-						rs.recs = append(rs.recs, [2]string{"Extendee", string(t.ContainingMessage().FullName())})
+						rs.AppendRecs("ContainingMessage", [2]string{"Extendee", string(t.ContainingMessage().FullName())})
 					}
 				case "Message":
 					if !t.IsMap() {
@@ -187,13 +219,61 @@ func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool) string {
 				ss = append(ss, string(fs.Get(i).Name()))
 			}
 			if len(ss) > 0 {
-				rs.recs = append(rs.recs, [2]string{"Fields", "[" + joinStrings(ss, false) + "]"})
+				rs.AppendRecs("Fields", [2]string{"Fields", "[" + joinStrings(ss, false) + "]"})
 			}
-		default:
-			rs.Append(rv, descriptorAccessors[rt]...)
+
+		case protoreflect.FileDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Path"), "Path"},
+				{rv.MethodByName("Package"), "Package"},
+				{rv.MethodByName("Imports"), "Imports"},
+				{rv.MethodByName("Messages"), "Messages"},
+				{rv.MethodByName("Enums"), "Enums"},
+				{rv.MethodByName("Extensions"), "Extensions"},
+				{rv.MethodByName("Services"), "Services"},
+			}...)
+
+		case protoreflect.MessageDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("IsMapEntry"), "IsMapEntry"},
+				{rv.MethodByName("Fields"), "Fields"},
+				{rv.MethodByName("Oneofs"), "Oneofs"},
+				{rv.MethodByName("ReservedNames"), "ReservedNames"},
+				{rv.MethodByName("ReservedRanges"), "ReservedRanges"},
+				{rv.MethodByName("RequiredNumbers"), "RequiredNumbers"},
+				{rv.MethodByName("ExtensionRanges"), "ExtensionRanges"},
+				{rv.MethodByName("Messages"), "Messages"},
+				{rv.MethodByName("Enums"), "Enums"},
+				{rv.MethodByName("Extensions"), "Extensions"},
+			}...)
+
+		case protoreflect.EnumDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Values"), "Values"},
+				{rv.MethodByName("ReservedNames"), "ReservedNames"},
+				{rv.MethodByName("ReservedRanges"), "ReservedRanges"},
+			}...)
+
+		case protoreflect.EnumValueDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Number"), "Number"},
+			}...)
+
+		case protoreflect.ServiceDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Methods"), "Methods"},
+			}...)
+
+		case protoreflect.MethodDescriptor:
+			rs.Append(rv, []methodAndName{
+				{rv.MethodByName("Input"), "Input"},
+				{rv.MethodByName("Output"), "Output"},
+				{rv.MethodByName("IsStreamingClient"), "IsStreamingClient"},
+				{rv.MethodByName("IsStreamingServer"), "IsStreamingServer"},
+			}...)
 		}
-		if rv.MethodByName("GoType").IsValid() {
-			rs.Append(rv, "GoType")
+		if m := rv.MethodByName("GoType"); m.IsValid() {
+			rs.Append(rv, methodAndName{m, "GoType"})
 		}
 	}
 	return start + rs.Join() + end
@@ -202,19 +282,34 @@ func formatDescOpt(t protoreflect.Descriptor, isRoot, allowMulti bool) string {
 type records struct {
 	recs       [][2]string
 	allowMulti bool
+
+	// record is a function that will be called for every Append() or
+	// AppendRecs() call, to be used for testing with the
+	// InternalFormatDescOptForTesting function.
+	record func(string)
 }
 
-func (rs *records) Append(v reflect.Value, accessors ...string) {
+func (rs *records) AppendRecs(fieldName string, newRecs [2]string) {
+	if rs.record != nil {
+		rs.record(fieldName)
+	}
+	rs.recs = append(rs.recs, newRecs)
+}
+
+func (rs *records) Append(v reflect.Value, accessors ...methodAndName) {
 	for _, a := range accessors {
+		if rs.record != nil {
+			rs.record(a.name)
+		}
 		var rv reflect.Value
-		if m := v.MethodByName(a); m.IsValid() {
-			rv = m.Call(nil)[0]
+		if a.method.IsValid() {
+			rv = a.method.Call(nil)[0]
 		}
 		if v.Kind() == reflect.Struct && !rv.IsValid() {
-			rv = v.FieldByName(a)
+			rv = v.FieldByName(a.name)
 		}
 		if !rv.IsValid() {
-			panic(fmt.Sprintf("unknown accessor: %v.%s", v.Type(), a))
+			panic(fmt.Sprintf("unknown accessor: %v.%s", v.Type(), a.name))
 		}
 		if _, ok := rv.Interface().(protoreflect.Value); ok {
 			rv = rv.MethodByName("Interface").Call(nil)[0]
@@ -261,7 +356,7 @@ func (rs *records) Append(v reflect.Value, accessors ...string) {
 		default:
 			s = fmt.Sprint(v)
 		}
-		rs.recs = append(rs.recs, [2]string{a, s})
+		rs.recs = append(rs.recs, [2]string{a.name, s})
 	}
 }
 
diff --git a/vendor/google.golang.org/protobuf/internal/descfmt/ya.make b/vendor/google.golang.org/protobuf/internal/descfmt/ya.make
index eaaabd5a49c..6f0464b58b7 100644
--- a/vendor/google.golang.org/protobuf/internal/descfmt/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/descfmt/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(stringer.go)
-
-GO_TEST_SRCS(desc_test.go)
+SRCS(
+    stringer.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/descopts/ya.make b/vendor/google.golang.org/protobuf/internal/descopts/ya.make
index 2dcbe190355..26ef6cc24b3 100644
--- a/vendor/google.golang.org/protobuf/internal/descopts/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/descopts/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(options.go)
+SRCS(
+    options.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/internal/detrand/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/detrand/gotest/ya.make
deleted file mode 100644
index e6a5b0942ab..00000000000
--- a/vendor/google.golang.org/protobuf/internal/detrand/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/detrand)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/detrand/rand_test.go b/vendor/google.golang.org/protobuf/internal/detrand/rand_test.go
deleted file mode 100644
index 68c55d284c1..00000000000
--- a/vendor/google.golang.org/protobuf/internal/detrand/rand_test.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package detrand
-
-import "testing"
-
-func Benchmark(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		binaryHash()
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/detrand/ya.make b/vendor/google.golang.org/protobuf/internal/detrand/ya.make
index bfb54987872..dd1b8456b91 100644
--- a/vendor/google.golang.org/protobuf/internal/detrand/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/detrand/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(rand.go)
-
-GO_TEST_SRCS(rand_test.go)
+SRCS(
+    rand.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/defval/default_test.go b/vendor/google.golang.org/protobuf/internal/encoding/defval/default_test.go
deleted file mode 100644
index bde8ca2aa34..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/defval/default_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package defval_test
-
-import (
-	"math"
-	"reflect"
-	"testing"
-
-	"google.golang.org/protobuf/internal/encoding/defval"
-	"google.golang.org/protobuf/internal/filedesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-func Test(t *testing.T) {
-	evs := filedesc.EnumValues{List: []filedesc.EnumValue{{}}}
-	evs.List[0].L0.ParentFile = filedesc.SurrogateProto2
-	evs.List[0].L0.FullName = "ALPHA"
-	evs.List[0].L1.Number = 1
-
-	V := protoreflect.ValueOf
-	tests := []struct {
-		val   protoreflect.Value
-		enum  protoreflect.EnumValueDescriptor
-		enums protoreflect.EnumValueDescriptors
-		kind  protoreflect.Kind
-		strPB string
-		strGo string
-	}{{
-		val:   V(bool(true)),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.BoolKind,
-		strPB: "true",
-		strGo: "1",
-	}, {
-		val:   V(int32(-0x1234)),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.Int32Kind,
-		strPB: "-4660",
-		strGo: "-4660",
-	}, {
-		val:   V(float32(math.Pi)),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.FloatKind,
-		strPB: "3.1415927",
-		strGo: "3.1415927",
-	}, {
-		val:   V(float64(math.Pi)),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.DoubleKind,
-		strPB: "3.141592653589793",
-		strGo: "3.141592653589793",
-	}, {
-		val:   V(string("hello, \xde\xad\xbe\xef\n")),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.StringKind,
-		strPB: "hello, \xde\xad\xbe\xef\n",
-		strGo: "hello, \xde\xad\xbe\xef\n",
-	}, {
-		val:   V([]byte("hello, \xde\xad\xbe\xef\n")),
-		enum:  nil,
-		enums: nil,
-		kind:  protoreflect.BytesKind,
-		strPB: "hello, \\336\\255\\276\\357\\n",
-		strGo: "hello, \\336\\255\\276\\357\\n",
-	}, {
-		val:   V(protoreflect.EnumNumber(1)),
-		enum:  &evs.List[0],
-		enums: &evs,
-		kind:  protoreflect.EnumKind,
-		strPB: "ALPHA",
-		strGo: "1",
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			gotStr, _ := defval.Marshal(tt.val, tt.enum, tt.kind, defval.Descriptor)
-			if gotStr != tt.strPB {
-				t.Errorf("Marshal(%v, %v, Descriptor) = %q, want %q", tt.val, tt.kind, gotStr, tt.strPB)
-			}
-
-			gotStr, _ = defval.Marshal(tt.val, tt.enum, tt.kind, defval.GoTag)
-			if gotStr != tt.strGo {
-				t.Errorf("Marshal(%v, %v, GoTag) = %q, want %q", tt.val, tt.kind, gotStr, tt.strGo)
-			}
-
-			gotVal, gotEnum, _ := defval.Unmarshal(tt.strPB, tt.kind, tt.enums, defval.Descriptor)
-			if !reflect.DeepEqual(gotVal.Interface(), tt.val.Interface()) || gotEnum != tt.enum {
-				t.Errorf("Unmarshal(%v, %v, Descriptor) = (%q, %v), want (%q, %v)", tt.strPB, tt.kind, gotVal, gotEnum, tt.val, tt.enum)
-			}
-
-			gotVal, gotEnum, _ = defval.Unmarshal(tt.strGo, tt.kind, tt.enums, defval.GoTag)
-			if !reflect.DeepEqual(gotVal.Interface(), tt.val.Interface()) || gotEnum != tt.enum {
-				t.Errorf("Unmarshal(%v, %v, GoTag) = (%q, %v), want (%q, %v)", tt.strGo, tt.kind, gotVal, gotEnum, tt.val, tt.enum)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/defval/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/defval/gotest/ya.make
deleted file mode 100644
index 90edb812b12..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/defval/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/encoding/defval)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/defval/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/defval/ya.make
index 96b84b177e0..9f5b5a3fb7f 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/defval/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/encoding/defval/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(default.go)
-
-GO_XTEST_SRCS(default_test.go)
+SRCS(
+    default.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/bench_test.go b/vendor/google.golang.org/protobuf/internal/encoding/json/bench_test.go
deleted file mode 100644
index 284b141a8ee..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/json/bench_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package json_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/internal/encoding/json"
-)
-
-func BenchmarkFloat(b *testing.B) {
-	input := []byte(`1.797693134862315708145274237317043567981e+308`)
-	for i := 0; i < b.N; i++ {
-		dec := json.NewDecoder(input)
-		val, err := dec.Read()
-		if err != nil {
-			b.Fatal(err)
-		}
-		if _, ok := val.Float(64); !ok {
-			b.Fatal("not a float")
-		}
-	}
-}
-
-func BenchmarkInt(b *testing.B) {
-	input := []byte(`922337203.6854775807e+10`)
-	for i := 0; i < b.N; i++ {
-		dec := json.NewDecoder(input)
-		val, err := dec.Read()
-		if err != nil {
-			b.Fatal(err)
-		}
-		if _, ok := val.Int(64); !ok {
-			b.Fatal("not an int64")
-		}
-	}
-}
-
-func BenchmarkString(b *testing.B) {
-	input := []byte(`"abcdefghijklmnopqrstuvwxyz0123456789\\n\\t"`)
-	for i := 0; i < b.N; i++ {
-		dec := json.NewDecoder(input)
-		val, err := dec.Read()
-		if err != nil {
-			b.Fatal(err)
-		}
-		_ = val.ParsedString()
-	}
-}
-
-func BenchmarkBool(b *testing.B) {
-	input := []byte(`true`)
-	for i := 0; i < b.N; i++ {
-		dec := json.NewDecoder(input)
-		val, err := dec.Read()
-		if err != nil {
-			b.Fatal(err)
-		}
-		_ = val.Bool()
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/decode_test.go b/vendor/google.golang.org/protobuf/internal/encoding/json/decode_test.go
deleted file mode 100644
index d70c3de0e04..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/json/decode_test.go
+++ /dev/null
@@ -1,1414 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package json_test
-
-import (
-	"fmt"
-	"math"
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/encoding/json"
-)
-
-type R struct {
-	// E is expected error substring from calling Decoder.Read if set.
-	E string
-	// V is one of the checker implementations that validates the token value.
-	V checker
-	// P is expected Token.Pos() if set > 0.
-	P int
-	// RS is expected result from Token.RawString() if not empty.
-	RS string
-}
-
-// checker defines API for Token validation.
-type checker interface {
-	// check checks and expects for token API call to return and compare
-	// against implementation-stored value. Returns empty string if success,
-	// else returns error message describing the error.
-	check(json.Token) string
-}
-
-// checkers that checks the token kind only.
-var (
-	EOF         = kindOnly{json.EOF}
-	Null        = kindOnly{json.Null}
-	ObjectOpen  = kindOnly{json.ObjectOpen}
-	ObjectClose = kindOnly{json.ObjectClose}
-	ArrayOpen   = kindOnly{json.ArrayOpen}
-	ArrayClose  = kindOnly{json.ArrayClose}
-)
-
-type kindOnly struct {
-	want json.Kind
-}
-
-func (x kindOnly) check(tok json.Token) string {
-	if got := tok.Kind(); got != x.want {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, x.want)
-	}
-	return ""
-}
-
-type Name struct {
-	val string
-}
-
-func (x Name) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Name {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Name)
-	}
-
-	if got := tok.Name(); got != x.val {
-		return fmt.Sprintf("Token.Name(): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type Bool struct {
-	val bool
-}
-
-func (x Bool) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Bool {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Bool)
-	}
-
-	if got := tok.Bool(); got != x.val {
-		return fmt.Sprintf("Token.Bool(): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type Str struct {
-	val string
-}
-
-func (x Str) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.String {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.String)
-	}
-
-	if got := tok.ParsedString(); got != x.val {
-		return fmt.Sprintf("Token.ParsedString(): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type F64 struct {
-	val float64
-}
-
-func (x F64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Float(64)
-	if !ok {
-		return fmt.Sprintf("Token.Float(64): returned not ok")
-	}
-	if got != x.val {
-		return fmt.Sprintf("Token.Float(64): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type F32 struct {
-	val float32
-}
-
-func (x F32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Float(32)
-	if !ok {
-		return fmt.Sprintf("Token.Float(32): returned not ok")
-	}
-	if float32(got) != x.val {
-		return fmt.Sprintf("Token.Float(32): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-// NotF64 is a checker to validate a Number token where Token.Float(64) returns not ok.
-var NotF64 = xf64{}
-
-type xf64 struct{}
-
-func (x xf64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Float(64)
-	if ok {
-		return fmt.Sprintf("Token.Float(64): returned ok")
-	}
-	return ""
-}
-
-// NotF32 is a checker to validate a Number token where Token.Float(32) returns not ok.
-var NotF32 = xf32{}
-
-type xf32 struct{}
-
-func (x xf32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Float(32)
-	if ok {
-		return fmt.Sprintf("Token.Float(32): returned ok")
-	}
-	return ""
-}
-
-type I64 struct {
-	val int64
-}
-
-func (x I64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Int(64)
-	if !ok {
-		return fmt.Sprintf("Token.Int(64): returned not ok")
-	}
-	if got != x.val {
-		return fmt.Sprintf("Token.Int(64): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type I32 struct {
-	val int32
-}
-
-func (x I32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Int(32)
-	if !ok {
-		return fmt.Sprintf("Token.Int(32): returned not ok")
-	}
-	if int32(got) != x.val {
-		return fmt.Sprintf("Token.Int(32): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-// NotI64 is a checker to validate a Number token where Token.Int(64) returns not ok.
-var NotI64 = xi64{}
-
-type xi64 struct{}
-
-func (x xi64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Int(64)
-	if ok {
-		return fmt.Sprintf("Token.Int(64): returned ok")
-	}
-	return ""
-}
-
-// NotI32 is a checker to validate a Number token where Token.Int(32) returns not ok.
-var NotI32 = xi32{}
-
-type xi32 struct{}
-
-func (x xi32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Int(32)
-	if ok {
-		return fmt.Sprintf("Token.Int(32): returned ok")
-	}
-	return ""
-}
-
-type Ui64 struct {
-	val uint64
-}
-
-func (x Ui64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Uint(64)
-	if !ok {
-		return fmt.Sprintf("Token.Uint(64): returned not ok")
-	}
-	if got != x.val {
-		return fmt.Sprintf("Token.Uint(64): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-type Ui32 struct {
-	val uint32
-}
-
-func (x Ui32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	got, ok := tok.Uint(32)
-	if !ok {
-		return fmt.Sprintf("Token.Uint(32): returned not ok")
-	}
-	if uint32(got) != x.val {
-		return fmt.Sprintf("Token.Uint(32): got %v, want %v", got, x.val)
-	}
-	return ""
-}
-
-// NotUi64 is a checker to validate a Number token where Token.Uint(64) returns not ok.
-var NotUi64 = xui64{}
-
-type xui64 struct{}
-
-func (x xui64) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Uint(64)
-	if ok {
-		return fmt.Sprintf("Token.Uint(64): returned ok")
-	}
-	return ""
-}
-
-// NotI32 is a checker to validate a Number token where Token.Uint(32) returns not ok.
-var NotUi32 = xui32{}
-
-type xui32 struct{}
-
-func (x xui32) check(tok json.Token) string {
-	if got := tok.Kind(); got != json.Number {
-		return fmt.Sprintf("Token.Kind(): got %v, want %v", got, json.Number)
-	}
-
-	_, ok := tok.Uint(32)
-	if ok {
-		return fmt.Sprintf("Token.Uint(32): returned ok")
-	}
-	return ""
-}
-
-var errEOF = json.ErrUnexpectedEOF.Error()
-
-func TestDecoder(t *testing.T) {
-	const space = " \n\r\t"
-
-	tests := []struct {
-		in string
-		// want is a list of expected values returned from calling
-		// Decoder.Read. An item makes the test code invoke
-		// Decoder.Read and compare against R.E for error returned or use R.V to
-		// validate the returned Token object.
-		want []R
-	}{
-		{
-			in:   ``,
-			want: []R{{V: EOF}},
-		},
-		{
-			in:   space,
-			want: []R{{V: EOF}},
-		},
-		{
-			// Calling Read after EOF will keep returning EOF for
-			// succeeding Read calls.
-			in: space,
-			want: []R{
-				{V: EOF},
-				{V: EOF},
-				{V: EOF},
-			},
-		},
-
-		// JSON literals.
-		{
-			in: space + `null` + space,
-			want: []R{
-				{V: Null, P: len(space), RS: `null`},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `true` + space,
-			want: []R{
-				{V: Bool{true}},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `false` + space,
-			want: []R{
-				{V: Bool{false}},
-				{V: EOF},
-			},
-		},
-		{
-			// Error returned will produce the same error again.
-			in: space + `foo` + space,
-			want: []R{
-				{E: `invalid value foo`},
-				{E: `invalid value foo`},
-			},
-		},
-
-		// JSON strings.
-		{
-			in: space + `""` + space,
-			want: []R{
-				{V: Str{}},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `"hello"` + space,
-			want: []R{
-				{V: Str{"hello"}, RS: `"hello"`},
-				{V: EOF},
-			},
-		},
-		{
-			in:   `"hello`,
-			want: []R{{E: errEOF}},
-		},
-		{
-			in:   "\"\x00\"",
-			want: []R{{E: `invalid character '\x00' in string`}},
-		},
-		{
-			in: "\"\u0031\u0032\"",
-			want: []R{
-				{V: Str{"12"}, RS: "\"\u0031\u0032\""},
-				{V: EOF},
-			},
-		},
-		{
-			// Invalid UTF-8 error is returned in ReadString instead of Read.
-			in:   "\"\xff\"",
-			want: []R{{E: `syntax error (line 1:1): invalid UTF-8 in string`}},
-		},
-		{
-			in: `"` + string(utf8.RuneError) + `"`,
-			want: []R{
-				{V: Str{string(utf8.RuneError)}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `"\uFFFD"`,
-			want: []R{
-				{V: Str{string(utf8.RuneError)}},
-				{V: EOF},
-			},
-		},
-		{
-			in:   `"\x"`,
-			want: []R{{E: `invalid escape code "\\x" in string`}},
-		},
-		{
-			in:   `"\uXXXX"`,
-			want: []R{{E: `invalid escape code "\\uXXXX" in string`}},
-		},
-		{
-			in:   `"\uDEAD"`, // unmatched surrogate pair
-			want: []R{{E: errEOF}},
-		},
-		{
-			in:   `"\uDEAD\uBEEF"`, // invalid surrogate half
-			want: []R{{E: `invalid escape code "\\uBEEF" in string`}},
-		},
-		{
-			in: `"\uD800\udead"`, // valid surrogate pair
-			want: []R{
-				{V: Str{`𐊭`}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `"\u0000\"\\\/\b\f\n\r\t"`,
-			want: []R{
-				{V: Str{"\u0000\"\\/\b\f\n\r\t"}},
-				{V: EOF},
-			},
-		},
-
-		// Invalid JSON numbers.
-		{
-			in:   `-`,
-			want: []R{{E: `invalid value -`}},
-		},
-		{
-			in:   `+0`,
-			want: []R{{E: `invalid value +0`}},
-		},
-		{
-			in:   `-+`,
-			want: []R{{E: `invalid value -+`}},
-		},
-		{
-			in:   `0.`,
-			want: []R{{E: `invalid value 0.`}},
-		},
-		{
-			in:   `.1`,
-			want: []R{{E: `invalid value .1`}},
-		},
-		{
-			in:   `1.0.1`,
-			want: []R{{E: `invalid value 1.0.1`}},
-		},
-		{
-			in:   `1..1`,
-			want: []R{{E: `invalid value 1..1`}},
-		},
-		{
-			in:   `-1-2`,
-			want: []R{{E: `invalid value -1-2`}},
-		},
-		{
-			in:   `01`,
-			want: []R{{E: `invalid value 01`}},
-		},
-		{
-			in:   `1e`,
-			want: []R{{E: `invalid value 1e`}},
-		},
-		{
-			in:   `1e1.2`,
-			want: []R{{E: `invalid value 1e1.2`}},
-		},
-		{
-			in:   `1Ee`,
-			want: []R{{E: `invalid value 1Ee`}},
-		},
-		{
-			in:   `1.e1`,
-			want: []R{{E: `invalid value 1.e1`}},
-		},
-		{
-			in:   `1.e+`,
-			want: []R{{E: `invalid value 1.e+`}},
-		},
-		{
-			in:   `1e+-2`,
-			want: []R{{E: `invalid value 1e+-2`}},
-		},
-		{
-			in:   `1e--2`,
-			want: []R{{E: `invalid value 1e--2`}},
-		},
-		{
-			in:   `1.0true`,
-			want: []R{{E: `invalid value 1.0true`}},
-		},
-
-		// JSON numbers as floating point.
-		{
-			in: space + `0.0` + space,
-			want: []R{
-				{V: F32{0}, P: len(space), RS: `0.0`},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `0` + space,
-			want: []R{
-				{V: F32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `-0` + space,
-			want: []R{
-				{V: F32{float32(math.Copysign(0, -1))}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-0`,
-			want: []R{
-				{V: F64{math.Copysign(0, -1)}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-0.0`,
-			want: []R{
-				{V: F32{float32(math.Copysign(0, -1))}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-0.0`,
-			want: []R{
-				{V: F64{math.Copysign(0, -1)}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1.02`,
-			want: []R{
-				{V: F32{-1.02}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.020000`,
-			want: []R{
-				{V: F32{1.02}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1.0e0`,
-			want: []R{
-				{V: F32{-1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.0e-000`,
-			want: []R{
-				{V: F32{1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1e+00`,
-			want: []R{
-				{V: F32{1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.02e3`,
-			want: []R{
-				{V: F32{1.02e3}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1.02E03`,
-			want: []R{
-				{V: F32{-1.02e3}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.0200e+3`,
-			want: []R{
-				{V: F32{1.02e3}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1.0200E+03`,
-			want: []R{
-				{V: F32{-1.02e3}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.0200e-3`,
-			want: []R{
-				{V: F32{1.02e-3}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1.0200E-03`,
-			want: []R{
-				{V: F32{-1.02e-3}},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds max float32 limit, but should be ok for float64.
-			in: `3.4e39`,
-			want: []R{
-				{V: F64{3.4e39}},
-				{V: EOF},
-			},
-		},
-
-		{
-			// Exceeds max float32 limit.
-			in: `3.4e39`,
-			want: []R{
-				{V: NotF32},
-				{V: EOF},
-			},
-		},
-		{
-			// Less than negative max float32 limit.
-			in: `-3.4e39`,
-			want: []R{
-				{V: NotF32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds max float64 limit.
-			in: `1.79e+309`,
-			want: []R{
-				{V: NotF64},
-				{V: EOF},
-			},
-		},
-		{
-			// Less than negative max float64 limit.
-			in: `-1.79e+309`,
-			want: []R{
-				{V: NotF64},
-				{V: EOF},
-			},
-		},
-
-		// JSON numbers as signed integers.
-		{
-			in: space + `0` + space,
-			want: []R{
-				{V: I32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `-0` + space,
-			want: []R{
-				{V: I32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			// Fractional part equals 0 is ok.
-			in: `1.00000`,
-			want: []R{
-				{V: I32{1}},
-				{V: EOF},
-			},
-		},
-		{
-			// Fractional part not equals 0 returns error.
-			in: `1.0000000001`,
-			want: []R{
-				{V: NotI32},
-				{V: EOF},
-			},
-		},
-		{
-			in: `0e0`,
-			want: []R{
-				{V: I32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `0.0E0`,
-			want: []R{
-				{V: I32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `0.0E10`,
-			want: []R{
-				{V: I32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1`,
-			want: []R{
-				{V: I32{-1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1.0e+0`,
-			want: []R{
-				{V: I32{1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1E-0`,
-			want: []R{
-				{V: I32{-1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `1E1`,
-			want: []R{
-				{V: I32{10}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-100.00e-02`,
-			want: []R{
-				{V: I32{-1}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `0.1200E+02`,
-			want: []R{
-				{V: I64{12}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `0.012e2`,
-			want: []R{
-				{V: NotI32},
-				{V: EOF},
-			},
-		},
-		{
-			in: `12e-2`,
-			want: []R{
-				{V: NotI32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MaxInt32.
-			in: `2147483648`,
-			want: []R{
-				{V: NotI32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MinInt32.
-			in: `-2147483649`,
-			want: []R{
-				{V: NotI32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MaxInt32, but ok for int64.
-			in: `2147483648`,
-			want: []R{
-				{V: I64{2147483648}},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MinInt32, but ok for int64.
-			in: `-2147483649`,
-			want: []R{
-				{V: I64{-2147483649}},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MaxInt64.
-			in: `9223372036854775808`,
-			want: []R{
-				{V: NotI64},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MinInt64.
-			in: `-9223372036854775809`,
-			want: []R{
-				{V: NotI64},
-				{V: EOF},
-			},
-		},
-
-		// JSON numbers as unsigned integers.
-		{
-			in: space + `0` + space,
-			want: []R{
-				{V: Ui32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `-0` + space,
-			want: []R{
-				{V: Ui32{0}},
-				{V: EOF},
-			},
-		},
-		{
-			in: `-1`,
-			want: []R{
-				{V: NotUi32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MaxUint32.
-			in: `4294967296`,
-			want: []R{
-				{V: NotUi32},
-				{V: EOF},
-			},
-		},
-		{
-			// Exceeds math.MaxUint64.
-			in: `18446744073709551616`,
-			want: []R{
-				{V: NotUi64},
-				{V: EOF},
-			},
-		},
-
-		// JSON sequence of values.
-		{
-			in: `true null`,
-			want: []R{
-				{V: Bool{true}},
-				{E: `(line 1:6): unexpected token null`},
-			},
-		},
-		{
-			in: "null false",
-			want: []R{
-				{V: Null},
-				{E: `unexpected token false`},
-			},
-		},
-		{
-			in: `true,false`,
-			want: []R{
-				{V: Bool{true}},
-				{E: `unexpected token ,`},
-			},
-		},
-		{
-			in: `47"hello"`,
-			want: []R{
-				{V: I32{47}},
-				{E: `unexpected token "hello"`},
-			},
-		},
-		{
-			in: `47 "hello"`,
-			want: []R{
-				{V: I32{47}},
-				{E: `unexpected token "hello"`},
-			},
-		},
-		{
-			in: `true 42`,
-			want: []R{
-				{V: Bool{true}},
-				{E: `unexpected token 42`},
-			},
-		},
-
-		// JSON arrays.
-		{
-			in: space + `[]` + space,
-			want: []R{
-				{V: ArrayOpen},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `[` + space + `]` + space,
-			want: []R{
-				{V: ArrayOpen, P: len(space), RS: `[`},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `[` + space,
-			want: []R{
-				{V: ArrayOpen},
-				{E: errEOF},
-			},
-		},
-		{
-			in:   space + `]` + space,
-			want: []R{{E: `unexpected token ]`}},
-		},
-		{
-			in: `[null,true,false,  1e1, "hello"   ]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Null},
-				{V: Bool{true}},
-				{V: Bool{false}},
-				{V: I32{10}},
-				{V: Str{"hello"}},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `[` + space + `true` + space + `,` + space + `"hello"` + space + `]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Bool{true}},
-				{V: Str{"hello"}},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `[` + space + `true` + space + `,` + space + `]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Bool{true}},
-				{E: `unexpected token ]`},
-			},
-		},
-		{
-			in: `[` + space + `false` + space + `]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Bool{false}},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `[` + space + `1` + space + `0` + space + `]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: I64{1}},
-				{E: `unexpected token 0`},
-			},
-		},
-		{
-			in: `[null`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Null},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `[foo]`,
-			want: []R{
-				{V: ArrayOpen},
-				{E: `invalid value foo`},
-			},
-		},
-		{
-			in: `[{}, "hello", [true, false], null]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: ObjectOpen},
-				{V: ObjectClose},
-				{V: Str{"hello"}},
-				{V: ArrayOpen},
-				{V: Bool{true}},
-				{V: Bool{false}},
-				{V: ArrayClose},
-				{V: Null},
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `[{ ]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: ObjectOpen},
-				{E: `unexpected token ]`},
-			},
-		},
-		{
-			in: `[[ ]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: ArrayOpen},
-				{V: ArrayClose},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `[,]`,
-			want: []R{
-				{V: ArrayOpen},
-				{E: `unexpected token ,`},
-			},
-		},
-		{
-			in: `[true "hello"]`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Bool{true}},
-				{E: `unexpected token "hello"`},
-			},
-		},
-		{
-			in: `[] null`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: ArrayClose},
-				{E: `unexpected token null`},
-			},
-		},
-		{
-			in: `true []`,
-			want: []R{
-				{V: Bool{true}},
-				{E: `unexpected token [`},
-			},
-		},
-
-		// JSON objects.
-		{
-			in: space + `{}` + space,
-			want: []R{
-				{V: ObjectOpen},
-				{V: ObjectClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `{` + space + `}` + space,
-			want: []R{
-				{V: ObjectOpen},
-				{V: ObjectClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: space + `{` + space,
-			want: []R{
-				{V: ObjectOpen},
-				{E: errEOF},
-			},
-		},
-		{
-			in:   space + `}` + space,
-			want: []R{{E: `unexpected token }`}},
-		},
-		{
-			in: `{` + space + `null` + space + `}`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: `unexpected token null`},
-			},
-		},
-		{
-			in: `{[]}`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: `(line 1:2): unexpected token [`},
-			},
-		},
-		{
-			in: `{,}`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: `unexpected token ,`},
-			},
-		},
-		{
-			in: `{"345678"}`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: `(line 1:10): unexpected character }, missing ":" after field name`},
-			},
-		},
-		{
-			in: `{` + space + `"hello"` + space + `:` + space + `"world"` + space + `}`,
-			want: []R{
-				{V: ObjectOpen},
-				{V: Name{"hello"}, P: len(space) + 1, RS: `"hello"`},
-				{V: Str{"world"}, RS: `"world"`},
-				{V: ObjectClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `{"hello" "world"}`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: `(line 1:10): unexpected character ", missing ":" after field name`},
-			},
-		},
-		{
-			in: `{"hello":`,
-			want: []R{
-				{V: ObjectOpen},
-				{V: Name{"hello"}},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `{"hello":"world"`,
-			want: []R{
-				{V: ObjectOpen},
-				{V: Name{"hello"}},
-				{V: Str{"world"}},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `{"hello":"world",`,
-			want: []R{
-				{V: ObjectOpen},
-				{V: Name{"hello"}},
-				{V: Str{"world"}},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `{""`,
-			want: []R{
-				{V: ObjectOpen},
-				{E: errEOF},
-			},
-		},
-		{
-			in: `{"34":"89",}`,
-			want: []R{
-				{V: ObjectOpen},
-				{V: Name{"34"}, RS: `"34"`},
-				{V: Str{"89"}},
-				{E: `syntax error (line 1:12): unexpected token }`},
-			},
-		},
-		{
-			in: `{
-			  "number": 123e2,
-			  "bool"  : false,
-			  "object": {"string": "world"},
-			  "null"  : null,
-			  "array" : [1.01, "hello", true],
-			  "string": "hello"
-			}`,
-			want: []R{
-				{V: ObjectOpen},
-
-				{V: Name{"number"}},
-				{V: I32{12300}},
-
-				{V: Name{"bool"}},
-				{V: Bool{false}},
-
-				{V: Name{"object"}},
-				{V: ObjectOpen},
-				{V: Name{"string"}},
-				{V: Str{"world"}},
-				{V: ObjectClose},
-
-				{V: Name{"null"}},
-				{V: Null},
-
-				{V: Name{"array"}},
-				{V: ArrayOpen},
-				{V: F32{1.01}},
-				{V: Str{"hello"}},
-				{V: Bool{true}},
-				{V: ArrayClose},
-
-				{V: Name{"string"}},
-				{V: Str{"hello"}},
-
-				{V: ObjectClose},
-				{V: EOF},
-			},
-		},
-		{
-			in: `[
-			  {"object": {"number": 47}},
-			  ["list"],
-			  null
-			]`,
-			want: []R{
-				{V: ArrayOpen},
-
-				{V: ObjectOpen},
-				{V: Name{"object"}},
-				{V: ObjectOpen},
-				{V: Name{"number"}},
-				{V: I32{47}},
-				{V: ObjectClose},
-				{V: ObjectClose},
-
-				{V: ArrayOpen},
-				{V: Str{"list"}},
-				{V: ArrayClose},
-
-				{V: Null},
-
-				{V: ArrayClose},
-				{V: EOF},
-			},
-		},
-
-		// Tests for line and column info.
-		{
-			in: `12345678 x`,
-			want: []R{
-				{V: I64{12345678}},
-				{E: `syntax error (line 1:10): invalid value x`},
-			},
-		},
-		{
-			in: "\ntrue\n   x",
-			want: []R{
-				{V: Bool{true}},
-				{E: `syntax error (line 3:4): invalid value x`},
-			},
-		},
-		{
-			in: `"💩"x`,
-			want: []R{
-				{V: Str{"💩"}},
-				{E: `syntax error (line 1:4): invalid value x`},
-			},
-		},
-		{
-			in: "\n\n[\"🔥🔥🔥\"x",
-			want: []R{
-				{V: ArrayOpen},
-				{V: Str{"🔥🔥🔥"}},
-				{E: `syntax error (line 3:7): invalid value x`},
-			},
-		},
-		{
-			// Multi-rune emojis.
-			in: `["👍🏻👍🏿"x`,
-			want: []R{
-				{V: ArrayOpen},
-				{V: Str{"👍🏻👍🏿"}},
-				{E: `syntax error (line 1:8): invalid value x`},
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		tc := tc
-		t.Run("", func(t *testing.T) {
-			dec := json.NewDecoder([]byte(tc.in))
-			for i, want := range tc.want {
-				peekTok, peekErr := dec.Peek()
-				tok, err := dec.Read()
-				if err != nil {
-					if want.E == "" {
-						errorf(t, tc.in, "want#%d: Read() got unexpected error: %v", i, err)
-					} else if !strings.Contains(err.Error(), want.E) {
-						errorf(t, tc.in, "want#%d: Read() got %q, want %q", i, err, want.E)
-					}
-					return
-				}
-				if want.E != "" {
-					errorf(t, tc.in, "want#%d: Read() got nil error, want %q", i, want.E)
-					return
-				}
-				checkToken(t, tok, i, want, tc.in)
-				if !cmp.Equal(tok, peekTok, cmp.Comparer(json.TokenEquals)) {
-					errorf(t, tc.in, "want#%d: Peek() %+v != Read() token %+v", i, peekTok, tok)
-				}
-				if err != peekErr {
-					errorf(t, tc.in, "want#%d: Peek() error %v != Read() error %v", i, err, peekErr)
-				}
-			}
-		})
-	}
-}
-
-func checkToken(t *testing.T, tok json.Token, idx int, r R, in string) {
-	// Validate Token.Pos() if R.P is set.
-	if r.P > 0 {
-		got := tok.Pos()
-		if got != r.P {
-			errorf(t, in, "want#%d: Token.Pos() got %v want %v", idx, got, r.P)
-		}
-	}
-	// Validate Token.RawString if R.RS is set.
-	if len(r.RS) > 0 {
-		got := tok.RawString()
-		if got != r.RS {
-			errorf(t, in, "want#%d: Token.RawString() got %v want %v", idx, got, r.P)
-		}
-	}
-
-	// Skip checking for Token details if r.V is not set.
-	if r.V == nil {
-		return
-	}
-
-	if err := r.V.check(tok); err != "" {
-		errorf(t, in, "want#%d: %s", idx, err)
-	}
-	return
-}
-
-func errorf(t *testing.T, in string, fmtStr string, args ...interface{}) {
-	t.Helper()
-	vargs := []interface{}{in}
-	for _, arg := range args {
-		vargs = append(vargs, arg)
-	}
-	t.Errorf("input:\n%s\n~end~\n"+fmtStr, vargs...)
-}
-
-func TestClone(t *testing.T) {
-	input := `{"outer":{"str":"hello", "number": 123}}`
-	dec := json.NewDecoder([]byte(input))
-
-	// Clone at the start should produce the same reads as the original.
-	clone := dec.Clone()
-	compareDecoders(t, dec, clone)
-
-	// Advance to inner object, clone and compare again.
-	dec.Read() // Read ObjectOpen.
-	dec.Read() // Read Name.
-	clone = dec.Clone()
-	compareDecoders(t, dec, clone)
-}
-
-func compareDecoders(t *testing.T, d1 *json.Decoder, d2 *json.Decoder) {
-	for {
-		tok1, err1 := d1.Read()
-		tok2, err2 := d2.Read()
-		if tok1.Kind() != tok2.Kind() {
-			t.Errorf("cloned decoder: got Kind %v, want %v", tok2.Kind(), tok1.Kind())
-		}
-		if tok1.RawString() != tok2.RawString() {
-			t.Errorf("cloned decoder: got RawString %v, want %v", tok2.RawString(), tok1.RawString())
-		}
-		if err1 != err2 {
-			t.Errorf("cloned decoder: got error %v, want %v", err2, err1)
-		}
-		if tok1.Kind() == json.EOF {
-			break
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/encode_test.go b/vendor/google.golang.org/protobuf/internal/encoding/json/encode_test.go
deleted file mode 100644
index c844b553192..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/json/encode_test.go
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package json_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/encoding/json"
-)
-
-// Disable detrand to enable direct comparisons on outputs.
-func init() { detrand.Disable() }
-
-// splitLines is a cmpopts.Option for comparing strings with line breaks.
-var splitLines = cmpopts.AcyclicTransformer("SplitLines", func(s string) []string {
-	return strings.Split(s, "\n")
-})
-
-func TestEncoder(t *testing.T) {
-	tests := []struct {
-		desc          string
-		write         func(*json.Encoder)
-		wantOut       string
-		wantOutIndent string
-	}{
-		{
-			desc: "null",
-			write: func(e *json.Encoder) {
-				e.WriteNull()
-			},
-			wantOut: `null`,
-		},
-		{
-			desc: "true",
-			write: func(e *json.Encoder) {
-				e.WriteBool(true)
-			},
-			wantOut: `true`,
-		},
-		{
-			desc: "false",
-			write: func(e *json.Encoder) {
-				e.WriteBool(false)
-			},
-			wantOut: `false`,
-		},
-		{
-			desc: "string",
-			write: func(e *json.Encoder) {
-				e.WriteString("hello world")
-			},
-			wantOut: `"hello world"`,
-		},
-		{
-			desc: "string contains escaped characters",
-			write: func(e *json.Encoder) {
-				e.WriteString("\u0000\"\\/\b\f\n\r\t")
-			},
-			wantOut: `"\u0000\"\\/\b\f\n\r\t"`,
-		},
-		{
-			desc: "float64",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(1.0199999809265137, 64)
-			},
-			wantOut: `1.0199999809265137`,
-		},
-		{
-			desc: "float64 max value",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.MaxFloat64, 64)
-			},
-			wantOut: `1.7976931348623157e+308`,
-		},
-		{
-			desc: "float64 min value",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(-math.MaxFloat64, 64)
-			},
-			wantOut: `-1.7976931348623157e+308`,
-		},
-		{
-			desc: "float64 NaN",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.NaN(), 64)
-			},
-			wantOut: `"NaN"`,
-		},
-		{
-			desc: "float64 Infinity",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.Inf(+1), 64)
-			},
-			wantOut: `"Infinity"`,
-		},
-		{
-			desc: "float64 -Infinity",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.Inf(-1), 64)
-			},
-			wantOut: `"-Infinity"`,
-		},
-		{
-			desc: "float64 negative zero",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.Copysign(0, -1), 64)
-			},
-			wantOut: `-0`,
-		},
-		{
-			desc: "float32",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(1.02, 32)
-			},
-			wantOut: `1.02`,
-		},
-		{
-			desc: "float32 max value",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.MaxFloat32, 32)
-			},
-			wantOut: `3.4028235e+38`,
-		},
-		{
-			desc: "float32 min value",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(-math.MaxFloat32, 32)
-			},
-			wantOut: `-3.4028235e+38`,
-		},
-		{
-			desc: "float32 negative zero",
-			write: func(e *json.Encoder) {
-				e.WriteFloat(math.Copysign(0, -1), 32)
-			},
-			wantOut: `-0`,
-		},
-		{
-			desc: "int",
-			write: func(e *json.Encoder) {
-				e.WriteInt(-math.MaxInt64)
-			},
-			wantOut: `-9223372036854775807`,
-		},
-		{
-			desc: "uint",
-			write: func(e *json.Encoder) {
-				e.WriteUint(math.MaxUint64)
-			},
-			wantOut: `18446744073709551615`,
-		},
-		{
-			desc: "empty object",
-			write: func(e *json.Encoder) {
-				e.StartObject()
-				e.EndObject()
-			},
-			wantOut: `{}`,
-		},
-		{
-			desc: "empty array",
-			write: func(e *json.Encoder) {
-				e.StartArray()
-				e.EndArray()
-			},
-			wantOut: `[]`,
-		},
-		{
-			desc: "object with one member",
-			write: func(e *json.Encoder) {
-				e.StartObject()
-				e.WriteName("hello")
-				e.WriteString("world")
-				e.EndObject()
-			},
-			wantOut: `{"hello":"world"}`,
-			wantOutIndent: `{
-	"hello": "world"
-}`,
-		},
-		{
-			desc: "array with one member",
-			write: func(e *json.Encoder) {
-				e.StartArray()
-				e.WriteNull()
-				e.EndArray()
-			},
-			wantOut: `[null]`,
-			wantOutIndent: `[
-	null
-]`,
-		},
-		{
-			desc: "simple object",
-			write: func(e *json.Encoder) {
-				e.StartObject()
-				{
-					e.WriteName("null")
-					e.WriteNull()
-				}
-				{
-					e.WriteName("bool")
-					e.WriteBool(true)
-				}
-				{
-					e.WriteName("string")
-					e.WriteString("hello")
-				}
-				{
-					e.WriteName("float")
-					e.WriteFloat(6.28318, 64)
-				}
-				{
-					e.WriteName("int")
-					e.WriteInt(42)
-				}
-				{
-					e.WriteName("uint")
-					e.WriteUint(47)
-				}
-				e.EndObject()
-			},
-			wantOut: `{"null":null,"bool":true,"string":"hello","float":6.28318,"int":42,"uint":47}`,
-			wantOutIndent: `{
-	"null": null,
-	"bool": true,
-	"string": "hello",
-	"float": 6.28318,
-	"int": 42,
-	"uint": 47
-}`,
-		},
-		{
-			desc: "simple array",
-			write: func(e *json.Encoder) {
-				e.StartArray()
-				{
-					e.WriteString("hello")
-					e.WriteFloat(6.28318, 32)
-					e.WriteInt(42)
-					e.WriteUint(47)
-					e.WriteBool(true)
-					e.WriteNull()
-				}
-				e.EndArray()
-			},
-			wantOut: `["hello",6.28318,42,47,true,null]`,
-			wantOutIndent: `[
-	"hello",
-	6.28318,
-	42,
-	47,
-	true,
-	null
-]`,
-		},
-		{
-			desc: "fancy object",
-			write: func(e *json.Encoder) {
-				e.StartObject()
-				{
-					e.WriteName("object0")
-					e.StartObject()
-					e.EndObject()
-				}
-				{
-					e.WriteName("array0")
-					e.StartArray()
-					e.EndArray()
-				}
-				{
-					e.WriteName("object1")
-					e.StartObject()
-					{
-						e.WriteName("null")
-						e.WriteNull()
-					}
-					{
-						e.WriteName("object1-1")
-						e.StartObject()
-						{
-							e.WriteName("bool")
-							e.WriteBool(false)
-						}
-						{
-							e.WriteName("float")
-							e.WriteFloat(3.14159, 32)
-						}
-						e.EndObject()
-					}
-					e.EndObject()
-				}
-				{
-					e.WriteName("array1")
-					e.StartArray()
-					{
-						e.WriteNull()
-						e.StartObject()
-						e.EndObject()
-						e.StartObject()
-						{
-							e.WriteName("hello")
-							e.WriteString("world")
-						}
-						{
-							e.WriteName("hola")
-							e.WriteString("mundo")
-						}
-						e.EndObject()
-						e.StartArray()
-						{
-							e.WriteUint(1)
-							e.WriteUint(0)
-							e.WriteUint(1)
-						}
-						e.EndArray()
-					}
-					e.EndArray()
-				}
-				e.EndObject()
-			},
-			wantOutIndent: `{
-	"object0": {},
-	"array0": [],
-	"object1": {
-		"null": null,
-		"object1-1": {
-			"bool": false,
-			"float": 3.14159
-		}
-	},
-	"array1": [
-		null,
-		{},
-		{
-			"hello": "world",
-			"hola": "mundo"
-		},
-		[
-			1,
-			0,
-			1
-		]
-	]
-}`,
-		}}
-
-	for _, tc := range tests {
-		t.Run(tc.desc, func(t *testing.T) {
-			if tc.wantOut != "" {
-				enc, err := json.NewEncoder(nil, "")
-				if err != nil {
-					t.Fatalf("NewEncoder() returned error: %v", err)
-				}
-				tc.write(enc)
-				got := string(enc.Bytes())
-				if got != tc.wantOut {
-					t.Errorf("%s:\n<got>:\n%v\n<want>\n%v\n", tc.desc, got, tc.wantOut)
-				}
-			}
-			if tc.wantOutIndent != "" {
-				enc, err := json.NewEncoder(nil, "\t")
-				if err != nil {
-					t.Fatalf("NewEncoder() returned error: %v", err)
-				}
-				tc.write(enc)
-				got, want := string(enc.Bytes()), tc.wantOutIndent
-				if got != want {
-					t.Errorf("%s(indent):\n<got>:\n%v\n<want>\n%v\n<diff -want +got>\n%v\n",
-						tc.desc, got, want, cmp.Diff(want, got, splitLines))
-				}
-			}
-		})
-	}
-}
-
-func TestWriteStringError(t *testing.T) {
-	tests := []string{"abc\xff"}
-
-	for _, in := range tests {
-		t.Run(in, func(t *testing.T) {
-			enc, err := json.NewEncoder(nil, "")
-			if err != nil {
-				t.Fatalf("NewEncoder() returned error: %v", err)
-			}
-			if err := enc.WriteString(in); err == nil {
-				t.Errorf("WriteString(%v): got nil error, want error", in)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/json/gotest/ya.make
deleted file mode 100644
index 8290d39c91d..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/json/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/encoding/json)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/json/ya.make
index 7c858fb5a93..4f0b79391e1 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/json/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/encoding/json/ya.make
@@ -10,12 +10,4 @@ SRCS(
     encode.go
 )
 
-GO_XTEST_SRCS(
-    bench_test.go
-    decode_test.go
-    encode_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/messageset/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/messageset/ya.make
index 78df562dee7..3681a9a4766 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/messageset/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/encoding/messageset/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(messageset.go)
+SRCS(
+    messageset.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/tag/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/tag/gotest/ya.make
deleted file mode 100644
index 0bc406ead28..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/tag/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/encoding/tag)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/tag/tag_test.go b/vendor/google.golang.org/protobuf/internal/encoding/tag/tag_test.go
deleted file mode 100644
index e904a7b6bfe..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/tag/tag_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tag_test
-
-import (
-	"reflect"
-	"testing"
-
-	"google.golang.org/protobuf/internal/encoding/tag"
-	"google.golang.org/protobuf/internal/filedesc"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protodesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-func Test(t *testing.T) {
-	fd := new(filedesc.Field)
-	fd.L0.ParentFile = filedesc.SurrogateProto3
-	fd.L0.FullName = "foo_field"
-	fd.L1.Number = 1337
-	fd.L1.Cardinality = protoreflect.Repeated
-	fd.L1.Kind = protoreflect.BytesKind
-	fd.L1.Default = filedesc.DefaultValue(protoreflect.ValueOf([]byte("hello, \xde\xad\xbe\xef\n")), nil)
-
-	// Marshal test.
-	gotTag := tag.Marshal(fd, "")
-	wantTag := `bytes,1337,rep,name=foo_field,json=fooField,proto3,def=hello, \336\255\276\357\n`
-	if gotTag != wantTag {
-		t.Errorf("Marshal() = `%v`, want `%v`", gotTag, wantTag)
-	}
-
-	// Unmarshal test.
-	gotFD := tag.Unmarshal(wantTag, reflect.TypeOf([]byte{}), nil)
-	wantFD := fd
-	if !proto.Equal(protodesc.ToFieldDescriptorProto(gotFD), protodesc.ToFieldDescriptorProto(wantFD)) {
-		t.Errorf("Umarshal() mismatch:\ngot  %v\nwant %v", gotFD, wantFD)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/tag/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/tag/ya.make
index 956490c6fcf..12d85eb1398 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/tag/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/encoding/tag/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(tag.go)
-
-GO_XTEST_SRCS(tag_test.go)
+SRCS(
+    tag.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/decode_test.go b/vendor/google.golang.org/protobuf/internal/encoding/text/decode_test.go
deleted file mode 100644
index 7c705ab515f..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/decode_test.go
+++ /dev/null
@@ -1,1955 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package text_test
-
-import (
-	"fmt"
-	"math"
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/encoding/text"
-	"google.golang.org/protobuf/internal/flags"
-)
-
-var eofErr = text.ErrUnexpectedEOF.Error()
-
-type R struct {
-	// K is expected Kind of the returned Token object from calling Decoder.Read.
-	K text.Kind
-	// E is expected error substring from calling Decoder.Read if set.
-	E string
-	// T contains NT (if K is Name) or ST (if K is Scalar) or nil (others)
-	T interface{}
-	// P is expected Token.Pos if set > 0.
-	P int
-	// RS is expected result from Token.RawString() if not empty.
-	RS string
-}
-
-// NT contains data for checking against a name token.
-type NT struct {
-	K text.NameKind
-	// Sep is true if name token should have separator character, else false.
-	Sep bool
-	// If K is IdentName or TypeName, invoke corresponding getter and compare against this field.
-	S string
-	// If K is FieldNumber, invoke getter and compare against this field.
-	N int32
-}
-
-// ST contains data for checking against a scalar token.
-type ST struct {
-	// checker that is expected to return OK.
-	ok checker
-	// checker that is expected to return not OK.
-	nok checker
-}
-
-// checker provides API for the token wrapper API call types Str, Enum, Bool,
-// Uint64, Uint32, Int64, Int32, Float64, Float32.
-type checker interface {
-	// checkOk checks and expects for token API call to return ok and compare
-	// against implementation-stored value. Returns empty string if success,
-	// else returns error message describing the error.
-	checkOk(text.Token) string
-	// checkNok checks and expects for token API call to return not ok. Returns
-	// empty string if success, else returns error message describing the error.
-	checkNok(text.Token) string
-}
-
-type Str struct {
-	val string
-}
-
-func (s Str) checkOk(tok text.Token) string {
-	got, ok := tok.String()
-	if !ok {
-		return fmt.Sprintf("Token.String() returned not OK for token: %v", tok.RawString())
-	}
-	if got != s.val {
-		return fmt.Sprintf("Token.String() got %q want %q for token: %v", got, s.val, tok.RawString())
-	}
-	return ""
-}
-
-func (s Str) checkNok(tok text.Token) string {
-	if _, ok := tok.String(); ok {
-		return fmt.Sprintf("Token.String() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Enum struct {
-	val string
-}
-
-func (e Enum) checkOk(tok text.Token) string {
-	got, ok := tok.Enum()
-	if !ok {
-		return fmt.Sprintf("Token.Enum() returned not OK for token: %v", tok.RawString())
-	}
-	if got != e.val {
-		return fmt.Sprintf("Token.Enum() got %q want %q for token: %v", got, e.val, tok.RawString())
-	}
-	return ""
-}
-
-func (e Enum) checkNok(tok text.Token) string {
-	if _, ok := tok.Enum(); ok {
-		return fmt.Sprintf("Token.Enum() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Bool struct {
-	val bool
-}
-
-func (b Bool) checkOk(tok text.Token) string {
-	got, ok := tok.Bool()
-	if !ok {
-		return fmt.Sprintf("Token.Bool() returned not OK for token: %v", tok.RawString())
-	}
-	if got != b.val {
-		return fmt.Sprintf("Token.Bool() got %v want %v for token: %v", got, b.val, tok.RawString())
-	}
-	return ""
-}
-
-func (b Bool) checkNok(tok text.Token) string {
-	if _, ok := tok.Bool(); ok {
-		return fmt.Sprintf("Token.Bool() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Uint64 struct {
-	val uint64
-}
-
-func (n Uint64) checkOk(tok text.Token) string {
-	got, ok := tok.Uint64()
-	if !ok {
-		return fmt.Sprintf("Token.Uint64() returned not OK for token: %v", tok.RawString())
-	}
-	if got != n.val {
-		return fmt.Sprintf("Token.Uint64() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Uint64) checkNok(tok text.Token) string {
-	if _, ok := tok.Uint64(); ok {
-		return fmt.Sprintf("Token.Uint64() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Uint32 struct {
-	val uint32
-}
-
-func (n Uint32) checkOk(tok text.Token) string {
-	got, ok := tok.Uint32()
-	if !ok {
-		return fmt.Sprintf("Token.Uint32() returned not OK for token: %v", tok.RawString())
-	}
-	if got != n.val {
-		return fmt.Sprintf("Token.Uint32() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Uint32) checkNok(tok text.Token) string {
-	if _, ok := tok.Uint32(); ok {
-		return fmt.Sprintf("Token.Uint32() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Int64 struct {
-	val int64
-}
-
-func (n Int64) checkOk(tok text.Token) string {
-	got, ok := tok.Int64()
-	if !ok {
-		return fmt.Sprintf("Token.Int64() returned not OK for token: %v", tok.RawString())
-	}
-	if got != n.val {
-		return fmt.Sprintf("Token.Int64() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Int64) checkNok(tok text.Token) string {
-	if _, ok := tok.Int64(); ok {
-		return fmt.Sprintf("Token.Int64() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Int32 struct {
-	val int32
-}
-
-func (n Int32) checkOk(tok text.Token) string {
-	got, ok := tok.Int32()
-	if !ok {
-		return fmt.Sprintf("Token.Int32() returned not OK for token: %v", tok.RawString())
-	}
-	if got != n.val {
-		return fmt.Sprintf("Token.Int32() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Int32) checkNok(tok text.Token) string {
-	if _, ok := tok.Int32(); ok {
-		return fmt.Sprintf("Token.Int32() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Float64 struct {
-	val float64
-}
-
-func (n Float64) checkOk(tok text.Token) string {
-	got, ok := tok.Float64()
-	if !ok {
-		return fmt.Sprintf("Token.Float64() returned not OK for token: %v", tok.RawString())
-	}
-	if math.Float64bits(got) != math.Float64bits(n.val) {
-		return fmt.Sprintf("Token.Float64() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Float64) checkNok(tok text.Token) string {
-	if _, ok := tok.Float64(); ok {
-		return fmt.Sprintf("Token.Float64() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-type Float32 struct {
-	val float32
-}
-
-func (n Float32) checkOk(tok text.Token) string {
-	got, ok := tok.Float32()
-	if !ok {
-		return fmt.Sprintf("Token.Float32() returned not OK for token: %v", tok.RawString())
-	}
-	if math.Float32bits(got) != math.Float32bits(n.val) {
-		return fmt.Sprintf("Token.Float32() got %v want %v for token: %v", got, n.val, tok.RawString())
-	}
-	return ""
-}
-
-func (n Float32) checkNok(tok text.Token) string {
-	if _, ok := tok.Float32(); ok {
-		return fmt.Sprintf("Token.Float32() returned OK for token: %v", tok.RawString())
-	}
-	return ""
-}
-
-func TestDecoder(t *testing.T) {
-	const space = " \n\r\t"
-	tests := []struct {
-		in string
-		// want is a list of expected Tokens returned from calling Decoder.Read.
-		// An item makes the test code invoke Decoder.Read and compare against
-		// R.K and R.E. If R.K is Name, it compares
-		want []R
-	}{
-		{
-			in:   "",
-			want: []R{{K: text.EOF}},
-		},
-		{
-			in:   "# comment",
-			want: []R{{K: text.EOF}},
-		},
-		{
-			in:   space + "# comment" + space,
-			want: []R{{K: text.EOF}},
-		},
-		{
-			in:   space,
-			want: []R{{K: text.EOF, P: len(space)}},
-		},
-		{
-			// Calling Read after EOF will keep returning EOF for
-			// succeeding Read calls.
-			in: space,
-			want: []R{
-				{K: text.EOF},
-				{K: text.EOF},
-				{K: text.EOF},
-			},
-		},
-		{
-			// NUL is an invalid whitespace since C++ uses C-strings.
-			in:   "\x00",
-			want: []R{{E: "invalid field name: \x00"}},
-		},
-
-		// Field names.
-		{
-			in: "name",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "name"}, RS: "name"},
-				{E: eofErr},
-			},
-		},
-		{
-			in: space + "name:" + space,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-				{E: eofErr},
-			},
-		},
-		{
-			in: space + "name" + space + ":" + space,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-				{E: eofErr},
-			},
-		},
-		{
-			in: "name # comment",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "name"}},
-				{E: eofErr},
-			},
-		},
-		{
-			// Comments only extend until the newline.
-			in: "# comment \nname",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "name"}, P: 11},
-			},
-		},
-		{
-			in: "name # comment \n:",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-			},
-		},
-		{
-			in: "name123",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "name123"}},
-			},
-		},
-		{
-			in: "name_123",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "name_123"}},
-			},
-		},
-		{
-			in: "_123",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, S: "_123"}},
-			},
-		},
-		{
-			in:   ":",
-			want: []R{{E: "syntax error (line 1:1): invalid field name: :"}},
-		},
-		{
-			in:   "\n\n\n {",
-			want: []R{{E: "syntax error (line 4:2): invalid field name: {"}},
-		},
-		{
-			in:   "123name",
-			want: []R{{E: "invalid field name: 123name"}},
-		},
-		{
-			in:   `/`,
-			want: []R{{E: `invalid field name: /`}},
-		},
-		{
-			in:   `世界`,
-			want: []R{{E: `invalid field name: 世`}},
-		},
-		{
-			in:   `1a/b`,
-			want: []R{{E: `invalid field name: 1a`}},
-		},
-		{
-			in:   `1c\d`,
-			want: []R{{E: `invalid field name: 1c`}},
-		},
-		{
-			in:   "\x84f",
-			want: []R{{E: "invalid field name: \x84"}},
-		},
-		{
-			in:   "\uFFFDxxx",
-			want: []R{{E: "invalid field name: \uFFFD"}},
-		},
-		{
-			in:   "-a234567890123456789012345678901234567890abc",
-			want: []R{{E: "invalid field name: -a2345678901234567890123456789012…"}},
-		},
-		{
-			in: "[type]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "type"}, RS: "[type]"},
-			},
-		},
-		{
-			// V1 allows this syntax. C++ does not, however, C++ also fails if
-			// field is Any and does not contain '/'.
-			in: "[/type]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "/type"}},
-			},
-		},
-		{
-			in:   "[.type]",
-			want: []R{{E: "invalid type URL/extension field name: [.type]"}},
-		},
-		{
-			in: "[pkg.Foo.extension_field]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "pkg.Foo.extension_field"}},
-			},
-		},
-		{
-			in: "[domain.com/type]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "domain.com/type"}},
-			},
-		},
-		{
-			in: "[domain.com/pkg.type]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "domain.com/pkg.type"}},
-			},
-		},
-		{
-			in: "[sub.domain.com\x2fpath\x2fto\x2fproto.package.name]",
-			want: []R{
-				{
-					K: text.Name,
-					T: NT{
-						K: text.TypeName,
-						S: "sub.domain.com/path/to/proto.package.name",
-					},
-					RS: "[sub.domain.com\x2fpath\x2fto\x2fproto.package.name]",
-				},
-			},
-		},
-		{
-			// V2 no longer allows a quoted string for the Any type URL.
-			in:   `["domain.com/pkg.type"]`,
-			want: []R{{E: `invalid type URL/extension field name: ["`}},
-		},
-		{
-			// V2 no longer allows a quoted string for the Any type URL.
-			in:   `['domain.com/pkg.type']`,
-			want: []R{{E: `invalid type URL/extension field name: ['`}},
-		},
-		{
-			in:   "[pkg.Foo.extension_field:",
-			want: []R{{E: "invalid type URL/extension field name: [pkg.Foo.extension_field:"}},
-		},
-		{
-			// V2 no longer allows whitespace within identifier "word".
-			in:   "[proto.packa ge.field]",
-			want: []R{{E: "invalid type URL/extension field name: [proto.packa g"}},
-		},
-		{
-			// V2 no longer allows comments within identifier "word".
-			in:   "[proto.packa # comment\n ge.field]",
-			want: []R{{E: "invalid type URL/extension field name: [proto.packa # comment\n g"}},
-		},
-		{
-			in:   "[proto.package.]",
-			want: []R{{E: "invalid type URL/extension field name: [proto.package."}},
-		},
-		{
-			in:   "[proto.package/]",
-			want: []R{{E: "invalid type URL/extension field name: [proto.package/"}},
-		},
-		{
-			in: `message_field{[bad@]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{E: `invalid type URL/extension field name: [bad@`},
-			},
-		},
-		{
-			in: `message_field{[invalid//type]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{E: `invalid type URL/extension field name: [invalid//`},
-			},
-		},
-		{
-			in: `message_field{[proto.package.]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{E: `invalid type URL/extension field name: [proto.package.`},
-			},
-		},
-		{
-			in:   "[proto.package",
-			want: []R{{E: eofErr}},
-		},
-		{
-			in: "[" + space + "type" + space + "]" + space + ":",
-			want: []R{
-				{
-					K: text.Name,
-					T: NT{
-						K:   text.TypeName,
-						Sep: true,
-						S:   "type",
-					},
-					RS: "[" + space + "type" + space + "]",
-				},
-			},
-		},
-		{
-			// Whitespaces/comments are only allowed betweeb
-			in: "[" + space + "domain" + space + "." + space + "com # comment\n" +
-				"/" + "pkg" + space + "." + space + "type" + space + "]",
-			want: []R{
-				{K: text.Name, T: NT{K: text.TypeName, S: "domain.com/pkg.type"}},
-			},
-		},
-		{
-			in: "42",
-			want: []R{
-				{K: text.Name, T: NT{K: text.FieldNumber, N: 42}},
-			},
-		},
-		{
-			in:   "0x42:",
-			want: []R{{E: "invalid field number: 0x42"}},
-		},
-		{
-			in:   "042:",
-			want: []R{{E: "invalid field number: 042"}},
-		},
-		{
-			in:   "123.456:",
-			want: []R{{E: "invalid field number: 123.456"}},
-		},
-		{
-			in:   "-123",
-			want: []R{{E: "invalid field number: -123"}},
-		},
-		{
-			in:   "- \t 123.321e6",
-			want: []R{{E: "invalid field number: -123.321e6"}},
-		},
-		{
-			in:   "-",
-			want: []R{{E: "invalid field name: -"}},
-		},
-		{
-			in:   "- ",
-			want: []R{{E: "invalid field name: -"}},
-		},
-		{
-			in:   "- # negative\n 123",
-			want: []R{{E: "invalid field number: -123"}},
-		},
-		{
-			// Field number > math.MaxInt32.
-			in:   "2147483648:",
-			want: []R{{E: "invalid field number: 2147483648"}},
-		},
-
-		// String field value. More string parsing specific testing in
-		// TestUnmarshalString.
-		{
-			in: `name: "hello world"`,
-			want: []R{
-				{K: text.Name},
-				{
-					K:  text.Scalar,
-					T:  ST{ok: Str{"hello world"}, nok: Enum{}},
-					RS: `"hello world"`,
-				},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name: 'hello'`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-			},
-		},
-		{
-			in: `name: "hello'`,
-			want: []R{
-				{K: text.Name},
-				{E: eofErr},
-			},
-		},
-		{
-			in: `name: 'hello`,
-			want: []R{
-				{K: text.Name},
-				{E: eofErr},
-			},
-		},
-		{
-			// Field name without separator is ok. prototext package will need
-			// to determine that this is not valid for scalar values.
-			in: space + `name` + space + `"hello"` + space,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-			},
-		},
-		{
-			in: `name'hello'`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-			},
-		},
-		{
-			in: `name: ` + space + `"hello"` + space + `,`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name` + space + `:` + `"hello"` + space + `;` + space,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"hello" , ,`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar},
-				{E: "(line 1:16): invalid field name: ,"},
-			},
-		},
-		{
-			in: `name:"hello" , ;`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar},
-				{E: "(line 1:16): invalid field name: ;"},
-			},
-		},
-		{
-			in: `name:"hello" name:'world'`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"hello", name:"world"`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"hello"; name:"world",`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `foo:"hello"bar:"world"`,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "foo"}},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "bar"}},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `foo:"hello"[bar]:"world"`,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "foo"}},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.Name, T: NT{K: text.TypeName, Sep: true, S: "bar"}},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"foo"` + space + `"bar"` + space + `'qux'`,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-				{K: text.Scalar, T: ST{ok: Str{"foobarqux"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"foo"'bar'"qux"`,
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-				{K: text.Scalar, T: ST{ok: Str{"foobarqux"}}},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:"foo"` + space + `"bar" # comment` + "\n'qux' # comment",
-			want: []R{
-				{K: text.Name, T: NT{K: text.IdentName, Sep: true, S: "name"}},
-				{K: text.Scalar, T: ST{ok: Str{"foobarqux"}}},
-				{K: text.EOF},
-			},
-		},
-
-		// Lists.
-		{
-			in: `name: [`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{E: eofErr},
-			},
-		},
-		{
-			in: `name: []`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name []`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name: [,`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{E: `(line 1:8): invalid scalar value: ,`},
-			},
-		},
-		{
-			in: `name: [0`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar},
-				{E: eofErr},
-			},
-		},
-		{
-			in: `name: [` + space + `"hello"` + space + `]` + space,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}, P: len(space) + 7},
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name: ["hello",]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{E: `invalid scalar value: ]`},
-			},
-		},
-		{
-			in: `name: ["foo"` + space + `'bar' "qux"]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"foobarqux"}}},
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name:` + space + `["foo",` + space + "'bar', # comment\n\n" + `"qux"]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"foo"}}},
-				{K: text.Scalar, T: ST{ok: Str{"bar"}}},
-				{K: text.Scalar, T: ST{ok: Str{"qux"}}},
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-
-		{
-			// List within list is not allowed.
-			in: `name: [[]]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{E: `syntax error (line 1:8): invalid scalar value: [`},
-			},
-		},
-		{
-			// List items need to be separated by ,.
-			in: `name: ["foo" true]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"foo"}}},
-				{E: `syntax error (line 1:14): unexpected character 't'`},
-			},
-		},
-		{
-			in: `name: ["foo"; "bar"]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"foo"}}},
-				{E: `syntax error (line 1:13): unexpected character ';'`},
-			},
-		},
-		{
-			in: `name: ["foo", true, ENUM, 1.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"foo"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"true"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"ENUM"}}},
-				{K: text.Scalar, T: ST{ok: Float32{1.0}}},
-				{K: text.ListClose},
-			},
-		},
-
-		// Boolean literal values.
-		{
-			in: `name: True`,
-			want: []R{
-				{K: text.Name},
-				{
-					K: text.Scalar,
-					T: ST{ok: Bool{true}},
-				},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name false`,
-			want: []R{
-				{K: text.Name},
-				{
-					K: text.Scalar,
-					T: ST{ok: Bool{false}},
-				},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `name: [t, f, True, False, true, false, 1, 0, 0x01, 0x00, 01, 00]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// Looks like boolean but not.
-			in: `name: [tRUe, falSE, -1, -0, -0x01, -0x00, -01, -00, 0.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.Scalar, T: ST{nok: Bool{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `foo: true[bar] false`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Bool{false}}},
-			},
-		},
-
-		// Enum field values.
-		{
-			in: space + `name: ENUM`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Enum{"ENUM"}}},
-			},
-		},
-		{
-			in: space + `name:[TRUE, FALSE, T, F, t, f]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Enum{"TRUE"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"FALSE"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"T"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"F"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"t"}}},
-				{K: text.Scalar, T: ST{ok: Enum{"f"}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `foo: Enum1[bar]:Enum2`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Enum{"Enum1"}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Enum{"Enum2"}}},
-			},
-		},
-		{
-			// Invalid enum values.
-			in: `name: [-inf, -foo, "string", 42, 1.0, 0x47]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.Scalar, T: ST{nok: Enum{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name: true.`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: true.`},
-			},
-		},
-
-		// Numeric values.
-		{
-			in: `nums:42 nums:0x2A nums:052`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Uint64{42}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Uint64{42}}},
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Uint64{42}}},
-			},
-		},
-		{
-			in: `nums:[-42, -0x2a, -052]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums:[-42, -0x2a, -052]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Int64{-42}}},
-				{K: text.Scalar, T: ST{ok: Int64{-42}}},
-				{K: text.Scalar, T: ST{ok: Int64{-42}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0,0x0,00,-9876543210,9876543210,0x0123456789abcdef,-0x0123456789abcdef,01234567,-01234567]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Uint64{0}}},
-				{K: text.Scalar, T: ST{ok: Int64{0}}},
-				{K: text.Scalar, T: ST{ok: Uint64{0}}},
-				{K: text.Scalar, T: ST{ok: Int64{-9876543210}}},
-				{K: text.Scalar, T: ST{ok: Uint64{9876543210}}},
-				{K: text.Scalar, T: ST{ok: Uint64{0x0123456789abcdef}}},
-				{K: text.Scalar, T: ST{ok: Int64{-0x0123456789abcdef}}},
-				{K: text.Scalar, T: ST{ok: Uint64{01234567}}},
-				{K: text.Scalar, T: ST{ok: Int64{-01234567}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0,0x0,00,-876543210,876543210,0x01234,-0x01234,01234567,-01234567]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Uint32{0}}},
-				{K: text.Scalar, T: ST{ok: Int32{0}}},
-				{K: text.Scalar, T: ST{ok: Uint32{0}}},
-				{K: text.Scalar, T: ST{ok: Int32{-876543210}}},
-				{K: text.Scalar, T: ST{ok: Uint32{876543210}}},
-				{K: text.Scalar, T: ST{ok: Uint32{0x01234}}},
-				{K: text.Scalar, T: ST{ok: Int32{-0x01234}}},
-				{K: text.Scalar, T: ST{ok: Uint32{01234567}}},
-				{K: text.Scalar, T: ST{ok: Int32{-01234567}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [` +
-				fmt.Sprintf("%d", uint64(math.MaxUint64)) + `,` +
-				fmt.Sprintf("%d", uint32(math.MaxUint32)) + `,` +
-				fmt.Sprintf("%d", int64(math.MaxInt64)) + `,` +
-				fmt.Sprintf("%d", int64(math.MinInt64)) + `,` +
-				fmt.Sprintf("%d", int32(math.MaxInt32)) + `,` +
-				fmt.Sprintf("%d", int32(math.MinInt32)) +
-				`]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Uint64{math.MaxUint64}}},
-				{K: text.Scalar, T: ST{ok: Uint32{math.MaxUint32}}},
-				{K: text.Scalar, T: ST{ok: Int64{math.MaxInt64}}},
-				{K: text.Scalar, T: ST{ok: Int64{math.MinInt64}}},
-				{K: text.Scalar, T: ST{ok: Int32{math.MaxInt32}}},
-				{K: text.Scalar, T: ST{ok: Int32{math.MinInt32}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// Integer exceeds range.
-			in: `nums: [` +
-				`18446744073709551616,` + // max uint64 + 1
-				fmt.Sprintf("%d", uint64(math.MaxUint32+1)) + `,` +
-				fmt.Sprintf("%d", uint64(math.MaxInt64+1)) + `,` +
-				`-9223372036854775809,` + // min int64 - 1
-				fmt.Sprintf("%d", uint64(math.MaxInt32+1)) + `,` +
-				fmt.Sprintf("%d", int64(math.MinInt32-1)) + `` +
-				`]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0xbeefbeef, 0xbeefbeefbeefbeef]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{
-					K: text.Scalar,
-					T: func() ST {
-						if flags.ProtoLegacy {
-							return ST{ok: Int32{-1091584273}}
-						}
-						return ST{nok: Int32{}}
-					}(),
-				},
-				{
-					K: text.Scalar,
-					T: func() ST {
-						if flags.ProtoLegacy {
-							return ST{ok: Int64{-4688318750159552785}}
-						}
-						return ST{nok: Int64{}}
-					}(),
-				},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,0f,1f,10f,-0f,-1f,-10f,1.0,0.1e-3,1.5e+5,1e10,.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{0.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{0.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{1.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{10.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Copysign(0, -1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{-1.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{-10.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{1.0}}},
-				{K: text.Scalar, T: ST{ok: Float64{0.1e-3}}},
-				{K: text.Scalar, T: ST{ok: Float64{1.5e+5}}},
-				{K: text.Scalar, T: ST{ok: Float64{1.0e+10}}},
-				{K: text.Scalar, T: ST{ok: Float64{0.0}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,0f,1f,10f,-0f,-1f,-10f,1.0,0.1e-3,1.5e+5,1e10,.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{0.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{0.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{1.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{10.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Copysign(0, -1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{-1.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{-10.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{1.0}}},
-				{K: text.Scalar, T: ST{ok: Float32{0.1e-3}}},
-				{K: text.Scalar, T: ST{ok: Float32{1.5e+5}}},
-				{K: text.Scalar, T: ST{ok: Float32{1.0e+10}}},
-				{K: text.Scalar, T: ST{ok: Float32{0.0}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,1f,10F,1e1,1.10]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.Scalar, T: ST{nok: Int64{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,1f,10F,1e1,1.10]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.Scalar, T: ST{nok: Int32{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,1f,10F,1e1,1.10]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [0.,1f,10F,1e1,1.10]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [` +
-				fmt.Sprintf("%g", math.MaxFloat32) + `,` +
-				fmt.Sprintf("%g", -math.MaxFloat32) + `,` +
-				fmt.Sprintf("%g", math.MaxFloat32*2) + `,` +
-				fmt.Sprintf("%g", -math.MaxFloat32*2) + `,` +
-				`3.59539e+308,` + // math.MaxFloat64 * 2
-				`-3.59539e+308,` + // -math.MaxFloat64 * 2
-				fmt.Sprintf("%d000", uint64(math.MaxUint64)) +
-				`]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.MaxFloat32)}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(-math.MaxFloat32)}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.MaxUint64) * 1000}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `nums: [` +
-				fmt.Sprintf("%g", math.MaxFloat64) + `,` +
-				fmt.Sprintf("%g", -math.MaxFloat64) + `,` +
-				`3.59539e+308,` + // math.MaxFloat64 * 2
-				`-3.59539e+308,` + // -math.MaxFloat64 * 2
-				fmt.Sprintf("%d000", uint64(math.MaxUint64)) +
-				`]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{math.MaxFloat64}}},
-				{K: text.Scalar, T: ST{ok: Float64{-math.MaxFloat64}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{float64(math.MaxUint64) * 1000}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// -0 is only valid for signed types. It is not valid for unsigned types.
-			in: `num: [-0, -0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{nok: Uint32{}}},
-				{K: text.Scalar, T: ST{nok: Uint64{}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// -0 is only valid for signed types. It is not valid for unsigned types.
-			in: `num: [-0, -0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Int32{0}}},
-				{K: text.Scalar, T: ST{ok: Int64{0}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// Negative zeros on float64 should preserve sign bit.
-			in: `num: [-0, -.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{math.Copysign(0, -1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Copysign(0, -1)}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// Negative zeros on float32 should preserve sign bit.
-			in: `num: [-0, -.0]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Copysign(0, -1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Copysign(0, -1))}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `num: +0`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: +`},
-			},
-		},
-		{
-			in: `num: 01.1234`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: 01.1234`},
-			},
-		},
-		{
-			in: `num: 0x`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: 0x`},
-			},
-		},
-		{
-			in: `num: 0xX`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: 0xX`},
-			},
-		},
-		{
-			in: `num: 0800`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: 0800`},
-			},
-		},
-		{
-			in: `num: 1.`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Float32{1.0}}},
-			},
-		},
-		{
-			in: `num: -.`,
-			want: []R{
-				{K: text.Name},
-				{E: `invalid scalar value: -.`},
-			},
-		},
-
-		// Float special literal values, case-insensitive match.
-		{
-			in: `name:[nan, NaN, Nan, NAN]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{math.NaN()}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.NaN()}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.NaN()}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.NaN()}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name:[inf, INF, infinity, Infinity, INFinity]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(1)}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name:[-inf, -INF, -infinity, -Infinity, -INFinity]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.Scalar, T: ST{ok: Float64{math.Inf(-1)}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name:[nan, NaN, Nan, NAN]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.NaN())}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.NaN())}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.NaN())}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.NaN())}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name:[inf, INF, infinity, Infinity, INFinity]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(1))}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			in: `name:[-inf, -INF, -infinity, -Infinity, -INFinity]`,
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.Scalar, T: ST{ok: Float32{float32(math.Inf(-1))}}},
-				{K: text.ListClose},
-			},
-		},
-		{
-			// C++ permits this, but we currently reject this. It is easy to add
-			// if needed.
-			in: `name: -nan`,
-			want: []R{
-				{K: text.Name},
-				{K: text.Scalar, T: ST{nok: Float64{}}},
-			},
-		},
-		// Messages.
-		{
-			in: `m: {}`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{K: text.MessageClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `m: <>`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{K: text.MessageClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: space + `m {` + space + "\n# comment\n" + `}` + space,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{K: text.MessageClose},
-			},
-		},
-		{
-			in: `m { foo: < bar: "hello" > }`,
-			want: []R{
-				{K: text.Name, RS: "m"},
-				{K: text.MessageOpen},
-
-				{K: text.Name, RS: "foo"},
-				{K: text.MessageOpen},
-
-				{K: text.Name, RS: "bar"},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-
-				{K: text.MessageClose},
-
-				{K: text.MessageClose},
-			},
-		},
-		{
-			in: `list [ <s:"hello">, {s:"world"} ]`,
-			want: []R{
-				{K: text.Name, RS: "list"},
-				{K: text.ListOpen},
-
-				{K: text.MessageOpen},
-				{K: text.Name, RS: "s"},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-				{K: text.MessageClose},
-
-				{K: text.MessageOpen},
-				{K: text.Name, RS: "s"},
-				{K: text.Scalar, T: ST{ok: Str{"world"}}},
-				{K: text.MessageClose},
-
-				{K: text.ListClose},
-				{K: text.EOF},
-			},
-		},
-		{
-			in: `m: { >`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-				{E: `mismatched close character '>'`},
-			},
-		},
-		{
-			in: `m: <s: "hello"}`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-
-				{K: text.Name},
-				{K: text.Scalar, T: ST{ok: Str{"hello"}}},
-
-				{E: `mismatched close character '}'`},
-			},
-		},
-		{
-			in:   `{}`,
-			want: []R{{E: `invalid field name: {`}},
-		},
-		{
-			in: `
-m: {
-  foo: true;
-  bar: {
-	enum: ENUM
-	list: [ < >, { } ] ;
-  }
-  [qux]: "end"
-}
-				`,
-			want: []R{
-				{K: text.Name},
-				{K: text.MessageOpen},
-
-				{K: text.Name, RS: "foo"},
-				{K: text.Scalar, T: ST{ok: Bool{true}}},
-
-				{K: text.Name, RS: "bar"},
-				{K: text.MessageOpen},
-
-				{K: text.Name, RS: "enum"},
-				{K: text.Scalar, T: ST{ok: Enum{"ENUM"}}},
-
-				{K: text.Name, RS: "list"},
-				{K: text.ListOpen},
-				{K: text.MessageOpen},
-				{K: text.MessageClose},
-				{K: text.MessageOpen},
-				{K: text.MessageClose},
-				{K: text.ListClose},
-
-				{K: text.MessageClose},
-
-				{K: text.Name, RS: "[qux]"},
-				{K: text.Scalar, T: ST{ok: Str{"end"}}},
-
-				{K: text.MessageClose},
-				{K: text.EOF},
-			},
-		},
-
-		// Other syntax errors.
-		{
-			in: "x: -",
-			want: []R{
-				{K: text.Name},
-				{E: `syntax error (line 1:4): invalid scalar value: -`},
-			},
-		},
-		{
-			in: "x:[\"💩\"x",
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"💩"}}, P: 3},
-				{E: `syntax error (line 1:7)`},
-			},
-		},
-		{
-			in: "x:\n\n[\"🔥🔥🔥\"x",
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"🔥🔥🔥"}}, P: 5},
-				{E: `syntax error (line 3:7)`},
-			},
-		},
-		{
-			// multi-rune emojis; could be column:8
-			in: "x:[\"👍🏻👍🏿\"x",
-			want: []R{
-				{K: text.Name},
-				{K: text.ListOpen},
-				{K: text.Scalar, T: ST{ok: Str{"👍🏻👍🏿"}}, P: 3},
-				{E: `syntax error (line 1:10)`},
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run("", func(t *testing.T) {
-			tc := tc
-			in := []byte(tc.in)
-			dec := text.NewDecoder(in[:len(in):len(in)])
-			for i, want := range tc.want {
-				peekTok, peekErr := dec.Peek()
-				tok, err := dec.Read()
-				if err != nil {
-					if want.E == "" {
-						errorf(t, tc.in, "Read() got unexpected error: %v", err)
-					} else if !strings.Contains(err.Error(), want.E) {
-						errorf(t, tc.in, "Read() got %q, want %q", err, want.E)
-					}
-					return
-				}
-				if want.E != "" {
-					errorf(t, tc.in, "Read() got nil error, want %q", want.E)
-					return
-				}
-				gotK := tok.Kind()
-				if gotK != want.K {
-					errorf(t, tc.in, "Read() got %v, want %v", gotK, want.K)
-					return
-				}
-				checkToken(t, tok, i, want, tc.in)
-				if !cmp.Equal(tok, peekTok, cmp.Comparer(text.TokenEquals)) {
-					errorf(t, tc.in, "Peek() %+v != Read() token %+v", peekTok, tok)
-				}
-				if err != peekErr {
-					errorf(t, tc.in, "Peek() error %v != Read() error %v", err, peekErr)
-				}
-			}
-		})
-	}
-}
-
-func checkToken(t *testing.T, tok text.Token, idx int, r R, in string) {
-	// Validate Token.Pos() if R.P is set.
-	if r.P > 0 {
-		got := tok.Pos()
-		if got != r.P {
-			errorf(t, in, "want#%d: Token.Pos() got %v want %v", idx, got, r.P)
-		}
-	}
-
-	// Validate Token.RawString if R.RS is set.
-	if len(r.RS) > 0 {
-		got := tok.RawString()
-		if got != r.RS {
-			errorf(t, in, "want#%d: Token.RawString() got %v want %v", idx, got, r.P)
-		}
-	}
-
-	// Skip checking for Token details if r.T is not set.
-	if r.T == nil {
-		return
-	}
-
-	switch tok.Kind() {
-	case text.Name:
-		want := r.T.(NT)
-		kind := tok.NameKind()
-		if kind != want.K {
-			errorf(t, in, "want#%d: Token.NameKind() got %v want %v", idx, kind, want.K)
-			return
-		}
-		switch kind {
-		case text.IdentName:
-			got := tok.IdentName()
-			if got != want.S {
-				errorf(t, in, "want#%d: Token.IdentName() got %v want %v", idx, got, want.S)
-			}
-		case text.TypeName:
-			got := tok.TypeName()
-			if got != want.S {
-				errorf(t, in, "want#%d: Token.TypeName() got %v want %v", idx, got, want.S)
-			}
-		case text.FieldNumber:
-			got := tok.FieldNumber()
-			if got != want.N {
-				errorf(t, in, "want#%d: Token.FieldNumber() got %v want %v", idx, got, want.N)
-			}
-		}
-
-	case text.Scalar:
-		want := r.T.(ST)
-		if ok := want.ok; ok != nil {
-			if err := ok.checkOk(tok); err != "" {
-				errorf(t, in, "want#%d: %s", idx, err)
-			}
-		}
-		if nok := want.nok; nok != nil {
-			if err := nok.checkNok(tok); err != "" {
-				errorf(t, in, "want#%d: %s", idx, err)
-			}
-		}
-	}
-}
-
-func errorf(t *testing.T, in string, fmtStr string, args ...interface{}) {
-	t.Helper()
-	vargs := []interface{}{in}
-	for _, arg := range args {
-		vargs = append(vargs, arg)
-	}
-	t.Errorf("input:\n%s\n~end~\n"+fmtStr, vargs...)
-}
-
-func TestUnmarshalString(t *testing.T) {
-	tests := []struct {
-		in string
-		// want is expected string result.
-		want string
-		// err is expected error substring from calling DecodeString if set.
-		err string
-	}{
-		{
-			in: func() string {
-				var b []byte
-				for i := 0; i < utf8.RuneSelf; i++ {
-					switch i {
-					case 0, '\\', '\n', '\'': // these must be escaped, so ignore them
-					default:
-						b = append(b, byte(i))
-					}
-				}
-				return "'" + string(b) + "'"
-			}(),
-			want: "\x01\x02\x03\x04\x05\x06\a\b\t\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f",
-		},
-		{
-			in:  "'\xde\xad\xbe\xef'",
-			err: `invalid UTF-8 detected`,
-		},
-		{
-			// Valid UTF-8 wire encoding, but sub-optimal encoding.
-			in:  "'\xc0\x80'",
-			err: "invalid UTF-8 detected",
-		},
-		{
-			// Valid UTF-8 wire encoding, but invalid rune (surrogate pair).
-			in:  "'\xed\xa0\x80'",
-			err: "invalid UTF-8 detected",
-		},
-		{
-			// Valid UTF-8 wire encoding, but invalid rune (above max rune).
-			in:  "'\xf7\xbf\xbf\xbf'",
-			err: "invalid UTF-8 detected",
-		},
-		{
-			// Valid UTF-8 wire encoding of the RuneError rune.
-			in:   "'\xef\xbf\xbd'",
-			want: string(utf8.RuneError),
-		},
-		{
-			in:   "'hello\u1234world'",
-			want: "hello\u1234world",
-		},
-		{
-			in:   `'\"\'\\\?\a\b\n\r\t\v\f\1\12\123\xA\xaB\x12\uAb8f\U0010FFFF'`,
-			want: "\"'\\?\a\b\n\r\t\v\f\x01\nS\n\xab\x12\uab8f\U0010ffff",
-		},
-		{
-			in:  `str: '\8'`,
-			err: `invalid escape code "\\8" in string`,
-		},
-		{
-			in:   `'\1x'`,
-			want: "\001x",
-		},
-		{
-			in:   `'\12x'`,
-			want: "\012x",
-		},
-		{
-			in:   `'\123x'`,
-			want: "\123x",
-		},
-		{
-			in:   `'\1234x'`,
-			want: "\1234x",
-		},
-		{
-			in:   `'\1'`,
-			want: "\001",
-		},
-		{
-			in:   `'\12'`,
-			want: "\012",
-		},
-		{
-			in:   `'\123'`,
-			want: "\123",
-		},
-		{
-			in:   `'\1234'`,
-			want: "\1234",
-		},
-		{
-			in:   `'\377'`,
-			want: "\377",
-		},
-		{
-			// Overflow octal escape.
-			in:  `'\400'`,
-			err: `invalid octal escape code "\\400" in string`,
-		},
-		{
-			in:   `'\xfx'`,
-			want: "\x0fx",
-		},
-		{
-			in:   `'\xffx'`,
-			want: "\xffx",
-		},
-		{
-			in:   `'\xfffx'`,
-			want: "\xfffx",
-		},
-		{
-			in:   `'\xf'`,
-			want: "\x0f",
-		},
-		{
-			in:   `'\xff'`,
-			want: "\xff",
-		},
-		{
-			in:   `'\xfff'`,
-			want: "\xfff",
-		},
-		{
-			in:  `'\xz'`,
-			err: `invalid hex escape code "\\x" in string`,
-		},
-		{
-			in:  `'\uPo'`,
-			err: eofErr,
-		},
-		{
-			in:  `'\uPoo'`,
-			err: `invalid Unicode escape code "\\uPoo'" in string`,
-		},
-		{
-			in:  `str: '\uPoop'`,
-			err: `invalid Unicode escape code "\\uPoop" in string`,
-		},
-		{
-			// Unmatched surrogate pair.
-			in:  `str: '\uDEAD'`,
-			err: `unexpected EOF`, // trying to reader other half
-		},
-		{
-			// Surrogate pair with invalid other half.
-			in:  `str: '\uDEAD\u0000'`,
-			err: `invalid Unicode escape code "\\u0000" in string`,
-		},
-		{
-			// Properly matched surrogate pair.
-			in:   `'\uD800\uDEAD'`,
-			want: "𐊭",
-		},
-		{
-			// Overflow on Unicode rune.
-			in:  `'\U00110000'`,
-			err: `invalid Unicode escape code "\\U00110000" in string`,
-		},
-		{
-			in:  `'\z'`,
-			err: `invalid escape code "\\z" in string`,
-		},
-		{
-			// Strings cannot have NUL literal since C-style strings forbid them.
-			in:  "'\x00'",
-			err: `invalid character '\x00' in string`,
-		},
-		{
-			// Strings cannot have newline literal. The C++ permits them if an
-			// option is specified to allow them. In Go, we always forbid them.
-			in:  "'\n'",
-			err: `invalid character '\n' in string`,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run("", func(t *testing.T) {
-			got, err := text.UnmarshalString(tc.in)
-			if err != nil {
-				if tc.err == "" {
-					errorf(t, tc.in, "UnmarshalString() got unexpected error: %q", err)
-				} else if !strings.Contains(err.Error(), tc.err) {
-					errorf(t, tc.in, "UnmarshalString() error got %q, want %q", err, tc.err)
-				}
-				return
-			}
-			if tc.err != "" {
-				errorf(t, tc.in, "UnmarshalString() got nil error, want %q", tc.err)
-				return
-			}
-			if got != tc.want {
-				errorf(t, tc.in, "UnmarshalString()\n[got]\n%s\n[want]\n%s", got, tc.want)
-			}
-		})
-	}
-}
-
-// Tests line and column number produced by Decoder.Position.
-func TestPosition(t *testing.T) {
-	dec := text.NewDecoder([]byte("0123456789\n12345\n789"))
-
-	tests := []struct {
-		pos int
-		row int
-		col int
-	}{
-		{
-			pos: 0,
-			row: 1,
-			col: 1,
-		},
-		{
-			pos: 10,
-			row: 1,
-			col: 11,
-		},
-		{
-			pos: 11,
-			row: 2,
-			col: 1,
-		},
-		{
-			pos: 18,
-			row: 3,
-			col: 2,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run("", func(t *testing.T) {
-			row, col := dec.Position(tc.pos)
-			if row != tc.row || col != tc.col {
-				t.Errorf("Position(%d) got (%d,%d) want (%d,%d)", tc.pos, row, col, tc.row, tc.col)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/encode_test.go b/vendor/google.golang.org/protobuf/internal/encoding/text/encode_test.go
deleted file mode 100644
index d9c50098338..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/encode_test.go
+++ /dev/null
@@ -1,557 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package text_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/encoding/text"
-)
-
-// Disable detrand to enable direct comparisons on outputs.
-func init() { detrand.Disable() }
-
-func TestEncoder(t *testing.T) {
-	tests := []encoderTestCase{
-		{
-			desc:          "no-opt",
-			write:         func(e *text.Encoder) {},
-			wantOut:       ``,
-			wantOutIndent: ``,
-		},
-		{
-			desc: "true",
-			write: func(e *text.Encoder) {
-				e.WriteName("bool")
-				e.WriteBool(true)
-			},
-			wantOut:       `bool:true`,
-			wantOutIndent: `bool: true`,
-		},
-		{
-			desc: "false",
-			write: func(e *text.Encoder) {
-				e.WriteName("bool")
-				e.WriteBool(false)
-			},
-			wantOut:       `bool:false`,
-			wantOutIndent: `bool: false`,
-		},
-		{
-			desc: "bracket name",
-			write: func(e *text.Encoder) {
-				e.WriteName("[extension]")
-				e.WriteString("hello")
-			},
-			wantOut:       `[extension]:"hello"`,
-			wantOutIndent: `[extension]: "hello"`,
-		},
-		{
-			desc: "numeric name",
-			write: func(e *text.Encoder) {
-				e.WriteName("01234")
-				e.WriteString("hello")
-			},
-			wantOut:       `01234:"hello"`,
-			wantOutIndent: `01234: "hello"`,
-		},
-		{
-			desc: "string",
-			write: func(e *text.Encoder) {
-				e.WriteName("str")
-				e.WriteString("hello world")
-			},
-			wantOut:       `str:"hello world"`,
-			wantOutIndent: `str: "hello world"`,
-		},
-		{
-			desc: "enum",
-			write: func(e *text.Encoder) {
-				e.WriteName("enum")
-				e.WriteLiteral("ENUM_VALUE")
-			},
-			wantOut:       `enum:ENUM_VALUE`,
-			wantOutIndent: `enum: ENUM_VALUE`,
-		},
-		{
-			desc: "float64",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(1.0199999809265137, 64)
-			},
-			wantOut:       `float64:1.0199999809265137`,
-			wantOutIndent: `float64: 1.0199999809265137`,
-		},
-		{
-			desc: "float64 max value",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(math.MaxFloat64, 64)
-			},
-			wantOut:       `float64:1.7976931348623157e+308`,
-			wantOutIndent: `float64: 1.7976931348623157e+308`,
-		},
-		{
-			desc: "float64 min value",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(-math.MaxFloat64, 64)
-			},
-			wantOut:       `float64:-1.7976931348623157e+308`,
-			wantOutIndent: `float64: -1.7976931348623157e+308`,
-		},
-		{
-			desc: "float64 nan",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(math.NaN(), 64)
-			},
-			wantOut:       `float64:nan`,
-			wantOutIndent: `float64: nan`,
-		},
-		{
-			desc: "float64 inf",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(math.Inf(+1), 64)
-			},
-			wantOut:       `float64:inf`,
-			wantOutIndent: `float64: inf`,
-		},
-		{
-			desc: "float64 -inf",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(math.Inf(-1), 64)
-			},
-			wantOut:       `float64:-inf`,
-			wantOutIndent: `float64: -inf`,
-		},
-		{
-			desc: "float64 negative zero",
-			write: func(e *text.Encoder) {
-				e.WriteName("float64")
-				e.WriteFloat(math.Copysign(0, -1), 64)
-			},
-			wantOut:       `float64:-0`,
-			wantOutIndent: `float64: -0`,
-		},
-		{
-			desc: "float32",
-			write: func(e *text.Encoder) {
-				e.WriteName("float")
-				e.WriteFloat(1.02, 32)
-			},
-			wantOut:       `float:1.02`,
-			wantOutIndent: `float: 1.02`,
-		},
-		{
-			desc: "float32 max value",
-			write: func(e *text.Encoder) {
-				e.WriteName("float32")
-				e.WriteFloat(math.MaxFloat32, 32)
-			},
-			wantOut:       `float32:3.4028235e+38`,
-			wantOutIndent: `float32: 3.4028235e+38`,
-		},
-		{
-			desc: "float32 nan",
-			write: func(e *text.Encoder) {
-				e.WriteName("float32")
-				e.WriteFloat(math.NaN(), 32)
-			},
-			wantOut:       `float32:nan`,
-			wantOutIndent: `float32: nan`,
-		},
-		{
-			desc: "float32 inf",
-			write: func(e *text.Encoder) {
-				e.WriteName("float32")
-				e.WriteFloat(math.Inf(+1), 32)
-			},
-			wantOut:       `float32:inf`,
-			wantOutIndent: `float32: inf`,
-		},
-		{
-			desc: "float32 -inf",
-			write: func(e *text.Encoder) {
-				e.WriteName("float32")
-				e.WriteFloat(math.Inf(-1), 32)
-			},
-			wantOut:       `float32:-inf`,
-			wantOutIndent: `float32: -inf`,
-		},
-		{
-			desc: "float32 negative zero",
-			write: func(e *text.Encoder) {
-				e.WriteName("float32")
-				e.WriteFloat(math.Copysign(0, -1), 32)
-			},
-			wantOut:       `float32:-0`,
-			wantOutIndent: `float32: -0`,
-		},
-		{
-			desc: "int64 max value",
-			write: func(e *text.Encoder) {
-				e.WriteName("int")
-				e.WriteInt(math.MaxInt64)
-			},
-			wantOut:       `int:9223372036854775807`,
-			wantOutIndent: `int: 9223372036854775807`,
-		},
-		{
-			desc: "int64 min value",
-			write: func(e *text.Encoder) {
-				e.WriteName("int")
-				e.WriteInt(math.MinInt64)
-			},
-			wantOut:       `int:-9223372036854775808`,
-			wantOutIndent: `int: -9223372036854775808`,
-		},
-		{
-			desc: "uint",
-			write: func(e *text.Encoder) {
-				e.WriteName("uint")
-				e.WriteUint(math.MaxUint64)
-			},
-			wantOut:       `uint:18446744073709551615`,
-			wantOutIndent: `uint: 18446744073709551615`,
-		},
-		{
-			desc: "empty message field",
-			write: func(e *text.Encoder) {
-				e.WriteName("m")
-				e.StartMessage()
-				e.EndMessage()
-			},
-			wantOut:       `m:{}`,
-			wantOutIndent: `m: {}`,
-		},
-		{
-			desc: "multiple fields",
-			write: func(e *text.Encoder) {
-				e.WriteName("bool")
-				e.WriteBool(true)
-				e.WriteName("str")
-				e.WriteString("hello")
-				e.WriteName("str")
-				e.WriteString("world")
-				e.WriteName("m")
-				e.StartMessage()
-				e.EndMessage()
-				e.WriteName("[int]")
-				e.WriteInt(49)
-				e.WriteName("float64")
-				e.WriteFloat(1.00023e4, 64)
-				e.WriteName("101")
-				e.WriteString("unknown")
-			},
-			wantOut: `bool:true str:"hello" str:"world" m:{} [int]:49 float64:10002.3 101:"unknown"`,
-			wantOutIndent: `bool: true
-str: "hello"
-str: "world"
-m: {}
-[int]: 49
-float64: 10002.3
-101: "unknown"`,
-		},
-		{
-			desc: "populated message fields",
-			write: func(e *text.Encoder) {
-				e.WriteName("m1")
-				e.StartMessage()
-				{
-					e.WriteName("str")
-					e.WriteString("hello")
-				}
-				e.EndMessage()
-
-				e.WriteName("bool")
-				e.WriteBool(true)
-
-				e.WriteName("m2")
-				e.StartMessage()
-				{
-					e.WriteName("str")
-					e.WriteString("world")
-					e.WriteName("m2-1")
-					e.StartMessage()
-					e.EndMessage()
-					e.WriteName("m2-2")
-					e.StartMessage()
-					{
-						e.WriteName("[int]")
-						e.WriteInt(49)
-					}
-					e.EndMessage()
-					e.WriteName("float64")
-					e.WriteFloat(1.00023e4, 64)
-				}
-				e.EndMessage()
-
-				e.WriteName("101")
-				e.WriteString("unknown")
-			},
-			wantOut: `m1:{str:"hello"} bool:true m2:{str:"world" m2-1:{} m2-2:{[int]:49} float64:10002.3} 101:"unknown"`,
-			wantOutIndent: `m1: {
-	str: "hello"
-}
-bool: true
-m2: {
-	str: "world"
-	m2-1: {}
-	m2-2: {
-		[int]: 49
-	}
-	float64: 10002.3
-}
-101: "unknown"`,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.desc, func(t *testing.T) {
-			runEncoderTest(t, tc, [2]byte{})
-
-			// Test using the angle brackets.
-			// Testcases should not contain characters '{' and '}'.
-			tc.wantOut = replaceDelims(tc.wantOut)
-			tc.wantOutIndent = replaceDelims(tc.wantOutIndent)
-			runEncoderTest(t, tc, [2]byte{'<', '>'})
-		})
-	}
-}
-
-type encoderTestCase struct {
-	desc          string
-	write         func(*text.Encoder)
-	wantOut       string
-	wantOutIndent string
-}
-
-func runEncoderTest(t *testing.T, tc encoderTestCase, delims [2]byte) {
-	t.Helper()
-
-	if tc.wantOut != "" {
-		enc, err := text.NewEncoder(nil, "", delims, false)
-		if err != nil {
-			t.Fatalf("NewEncoder returned error: %v", err)
-		}
-		tc.write(enc)
-		got := string(enc.Bytes())
-		if got != tc.wantOut {
-			t.Errorf("(compact)\n<got>\n%v\n<want>\n%v\n", got, tc.wantOut)
-		}
-	}
-	if tc.wantOutIndent != "" {
-		enc, err := text.NewEncoder(nil, "\t", delims, false)
-		if err != nil {
-			t.Fatalf("NewEncoder returned error: %v", err)
-		}
-		tc.write(enc)
-		got, want := string(enc.Bytes()), tc.wantOutIndent
-		if got != want {
-			t.Errorf("(multi-line)\n<got>\n%v\n<want>\n%v\n<diff -want +got>\n%v\n",
-				got, want, cmp.Diff(want, got))
-		}
-	}
-}
-
-func replaceDelims(s string) string {
-	s = strings.Replace(s, "{", "<", -1)
-	return strings.Replace(s, "}", ">", -1)
-}
-
-// Test for UTF-8 and ASCII outputs.
-func TestEncodeStrings(t *testing.T) {
-	tests := []struct {
-		in           string
-		wantOut      string
-		wantOutASCII string
-	}{
-		{
-			in:      `"`,
-			wantOut: `"\""`,
-		},
-		{
-			in:      `'`,
-			wantOut: `"'"`,
-		},
-		{
-			in:           "hello\u1234world",
-			wantOut:      "\"hello\u1234world\"",
-			wantOutASCII: `"hello\u1234world"`,
-		},
-		{
-			// String that has as few escaped characters as possible.
-			in: func() string {
-				var b []byte
-				for i := rune(0); i <= 0x00a0; i++ {
-					switch i {
-					case 0, '\\', '\n', '\'': // these must be escaped, so ignore them
-					default:
-						var r [utf8.UTFMax]byte
-						n := utf8.EncodeRune(r[:], i)
-						b = append(b, r[:n]...)
-					}
-				}
-				return string(b)
-			}(),
-			wantOut:      `"\x01\x02\x03\x04\x05\x06\x07\x08\t\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_` + "`" + `abcdefghijklmnopqrstuvwxyz{|}~\x7f\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089\u008a\u008b\u008c\u008d\u008e\u008f\u0090\u0091\u0092\u0093\u0094\u0095\u0096\u0097\u0098\u0099\u009a\u009b\u009c\u009d\u009e\u009f` + "\u00a0" + `"`,
-			wantOutASCII: `"\x01\x02\x03\x04\x05\x06\x07\x08\t\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_` + "`" + `abcdefghijklmnopqrstuvwxyz{|}~\x7f\u0080\u0081\u0082\u0083\u0084\u0085\u0086\u0087\u0088\u0089\u008a\u008b\u008c\u008d\u008e\u008f\u0090\u0091\u0092\u0093\u0094\u0095\u0096\u0097\u0098\u0099\u009a\u009b\u009c\u009d\u009e\u009f\u00a0"`,
-		},
-		{
-			// Valid UTF-8 wire encoding of the RuneError rune.
-			in:           string(utf8.RuneError),
-			wantOut:      `"` + string(utf8.RuneError) + `"`,
-			wantOutASCII: `"\ufffd"`,
-		},
-		{
-			in:           "\"'\\?\a\b\n\r\t\v\f\x01\nS\n\xab\x12\uab8f\U0010ffff",
-			wantOut:      `"\"'\\?\x07\x08\n\r\t\x0b\x0c\x01\nS\n\xab\x12` + "\uab8f\U0010ffff" + `"`,
-			wantOutASCII: `"\"'\\?\x07\x08\n\r\t\x0b\x0c\x01\nS\n\xab\x12\uab8f\U0010ffff"`,
-		},
-		{
-			in:           "\001x",
-			wantOut:      `"\x01x"`,
-			wantOutASCII: `"\x01x"`,
-		},
-		{
-			in:           "\012x",
-			wantOut:      `"\nx"`,
-			wantOutASCII: `"\nx"`,
-		},
-		{
-			in:           "\123x",
-			wantOut:      `"Sx"`,
-			wantOutASCII: `"Sx"`,
-		},
-		{
-			in:           "\1234x",
-			wantOut:      `"S4x"`,
-			wantOutASCII: `"S4x"`,
-		},
-		{
-			in:           "\001",
-			wantOut:      `"\x01"`,
-			wantOutASCII: `"\x01"`,
-		},
-		{
-			in:           "\012",
-			wantOut:      `"\n"`,
-			wantOutASCII: `"\n"`,
-		},
-		{
-			in:           "\123",
-			wantOut:      `"S"`,
-			wantOutASCII: `"S"`,
-		},
-		{
-			in:           "\1234",
-			wantOut:      `"S4"`,
-			wantOutASCII: `"S4"`,
-		},
-		{
-			in:           "\377",
-			wantOut:      `"\xff"`,
-			wantOutASCII: `"\xff"`,
-		},
-		{
-			in:           "\x0fx",
-			wantOut:      `"\x0fx"`,
-			wantOutASCII: `"\x0fx"`,
-		},
-		{
-			in:           "\xffx",
-			wantOut:      `"\xffx"`,
-			wantOutASCII: `"\xffx"`,
-		},
-		{
-			in:           "\xfffx",
-			wantOut:      `"\xfffx"`,
-			wantOutASCII: `"\xfffx"`,
-		},
-		{
-			in:           "\x0f",
-			wantOut:      `"\x0f"`,
-			wantOutASCII: `"\x0f"`,
-		},
-		{
-			in:           "\x7f",
-			wantOut:      `"\x7f"`,
-			wantOutASCII: `"\x7f"`,
-		},
-		{
-			in:           "\xff",
-			wantOut:      `"\xff"`,
-			wantOutASCII: `"\xff"`,
-		},
-		{
-			in:           "\xfff",
-			wantOut:      `"\xfff"`,
-			wantOutASCII: `"\xfff"`,
-		},
-	}
-	for _, tc := range tests {
-		t.Run("", func(t *testing.T) {
-			if tc.wantOut != "" {
-				runEncodeStringsTest(t, tc.in, tc.wantOut, false)
-			}
-			if tc.wantOutASCII != "" {
-				runEncodeStringsTest(t, tc.in, tc.wantOutASCII, true)
-			}
-		})
-	}
-}
-
-func runEncodeStringsTest(t *testing.T, in string, want string, outputASCII bool) {
-	t.Helper()
-
-	charType := "UTF-8"
-	if outputASCII {
-		charType = "ASCII"
-	}
-
-	enc, err := text.NewEncoder(nil, "", [2]byte{}, outputASCII)
-	if err != nil {
-		t.Fatalf("[%s] NewEncoder returned error: %v", charType, err)
-	}
-	enc.WriteString(in)
-	got := string(enc.Bytes())
-	if got != want {
-		t.Errorf("[%s] WriteString(%q)\n<got>\n%v\n<want>\n%v\n", charType, in, got, want)
-	}
-}
-
-func TestReset(t *testing.T) {
-	enc, err := text.NewEncoder(nil, "\t", [2]byte{}, false)
-	if err != nil {
-		t.Fatalf("NewEncoder returned error: %v", err)
-	}
-
-	enc.WriteName("foo")
-	pos := enc.Snapshot()
-
-	// Attempt to write a message value.
-	enc.StartMessage()
-	enc.WriteName("bar")
-	enc.WriteUint(10)
-
-	// Reset the value and decided to write a string value instead.
-	enc.Reset(pos)
-	enc.WriteString("0123456789")
-
-	got := string(enc.Bytes())
-	want := `foo: "0123456789"`
-	if got != want {
-		t.Errorf("Reset did not restore given position:\n<got>\n%v\n<want>\n%v\n", got, want)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/text/gotest/ya.make
deleted file mode 100644
index c19bba9efd4..00000000000
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/encoding/text)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/ya.make b/vendor/google.golang.org/protobuf/internal/encoding/text/ya.make
index d9fb283dd65..5665f827010 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/encoding/text/ya.make
@@ -11,11 +11,4 @@ SRCS(
     encode.go
 )
 
-GO_XTEST_SRCS(
-    decode_test.go
-    encode_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/errors/errors_test.go b/vendor/google.golang.org/protobuf/internal/errors/errors_test.go
deleted file mode 100644
index 804eb96c29e..00000000000
--- a/vendor/google.golang.org/protobuf/internal/errors/errors_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package errors
-
-import (
-	"errors"
-	"strings"
-	"testing"
-)
-
-func TestErrors(t *testing.T) {
-	var sentinel = New("sentinel")
-	var foreign = errors.New("foreign")
-	for _, test := range []struct {
-		what     string
-		err      error
-		wantText string
-		is       []error
-		isNot    []error
-	}{{
-		what:     `New("abc")`,
-		err:      New("abc"),
-		wantText: "abc",
-	}, {
-		what:     `New("%v", sentinel)`,
-		err:      New("%v", sentinel),
-		wantText: "sentinel",
-		isNot:    []error{sentinel},
-	}, {
-		what:     `Wrap(sentinel, "%v", "text")`,
-		err:      Wrap(sentinel, "%v", "text"),
-		wantText: "text: sentinel",
-		is:       []error{sentinel},
-	}, {
-		what:     `New("%v", foreign)`,
-		err:      New("%v", foreign),
-		wantText: "foreign",
-		isNot:    []error{foreign},
-	}, {
-		what:     `Wrap(foreign, "%v", "text")`,
-		err:      Wrap(foreign, "%v", "text"),
-		wantText: "text: foreign",
-		is:       []error{foreign},
-	}} {
-		if got, want := test.err.Error(), prefix; !strings.HasPrefix(got, want) {
-			t.Errorf("%v.Error() = %q, want prefix %q", test.what, got, want)
-		}
-		if got, want := test.err.Error(), prefix+test.wantText; got != want {
-			t.Errorf("%v.Error() = %q, want %q", test.what, got, want)
-		}
-		if got, want := Is(test.err, Error), true; got != want {
-			t.Errorf("errors.Is(%v, errors.Error) = %v, want %v", test.what, got, want)
-		}
-		for _, err := range test.is {
-			if got, want := Is(test.err, err), true; got != want {
-				t.Errorf("errors.Is(%v, %v) = %v, want %v", test.what, err, got, want)
-			}
-		}
-		for _, err := range test.isNot {
-			if got, want := Is(test.err, err), false; got != want {
-				t.Errorf("errors.Is(%v, %v) = %v, want %v", test.what, err, got, want)
-			}
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/errors/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/errors/gotest/ya.make
deleted file mode 100644
index e7246ed5306..00000000000
--- a/vendor/google.golang.org/protobuf/internal/errors/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/errors)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/errors/ya.make b/vendor/google.golang.org/protobuf/internal/errors/ya.make
index 33bdecf50ba..d958a0d0192 100644
--- a/vendor/google.golang.org/protobuf/internal/errors/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/errors/ya.make
@@ -7,8 +7,4 @@ SRCS(
     is_go113.go
 )
 
-GO_TEST_SRCS(errors_test.go)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/build_test.go b/vendor/google.golang.org/protobuf/internal/filedesc/build_test.go
deleted file mode 100644
index 979b8ea19a9..00000000000
--- a/vendor/google.golang.org/protobuf/internal/filedesc/build_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package filedesc_test
-
-import (
-	"bytes"
-	"compress/gzip"
-	"io/ioutil"
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protodesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	_ "google.golang.org/protobuf/internal/testprotos/test/weak1"
-	"google.golang.org/protobuf/types/descriptorpb"
-)
-
-var testFile = new(testpb.TestAllTypes).ProtoReflect().Descriptor().ParentFile()
-
-func TestInit(t *testing.T) {
-	// Compare the FileDescriptorProto for the same test file from two different sources:
-	//
-	// 1. The result of passing the filedesc-produced FileDescriptor through protodesc.
-	// 2. The protoc-generated wire-encoded message.
-	//
-	// This serves as a test of both filedesc and protodesc.
-	got := protodesc.ToFileDescriptorProto(testFile)
-
-	want := &descriptorpb.FileDescriptorProto{}
-	zb, _ := (&testpb.TestAllTypes{}).Descriptor()
-	r, _ := gzip.NewReader(bytes.NewBuffer(zb))
-	b, _ := ioutil.ReadAll(r)
-	if err := proto.Unmarshal(b, want); err != nil {
-		t.Fatal(err)
-	}
-
-	if !proto.Equal(got, want) {
-		t.Errorf("protodesc.ToFileDescriptorProto(testpb.Test_protoFile) is not equal to the protoc-generated FileDescriptorProto for internal/testprotos/test/test.proto")
-	}
-
-	// Verify that the test proto file provides exhaustive coverage of all descriptor fields.
-	seen := make(map[protoreflect.FullName]bool)
-	visitFields(want.ProtoReflect(), func(field protoreflect.FieldDescriptor) {
-		seen[field.FullName()] = true
-	})
-	descFile := new(descriptorpb.DescriptorProto).ProtoReflect().Descriptor().ParentFile()
-	descPkg := descFile.Package()
-	ignore := map[protoreflect.FullName]bool{
-		// The protoreflect descriptors don't include source info.
-		descPkg.Append("FileDescriptorProto.source_code_info"): true,
-		descPkg.Append("FileDescriptorProto.syntax"):           true,
-		// Nothing is using edition yet.
-		descPkg.Append("FileDescriptorProto.edition"): true,
-
-		// Impossible to test proto3 optional in a proto2 file.
-		descPkg.Append("FieldDescriptorProto.proto3_optional"): true,
-
-		// TODO: Test oneof and extension options. Testing these requires extending the
-		// options messages (because they contain no user-settable fields), but importing
-		// descriptor.proto from test.proto currently causes an import cycle. Add test
-		// cases when that import cycle has been fixed.
-		descPkg.Append("OneofDescriptorProto.options"): true,
-	}
-	for _, messageName := range []protoreflect.Name{
-		"FileDescriptorProto",
-		"DescriptorProto",
-		"FieldDescriptorProto",
-		"OneofDescriptorProto",
-		"EnumDescriptorProto",
-		"EnumValueDescriptorProto",
-	} {
-		message := descFile.Messages().ByName(messageName)
-		for i, fields := 0, message.Fields(); i < fields.Len(); i++ {
-			if name := fields.Get(i).FullName(); !seen[name] && !ignore[name] {
-				t.Errorf("No test for descriptor field: %v", name)
-			}
-		}
-	}
-
-	// Verify that message descriptors for map entries have no Go type info.
-	mapEntryName := protoreflect.FullName("goproto.proto.test.TestAllTypes.MapInt32Int32Entry")
-	d := testFile.Messages().ByName("TestAllTypes").Fields().ByName("map_int32_int32").Message()
-	if gotName, wantName := d.FullName(), mapEntryName; gotName != wantName {
-		t.Fatalf("looked up wrong descriptor: got %v, want %v", gotName, wantName)
-	}
-	if _, ok := d.(protoreflect.MessageType); ok {
-		t.Errorf("message descriptor for %v must not implement protoreflect.MessageType", mapEntryName)
-	}
-}
-
-// visitFields calls f for every field set in m and its children.
-func visitFields(m protoreflect.Message, f func(protoreflect.FieldDescriptor)) {
-	m.Range(func(fd protoreflect.FieldDescriptor, value protoreflect.Value) bool {
-		f(fd)
-		switch fd.Kind() {
-		case protoreflect.MessageKind, protoreflect.GroupKind:
-			if fd.IsList() {
-				for i, list := 0, value.List(); i < list.Len(); i++ {
-					visitFields(list.Get(i).Message(), f)
-				}
-			} else {
-				visitFields(value.Message(), f)
-			}
-		}
-		return true
-	})
-}
-
-func TestWeakInit(t *testing.T) {
-	// We do not expect to get a placeholder since weak1 is imported.
-	fd1 := testFile.Messages().ByName("TestWeak").Fields().ByName("weak_message1")
-	if got, want := fd1.IsWeak(), true; got != want {
-		t.Errorf("field %v: IsWeak() = %v, want %v", fd1.FullName(), got, want)
-	}
-	if got, want := fd1.Message().IsPlaceholder(), false; got != want {
-		t.Errorf("field %v: Message.IsPlaceholder() = %v, want %v", fd1.FullName(), got, want)
-	}
-	if got, want := fd1.Message().Fields().Len(), 1; got != want {
-		t.Errorf("field %v: Message().Fields().Len() == %d, want %d", fd1.FullName(), got, want)
-	}
-
-	// We do expect to get a placeholder since weak2 is not imported.
-	fd2 := testFile.Messages().ByName("TestWeak").Fields().ByName("weak_message2")
-	if got, want := fd2.IsWeak(), true; got != want {
-		t.Errorf("field %v: IsWeak() = %v, want %v", fd2.FullName(), got, want)
-	}
-	if got, want := fd2.Message().IsPlaceholder(), true; got != want {
-		t.Errorf("field %v: Message.IsPlaceholder() = %v, want %v", fd2.FullName(), got, want)
-	}
-	if got, want := fd2.Message().Fields().Len(), 0; got != want {
-		t.Errorf("field %v: Message().Fields().Len() == %d, want %d", fd2.FullName(), got, want)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/desc.go b/vendor/google.golang.org/protobuf/internal/filedesc/desc.go
index 7c3689baee8..193c68e8f91 100644
--- a/vendor/google.golang.org/protobuf/internal/filedesc/desc.go
+++ b/vendor/google.golang.org/protobuf/internal/filedesc/desc.go
@@ -21,11 +21,26 @@ import (
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
+// Edition is an Enum for proto2.Edition
+type Edition int32
+
+// These values align with the value of Enum in descriptor.proto which allows
+// direct conversion between the proto enum and this enum.
+const (
+	EditionUnknown     Edition = 0
+	EditionProto2      Edition = 998
+	EditionProto3      Edition = 999
+	Edition2023        Edition = 1000
+	EditionUnsupported Edition = 100000
+)
+
 // The types in this file may have a suffix:
 //	• L0: Contains fields common to all descriptors (except File) and
 //	must be initialized up front.
 //	• L1: Contains fields specific to a descriptor and
-//	must be initialized up front.
+//	must be initialized up front. If the associated proto uses Editions, the
+//  Editions features must always be resolved. If not explicitly set, the
+//  appropriate default must be resolved and set.
 //	• L2: Contains fields that are lazily initialized when constructing
 //	from the raw file descriptor. When constructing as a literal, the L2
 //	fields must be initialized up front.
@@ -44,6 +59,7 @@ type (
 	}
 	FileL1 struct {
 		Syntax  protoreflect.Syntax
+		Edition Edition // Only used if Syntax == Editions
 		Path    string
 		Package protoreflect.FullName
 
@@ -51,12 +67,35 @@ type (
 		Messages   Messages
 		Extensions Extensions
 		Services   Services
+
+		EditionFeatures FileEditionFeatures
 	}
 	FileL2 struct {
 		Options   func() protoreflect.ProtoMessage
 		Imports   FileImports
 		Locations SourceLocations
 	}
+
+	FileEditionFeatures struct {
+		// IsFieldPresence is true if field_presence is EXPLICIT
+		// https://protobuf.dev/editions/features/#field_presence
+		IsFieldPresence bool
+		// IsOpenEnum is true if enum_type is OPEN
+		// https://protobuf.dev/editions/features/#enum_type
+		IsOpenEnum bool
+		// IsPacked is true if repeated_field_encoding is PACKED
+		// https://protobuf.dev/editions/features/#repeated_field_encoding
+		IsPacked bool
+		// IsUTF8Validated is true if utf_validation is VERIFY
+		// https://protobuf.dev/editions/features/#utf8_validation
+		IsUTF8Validated bool
+		// IsDelimitedEncoded is true if message_encoding is DELIMITED
+		// https://protobuf.dev/editions/features/#message_encoding
+		IsDelimitedEncoded bool
+		// IsJSONCompliant is true if json_format is ALLOW
+		// https://protobuf.dev/editions/features/#json_format
+		IsJSONCompliant bool
+	}
 )
 
 func (fd *File) ParentFile() protoreflect.FileDescriptor { return fd }
@@ -210,6 +249,9 @@ type (
 		ContainingOneof  protoreflect.OneofDescriptor // must be consistent with Message.Oneofs.Fields
 		Enum             protoreflect.EnumDescriptor
 		Message          protoreflect.MessageDescriptor
+
+		// Edition features.
+		Presence bool
 	}
 
 	Oneof struct {
@@ -273,6 +315,9 @@ func (fd *Field) HasJSONName() bool                     { return fd.L1.StringNam
 func (fd *Field) JSONName() string                      { return fd.L1.StringName.getJSON(fd) }
 func (fd *Field) TextName() string                      { return fd.L1.StringName.getText(fd) }
 func (fd *Field) HasPresence() bool {
+	if fd.L0.ParentFile.L1.Syntax == protoreflect.Editions {
+		return fd.L1.Presence || fd.L1.Message != nil || fd.L1.ContainingOneof != nil
+	}
 	return fd.L1.Cardinality != protoreflect.Repeated && (fd.L0.ParentFile.L1.Syntax == protoreflect.Proto2 || fd.L1.Message != nil || fd.L1.ContainingOneof != nil)
 }
 func (fd *Field) HasOptionalKeyword() bool {
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/desc_test.go b/vendor/google.golang.org/protobuf/internal/filedesc/desc_test.go
deleted file mode 100644
index 21919d1e33c..00000000000
--- a/vendor/google.golang.org/protobuf/internal/filedesc/desc_test.go
+++ /dev/null
@@ -1,850 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package filedesc_test
-
-import (
-	"fmt"
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/filedesc"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protodesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-
-	"google.golang.org/protobuf/types/descriptorpb"
-)
-
-func init() {
-	// Disable detrand to enable direct comparisons on outputs.
-	detrand.Disable()
-}
-
-// TODO: Test protodesc.NewFile with imported files.
-
-func TestFile(t *testing.T) {
-	f1 := &descriptorpb.FileDescriptorProto{
-		Syntax:  proto.String("proto2"),
-		Name:    proto.String("path/to/file.proto"),
-		Package: proto.String("test"),
-		Options: &descriptorpb.FileOptions{Deprecated: proto.Bool(true)},
-		MessageType: []*descriptorpb.DescriptorProto{{
-			Name: proto.String("A"),
-			Options: &descriptorpb.MessageOptions{
-				Deprecated: proto.Bool(true),
-			},
-		}, {
-			Name: proto.String("B"),
-			Field: []*descriptorpb.FieldDescriptorProto{{
-				Name:         proto.String("field_one"),
-				Number:       proto.Int32(1),
-				Label:        descriptorpb.FieldDescriptorProto_Label(protoreflect.Optional).Enum(),
-				Type:         descriptorpb.FieldDescriptorProto_Type(protoreflect.StringKind).Enum(),
-				DefaultValue: proto.String("hello, \"world!\"\n"),
-				OneofIndex:   proto.Int32(0),
-			}, {
-				Name:         proto.String("field_two"),
-				JsonName:     proto.String("Field2"),
-				Number:       proto.Int32(2),
-				Label:        descriptorpb.FieldDescriptorProto_Label(protoreflect.Optional).Enum(),
-				Type:         descriptorpb.FieldDescriptorProto_Type(protoreflect.EnumKind).Enum(),
-				DefaultValue: proto.String("BAR"),
-				TypeName:     proto.String(".test.E1"),
-				OneofIndex:   proto.Int32(1),
-			}, {
-				Name:       proto.String("field_three"),
-				Number:     proto.Int32(3),
-				Label:      descriptorpb.FieldDescriptorProto_Label(protoreflect.Optional).Enum(),
-				Type:       descriptorpb.FieldDescriptorProto_Type(protoreflect.MessageKind).Enum(),
-				TypeName:   proto.String(".test.C"),
-				OneofIndex: proto.Int32(1),
-			}, {
-				Name:     proto.String("field_four"),
-				JsonName: proto.String("Field4"),
-				Number:   proto.Int32(4),
-				Label:    descriptorpb.FieldDescriptorProto_Label(protoreflect.Repeated).Enum(),
-				Type:     descriptorpb.FieldDescriptorProto_Type(protoreflect.MessageKind).Enum(),
-				TypeName: proto.String(".test.B.FieldFourEntry"),
-			}, {
-				Name:    proto.String("field_five"),
-				Number:  proto.Int32(5),
-				Label:   descriptorpb.FieldDescriptorProto_Label(protoreflect.Repeated).Enum(),
-				Type:    descriptorpb.FieldDescriptorProto_Type(protoreflect.Int32Kind).Enum(),
-				Options: &descriptorpb.FieldOptions{Packed: proto.Bool(true)},
-			}, {
-				Name:   proto.String("field_six"),
-				Number: proto.Int32(6),
-				Label:  descriptorpb.FieldDescriptorProto_Label(protoreflect.Required).Enum(),
-				Type:   descriptorpb.FieldDescriptorProto_Type(protoreflect.BytesKind).Enum(),
-			}},
-			OneofDecl: []*descriptorpb.OneofDescriptorProto{
-				{
-					Name: proto.String("O1"),
-					Options: &descriptorpb.OneofOptions{
-						UninterpretedOption: []*descriptorpb.UninterpretedOption{
-							{StringValue: []byte("option")},
-						},
-					},
-				},
-				{Name: proto.String("O2")},
-			},
-			ReservedName: []string{"fizz", "buzz"},
-			ReservedRange: []*descriptorpb.DescriptorProto_ReservedRange{
-				{Start: proto.Int32(100), End: proto.Int32(200)},
-				{Start: proto.Int32(300), End: proto.Int32(301)},
-			},
-			ExtensionRange: []*descriptorpb.DescriptorProto_ExtensionRange{
-				{Start: proto.Int32(1000), End: proto.Int32(2000)},
-				{Start: proto.Int32(3000), End: proto.Int32(3001), Options: new(descriptorpb.ExtensionRangeOptions)},
-			},
-			NestedType: []*descriptorpb.DescriptorProto{{
-				Name: proto.String("FieldFourEntry"),
-				Field: []*descriptorpb.FieldDescriptorProto{{
-					Name:   proto.String("key"),
-					Number: proto.Int32(1),
-					Label:  descriptorpb.FieldDescriptorProto_Label(protoreflect.Optional).Enum(),
-					Type:   descriptorpb.FieldDescriptorProto_Type(protoreflect.StringKind).Enum(),
-				}, {
-					Name:     proto.String("value"),
-					Number:   proto.Int32(2),
-					Label:    descriptorpb.FieldDescriptorProto_Label(protoreflect.Optional).Enum(),
-					Type:     descriptorpb.FieldDescriptorProto_Type(protoreflect.MessageKind).Enum(),
-					TypeName: proto.String(".test.B"),
-				}},
-				Options: &descriptorpb.MessageOptions{
-					MapEntry: proto.Bool(true),
-				},
-			}},
-		}, {
-			Name: proto.String("C"),
-			NestedType: []*descriptorpb.DescriptorProto{{
-				Name: proto.String("A"),
-				Field: []*descriptorpb.FieldDescriptorProto{{
-					Name:         proto.String("F"),
-					Number:       proto.Int32(1),
-					Label:        descriptorpb.FieldDescriptorProto_Label(protoreflect.Required).Enum(),
-					Type:         descriptorpb.FieldDescriptorProto_Type(protoreflect.BytesKind).Enum(),
-					DefaultValue: proto.String(`dead\276\357`),
-				}},
-			}},
-			EnumType: []*descriptorpb.EnumDescriptorProto{{
-				Name: proto.String("E1"),
-				Value: []*descriptorpb.EnumValueDescriptorProto{
-					{Name: proto.String("FOO"), Number: proto.Int32(0)},
-					{Name: proto.String("BAR"), Number: proto.Int32(1)},
-				},
-			}},
-			Extension: []*descriptorpb.FieldDescriptorProto{{
-				Name:     proto.String("X"),
-				Number:   proto.Int32(1000),
-				Label:    descriptorpb.FieldDescriptorProto_Label(protoreflect.Repeated).Enum(),
-				Type:     descriptorpb.FieldDescriptorProto_Type(protoreflect.MessageKind).Enum(),
-				TypeName: proto.String(".test.C"),
-				Extendee: proto.String(".test.B"),
-			}},
-		}},
-		EnumType: []*descriptorpb.EnumDescriptorProto{{
-			Name:    proto.String("E1"),
-			Options: &descriptorpb.EnumOptions{Deprecated: proto.Bool(true)},
-			Value: []*descriptorpb.EnumValueDescriptorProto{
-				{
-					Name:    proto.String("FOO"),
-					Number:  proto.Int32(0),
-					Options: &descriptorpb.EnumValueOptions{Deprecated: proto.Bool(true)},
-				},
-				{Name: proto.String("BAR"), Number: proto.Int32(1)},
-			},
-			ReservedName: []string{"FIZZ", "BUZZ"},
-			ReservedRange: []*descriptorpb.EnumDescriptorProto_EnumReservedRange{
-				{Start: proto.Int32(10), End: proto.Int32(19)},
-				{Start: proto.Int32(30), End: proto.Int32(30)},
-			},
-		}},
-		Extension: []*descriptorpb.FieldDescriptorProto{{
-			Name:     proto.String("X"),
-			Number:   proto.Int32(1000),
-			Label:    descriptorpb.FieldDescriptorProto_Label(protoreflect.Repeated).Enum(),
-			Type:     descriptorpb.FieldDescriptorProto_Type(protoreflect.EnumKind).Enum(),
-			Options:  &descriptorpb.FieldOptions{Packed: proto.Bool(true)},
-			TypeName: proto.String(".test.E1"),
-			Extendee: proto.String(".test.B"),
-		}},
-		Service: []*descriptorpb.ServiceDescriptorProto{{
-			Name:    proto.String("S"),
-			Options: &descriptorpb.ServiceOptions{Deprecated: proto.Bool(true)},
-			Method: []*descriptorpb.MethodDescriptorProto{{
-				Name:            proto.String("M"),
-				InputType:       proto.String(".test.A"),
-				OutputType:      proto.String(".test.C.A"),
-				ClientStreaming: proto.Bool(true),
-				ServerStreaming: proto.Bool(true),
-				Options:         &descriptorpb.MethodOptions{Deprecated: proto.Bool(true)},
-			}},
-		}},
-	}
-	fd1, err := protodesc.NewFile(f1, nil)
-	if err != nil {
-		t.Fatalf("protodesc.NewFile() error: %v", err)
-	}
-
-	b, err := proto.Marshal(f1)
-	if err != nil {
-		t.Fatalf("proto.Marshal() error: %v", err)
-	}
-	fd2 := filedesc.Builder{RawDescriptor: b}.Build().File
-
-	tests := []struct {
-		name string
-		desc protoreflect.FileDescriptor
-	}{
-		{"protodesc.NewFile", fd1},
-		{"filedesc.Builder.Build", fd2},
-	}
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			// Run sub-tests in parallel to induce potential races.
-			for i := 0; i < 2; i++ {
-				t.Run("Accessors", func(t *testing.T) { t.Parallel(); testFileAccessors(t, tt.desc) })
-				t.Run("Format", func(t *testing.T) { t.Parallel(); testFileFormat(t, tt.desc) })
-			}
-		})
-	}
-}
-
-func testFileAccessors(t *testing.T, fd protoreflect.FileDescriptor) {
-	// Represent the descriptor as a map where each key is an accessor method
-	// and the value is either the wanted tail value or another accessor map.
-	type M = map[string]interface{}
-	want := M{
-		"Parent":        nil,
-		"Index":         0,
-		"Syntax":        protoreflect.Proto2,
-		"Name":          protoreflect.Name("test"),
-		"FullName":      protoreflect.FullName("test"),
-		"Path":          "path/to/file.proto",
-		"Package":       protoreflect.FullName("test"),
-		"IsPlaceholder": false,
-		"Options":       &descriptorpb.FileOptions{Deprecated: proto.Bool(true)},
-		"Messages": M{
-			"Len": 3,
-			"Get:0": M{
-				"Parent":        M{"FullName": protoreflect.FullName("test")},
-				"Index":         0,
-				"Syntax":        protoreflect.Proto2,
-				"Name":          protoreflect.Name("A"),
-				"FullName":      protoreflect.FullName("test.A"),
-				"IsPlaceholder": false,
-				"IsMapEntry":    false,
-				"Options": &descriptorpb.MessageOptions{
-					Deprecated: proto.Bool(true),
-				},
-				"Oneofs":          M{"Len": 0},
-				"RequiredNumbers": M{"Len": 0},
-				"ExtensionRanges": M{"Len": 0},
-				"Messages":        M{"Len": 0},
-				"Enums":           M{"Len": 0},
-				"Extensions":      M{"Len": 0},
-			},
-			"ByName:B": M{
-				"Name":  protoreflect.Name("B"),
-				"Index": 1,
-				"Fields": M{
-					"Len":                  6,
-					"ByJSONName:field_one": nil,
-					"ByJSONName:fieldOne": M{
-						"Name":              protoreflect.Name("field_one"),
-						"Index":             0,
-						"JSONName":          "fieldOne",
-						"Default":           "hello, \"world!\"\n",
-						"ContainingOneof":   M{"Name": protoreflect.Name("O1"), "IsPlaceholder": false},
-						"ContainingMessage": M{"FullName": protoreflect.FullName("test.B")},
-					},
-					"ByJSONName:fieldTwo": nil,
-					"ByJSONName:Field2": M{
-						"Name":            protoreflect.Name("field_two"),
-						"Index":           1,
-						"HasJSONName":     true,
-						"JSONName":        "Field2",
-						"Default":         protoreflect.EnumNumber(1),
-						"ContainingOneof": M{"Name": protoreflect.Name("O2"), "IsPlaceholder": false},
-					},
-					"ByName:fieldThree": nil,
-					"ByName:field_three": M{
-						"IsExtension":       false,
-						"IsMap":             false,
-						"MapKey":            nil,
-						"MapValue":          nil,
-						"Message":           M{"FullName": protoreflect.FullName("test.C"), "IsPlaceholder": false},
-						"ContainingOneof":   M{"Name": protoreflect.Name("O2"), "IsPlaceholder": false},
-						"ContainingMessage": M{"FullName": protoreflect.FullName("test.B")},
-					},
-					"ByNumber:12": nil,
-					"ByNumber:4": M{
-						"Cardinality": protoreflect.Repeated,
-						"IsExtension": false,
-						"IsList":      false,
-						"IsMap":       true,
-						"MapKey":      M{"Kind": protoreflect.StringKind},
-						"MapValue":    M{"Kind": protoreflect.MessageKind, "Message": M{"FullName": protoreflect.FullName("test.B")}},
-						"Default":     nil,
-						"Message":     M{"FullName": protoreflect.FullName("test.B.FieldFourEntry"), "IsPlaceholder": false},
-					},
-					"ByNumber:5": M{
-						"Cardinality": protoreflect.Repeated,
-						"Kind":        protoreflect.Int32Kind,
-						"IsPacked":    true,
-						"IsList":      true,
-						"IsMap":       false,
-						"Default":     nil,
-					},
-					"ByNumber:6": M{
-						"Cardinality":     protoreflect.Required,
-						"Default":         []byte(nil),
-						"ContainingOneof": nil,
-					},
-				},
-				"Oneofs": M{
-					"Len":       2,
-					"ByName:O0": nil,
-					"ByName:O1": M{
-						"FullName": protoreflect.FullName("test.B.O1"),
-						"Index":    0,
-						"Options": &descriptorpb.OneofOptions{
-							UninterpretedOption: []*descriptorpb.UninterpretedOption{
-								{StringValue: []byte("option")},
-							},
-						},
-						"Fields": M{
-							"Len":   1,
-							"Get:0": M{"FullName": protoreflect.FullName("test.B.field_one")},
-						},
-					},
-					"Get:1": M{
-						"FullName": protoreflect.FullName("test.B.O2"),
-						"Index":    1,
-						"Fields": M{
-							"Len":              2,
-							"ByName:field_two": M{"Name": protoreflect.Name("field_two")},
-							"Get:1":            M{"Name": protoreflect.Name("field_three")},
-						},
-					},
-				},
-				"ReservedNames": M{
-					"Len":         2,
-					"Get:0":       protoreflect.Name("fizz"),
-					"Has:buzz":    true,
-					"Has:noexist": false,
-				},
-				"ReservedRanges": M{
-					"Len":     2,
-					"Get:0":   [2]protoreflect.FieldNumber{100, 200},
-					"Has:99":  false,
-					"Has:100": true,
-					"Has:150": true,
-					"Has:199": true,
-					"Has:200": false,
-					"Has:300": true,
-					"Has:301": false,
-				},
-				"RequiredNumbers": M{
-					"Len":   1,
-					"Get:0": protoreflect.FieldNumber(6),
-					"Has:1": false,
-					"Has:6": true,
-				},
-				"ExtensionRanges": M{
-					"Len":      2,
-					"Get:0":    [2]protoreflect.FieldNumber{1000, 2000},
-					"Has:999":  false,
-					"Has:1000": true,
-					"Has:1500": true,
-					"Has:1999": true,
-					"Has:2000": false,
-					"Has:3000": true,
-					"Has:3001": false,
-				},
-				"ExtensionRangeOptions:0": (*descriptorpb.ExtensionRangeOptions)(nil),
-				"ExtensionRangeOptions:1": new(descriptorpb.ExtensionRangeOptions),
-				"Messages": M{
-					"Get:0": M{
-						"Fields": M{
-							"Len": 2,
-							"ByNumber:1": M{
-								"Parent":            M{"FullName": protoreflect.FullName("test.B.FieldFourEntry")},
-								"Index":             0,
-								"Name":              protoreflect.Name("key"),
-								"FullName":          protoreflect.FullName("test.B.FieldFourEntry.key"),
-								"Number":            protoreflect.FieldNumber(1),
-								"Cardinality":       protoreflect.Optional,
-								"Kind":              protoreflect.StringKind,
-								"Options":           (*descriptorpb.FieldOptions)(nil),
-								"HasJSONName":       false,
-								"JSONName":          "key",
-								"IsPacked":          false,
-								"IsList":            false,
-								"IsMap":             false,
-								"IsExtension":       false,
-								"IsWeak":            false,
-								"Default":           "",
-								"ContainingOneof":   nil,
-								"ContainingMessage": M{"FullName": protoreflect.FullName("test.B.FieldFourEntry")},
-								"Message":           nil,
-								"Enum":              nil,
-							},
-							"ByNumber:2": M{
-								"Parent":            M{"FullName": protoreflect.FullName("test.B.FieldFourEntry")},
-								"Index":             1,
-								"Name":              protoreflect.Name("value"),
-								"FullName":          protoreflect.FullName("test.B.FieldFourEntry.value"),
-								"Number":            protoreflect.FieldNumber(2),
-								"Cardinality":       protoreflect.Optional,
-								"Kind":              protoreflect.MessageKind,
-								"JSONName":          "value",
-								"IsPacked":          false,
-								"IsList":            false,
-								"IsMap":             false,
-								"IsExtension":       false,
-								"IsWeak":            false,
-								"Default":           nil,
-								"ContainingOneof":   nil,
-								"ContainingMessage": M{"FullName": protoreflect.FullName("test.B.FieldFourEntry")},
-								"Message":           M{"FullName": protoreflect.FullName("test.B"), "IsPlaceholder": false},
-								"Enum":              nil,
-							},
-							"ByNumber:3": nil,
-						},
-					},
-				},
-			},
-			"Get:2": M{
-				"Name":  protoreflect.Name("C"),
-				"Index": 2,
-				"Messages": M{
-					"Len":   1,
-					"Get:0": M{"FullName": protoreflect.FullName("test.C.A")},
-				},
-				"Enums": M{
-					"Len":   1,
-					"Get:0": M{"FullName": protoreflect.FullName("test.C.E1")},
-				},
-				"Extensions": M{
-					"Len":   1,
-					"Get:0": M{"FullName": protoreflect.FullName("test.C.X")},
-				},
-			},
-		},
-		"Enums": M{
-			"Len": 1,
-			"Get:0": M{
-				"Name":    protoreflect.Name("E1"),
-				"Options": &descriptorpb.EnumOptions{Deprecated: proto.Bool(true)},
-				"Values": M{
-					"Len":        2,
-					"ByName:Foo": nil,
-					"ByName:FOO": M{
-						"FullName": protoreflect.FullName("test.FOO"),
-						"Options":  &descriptorpb.EnumValueOptions{Deprecated: proto.Bool(true)},
-					},
-					"ByNumber:2": nil,
-					"ByNumber:1": M{"FullName": protoreflect.FullName("test.BAR")},
-				},
-				"ReservedNames": M{
-					"Len":         2,
-					"Get:0":       protoreflect.Name("FIZZ"),
-					"Has:BUZZ":    true,
-					"Has:NOEXIST": false,
-				},
-				"ReservedRanges": M{
-					"Len":    2,
-					"Get:0":  [2]protoreflect.EnumNumber{10, 19},
-					"Has:9":  false,
-					"Has:10": true,
-					"Has:15": true,
-					"Has:19": true,
-					"Has:20": false,
-					"Has:30": true,
-					"Has:31": false,
-				},
-			},
-		},
-		"Extensions": M{
-			"Len": 1,
-			"ByName:X": M{
-				"Name":              protoreflect.Name("X"),
-				"Number":            protoreflect.FieldNumber(1000),
-				"Cardinality":       protoreflect.Repeated,
-				"Kind":              protoreflect.EnumKind,
-				"IsExtension":       true,
-				"IsPacked":          true,
-				"IsList":            true,
-				"IsMap":             false,
-				"MapKey":            nil,
-				"MapValue":          nil,
-				"ContainingOneof":   nil,
-				"ContainingMessage": M{"FullName": protoreflect.FullName("test.B"), "IsPlaceholder": false},
-				"Enum":              M{"FullName": protoreflect.FullName("test.E1"), "IsPlaceholder": false},
-				"Options":           &descriptorpb.FieldOptions{Packed: proto.Bool(true)},
-			},
-		},
-		"Services": M{
-			"Len":      1,
-			"ByName:s": nil,
-			"ByName:S": M{
-				"Parent":   M{"FullName": protoreflect.FullName("test")},
-				"Name":     protoreflect.Name("S"),
-				"FullName": protoreflect.FullName("test.S"),
-				"Options":  &descriptorpb.ServiceOptions{Deprecated: proto.Bool(true)},
-				"Methods": M{
-					"Len": 1,
-					"Get:0": M{
-						"Parent":            M{"FullName": protoreflect.FullName("test.S")},
-						"Name":              protoreflect.Name("M"),
-						"FullName":          protoreflect.FullName("test.S.M"),
-						"Input":             M{"FullName": protoreflect.FullName("test.A"), "IsPlaceholder": false},
-						"Output":            M{"FullName": protoreflect.FullName("test.C.A"), "IsPlaceholder": false},
-						"IsStreamingClient": true,
-						"IsStreamingServer": true,
-						"Options":           &descriptorpb.MethodOptions{Deprecated: proto.Bool(true)},
-					},
-				},
-			},
-		},
-	}
-	checkAccessors(t, "", reflect.ValueOf(fd), want)
-}
-func checkAccessors(t *testing.T, p string, rv reflect.Value, want map[string]interface{}) {
-	p0 := p
-	defer func() {
-		if ex := recover(); ex != nil {
-			t.Errorf("panic at %v: %v", p, ex)
-		}
-	}()
-
-	if rv.Interface() == nil {
-		t.Errorf("%v is nil, want non-nil", p)
-		return
-	}
-	for s, v := range want {
-		// Call the accessor method.
-		p = p0 + "." + s
-		var rets []reflect.Value
-		if i := strings.IndexByte(s, ':'); i >= 0 {
-			// Accessor method takes in a single argument, which is encoded
-			// after the accessor name, separated by a ':' delimiter.
-			fnc := rv.MethodByName(s[:i])
-			arg := reflect.New(fnc.Type().In(0)).Elem()
-			s = s[i+len(":"):]
-			switch arg.Kind() {
-			case reflect.String:
-				arg.SetString(s)
-			case reflect.Int32, reflect.Int:
-				n, _ := strconv.ParseInt(s, 0, 64)
-				arg.SetInt(n)
-			}
-			rets = fnc.Call([]reflect.Value{arg})
-		} else {
-			rets = rv.MethodByName(s).Call(nil)
-		}
-
-		// Check that (val, ok) pattern is internally consistent.
-		if len(rets) == 2 {
-			if rets[0].IsNil() && rets[1].Bool() {
-				t.Errorf("%v = (nil, true), want (nil, false)", p)
-			}
-			if !rets[0].IsNil() && !rets[1].Bool() {
-				t.Errorf("%v = (non-nil, false), want (non-nil, true)", p)
-			}
-		}
-
-		// Check that the accessor output matches.
-		if want, ok := v.(map[string]interface{}); ok {
-			checkAccessors(t, p, rets[0], want)
-			continue
-		}
-
-		got := rets[0].Interface()
-		if pv, ok := got.(protoreflect.Value); ok {
-			got = pv.Interface()
-		}
-
-		// Compare with proto.Equal if possible.
-		gotMsg, gotMsgOK := got.(proto.Message)
-		wantMsg, wantMsgOK := v.(proto.Message)
-		if gotMsgOK && wantMsgOK {
-			gotNil := reflect.ValueOf(gotMsg).IsNil()
-			wantNil := reflect.ValueOf(wantMsg).IsNil()
-			switch {
-			case !gotNil && wantNil:
-				t.Errorf("%v = non-nil, want nil", p)
-			case gotNil && !wantNil:
-				t.Errorf("%v = nil, want non-nil", p)
-			case !proto.Equal(gotMsg, wantMsg):
-				t.Errorf("%v = %v, want %v", p, gotMsg, wantMsg)
-			}
-			continue
-		}
-
-		if want := v; !reflect.DeepEqual(got, want) {
-			t.Errorf("%v = %T(%v), want %T(%v)", p, got, got, want, want)
-		}
-	}
-}
-
-func testFileFormat(t *testing.T, fd protoreflect.FileDescriptor) {
-	const wantFileDescriptor = `FileDescriptor{
-	Syntax:  proto2
-	Path:    "path/to/file.proto"
-	Package: test
-	Messages: [{
-		Name: A
-	}, {
-		Name: B
-		Fields: [{
-			Name:        field_one
-			Number:      1
-			Cardinality: optional
-			Kind:        string
-			JSONName:    "fieldOne"
-			HasPresence: true
-			HasDefault:  true
-			Default:     "hello, \"world!\"\n"
-			Oneof:       O1
-		}, {
-			Name:        field_two
-			Number:      2
-			Cardinality: optional
-			Kind:        enum
-			HasJSONName: true
-			JSONName:    "Field2"
-			HasPresence: true
-			HasDefault:  true
-			Default:     1
-			Oneof:       O2
-			Enum:        test.E1
-		}, {
-			Name:        field_three
-			Number:      3
-			Cardinality: optional
-			Kind:        message
-			JSONName:    "fieldThree"
-			HasPresence: true
-			Oneof:       O2
-			Message:     test.C
-		}, {
-			Name:        field_four
-			Number:      4
-			Cardinality: repeated
-			Kind:        message
-			HasJSONName: true
-			JSONName:    "Field4"
-			IsMap:       true
-			MapKey:      string
-			MapValue:    test.B
-		}, {
-			Name:        field_five
-			Number:      5
-			Cardinality: repeated
-			Kind:        int32
-			JSONName:    "fieldFive"
-			IsPacked:    true
-			IsList:      true
-		}, {
-			Name:        field_six
-			Number:      6
-			Cardinality: required
-			Kind:        bytes
-			JSONName:    "fieldSix"
-			HasPresence: true
-		}]
-		Oneofs: [{
-			Name:   O1
-			Fields: [field_one]
-		}, {
-			Name:   O2
-			Fields: [field_two, field_three]
-		}]
-		ReservedNames:   [fizz, buzz]
-		ReservedRanges:  [100:200, 300]
-		RequiredNumbers: [6]
-		ExtensionRanges: [1000:2000, 3000]
-		Messages: [{
-			Name:       FieldFourEntry
-			IsMapEntry: true
-			Fields: [{
-				Name:        key
-				Number:      1
-				Cardinality: optional
-				Kind:        string
-				JSONName:    "key"
-				HasPresence: true
-			}, {
-				Name:        value
-				Number:      2
-				Cardinality: optional
-				Kind:        message
-				JSONName:    "value"
-				HasPresence: true
-				Message:     test.B
-			}]
-		}]
-	}, {
-		Name: C
-		Messages: [{
-			Name: A
-			Fields: [{
-				Name:        F
-				Number:      1
-				Cardinality: required
-				Kind:        bytes
-				JSONName:    "F"
-				HasPresence: true
-				HasDefault:  true
-				Default:     "dead\xbe\xef"
-			}]
-			RequiredNumbers: [1]
-		}]
-		Enums: [{
-			Name: E1
-			Values: [
-				{Name: FOO}
-				{Name: BAR, Number: 1}
-			]
-		}]
-		Extensions: [{
-			Name:        X
-			Number:      1000
-			Cardinality: repeated
-			Kind:        message
-			JSONName:    "[test.C.X]"
-			IsExtension: true
-			IsList:      true
-			Extendee:    test.B
-			Message:     test.C
-		}]
-	}]
-	Enums: [{
-		Name: E1
-		Values: [
-			{Name: FOO}
-			{Name: BAR, Number: 1}
-		]
-		ReservedNames:  [FIZZ, BUZZ]
-		ReservedRanges: [10:20, 30]
-	}]
-	Extensions: [{
-		Name:        X
-		Number:      1000
-		Cardinality: repeated
-		Kind:        enum
-		JSONName:    "[test.X]"
-		IsExtension: true
-		IsPacked:    true
-		IsList:      true
-		Extendee:    test.B
-		Enum:        test.E1
-	}]
-	Services: [{
-		Name: S
-		Methods: [{
-			Name:              M
-			Input:             test.A
-			Output:            test.C.A
-			IsStreamingClient: true
-			IsStreamingServer: true
-		}]
-	}]
-}`
-
-	const wantEnums = `Enums{{
-	Name: E1
-	Values: [
-		{Name: FOO}
-		{Name: BAR, Number: 1}
-	]
-	ReservedNames:  [FIZZ, BUZZ]
-	ReservedRanges: [10:20, 30]
-}}`
-
-	const wantExtensions = `Extensions{{
-	Name:        X
-	Number:      1000
-	Cardinality: repeated
-	Kind:        enum
-	JSONName:    "[test.X]"
-	IsExtension: true
-	IsPacked:    true
-	IsList:      true
-	Extendee:    test.B
-	Enum:        test.E1
-}}`
-
-	const wantImports = `FileImports{}`
-
-	const wantReservedNames = "Names{fizz, buzz}"
-
-	const wantReservedRanges = "FieldRanges{100:200, 300}"
-
-	const wantServices = `Services{{
-	Name: S
-	Methods: [{
-		Name:              M
-		Input:             test.A
-		Output:            test.C.A
-		IsStreamingClient: true
-		IsStreamingServer: true
-	}]
-}}`
-
-	tests := []struct {
-		path string
-		fmt  string
-		want string
-		val  interface{}
-	}{
-		{"fd", "%v", compactMultiFormat(wantFileDescriptor), fd},
-		{"fd", "%+v", wantFileDescriptor, fd},
-		{"fd.Enums()", "%v", compactMultiFormat(wantEnums), fd.Enums()},
-		{"fd.Enums()", "%+v", wantEnums, fd.Enums()},
-		{"fd.Extensions()", "%v", compactMultiFormat(wantExtensions), fd.Extensions()},
-		{"fd.Extensions()", "%+v", wantExtensions, fd.Extensions()},
-		{"fd.Imports()", "%v", compactMultiFormat(wantImports), fd.Imports()},
-		{"fd.Imports()", "%+v", wantImports, fd.Imports()},
-		{"fd.Messages(B).ReservedNames()", "%v", compactMultiFormat(wantReservedNames), fd.Messages().ByName("B").ReservedNames()},
-		{"fd.Messages(B).ReservedNames()", "%+v", wantReservedNames, fd.Messages().ByName("B").ReservedNames()},
-		{"fd.Messages(B).ReservedRanges()", "%v", compactMultiFormat(wantReservedRanges), fd.Messages().ByName("B").ReservedRanges()},
-		{"fd.Messages(B).ReservedRanges()", "%+v", wantReservedRanges, fd.Messages().ByName("B").ReservedRanges()},
-		{"fd.Services()", "%v", compactMultiFormat(wantServices), fd.Services()},
-		{"fd.Services()", "%+v", wantServices, fd.Services()},
-	}
-	for _, tt := range tests {
-		got := fmt.Sprintf(tt.fmt, tt.val)
-		if diff := cmp.Diff(got, tt.want); diff != "" {
-			t.Errorf("fmt.Sprintf(%q, %s) mismatch (-got +want):\n%s", tt.fmt, tt.path, diff)
-		}
-	}
-}
-
-// compactMultiFormat returns the single line form of a multi line output.
-func compactMultiFormat(s string) string {
-	var b []byte
-	for _, s := range strings.Split(s, "\n") {
-		s = strings.TrimSpace(s)
-		s = regexp.MustCompile(": +").ReplaceAllString(s, ": ")
-		prevWord := len(b) > 0 && b[len(b)-1] != '[' && b[len(b)-1] != '{'
-		nextWord := len(s) > 0 && s[0] != ']' && s[0] != '}'
-		if prevWord && nextWord {
-			b = append(b, ", "...)
-		}
-		b = append(b, s...)
-	}
-	return string(b)
-}
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/filedesc/gotest/ya.make
deleted file mode 100644
index bba40722a24..00000000000
--- a/vendor/google.golang.org/protobuf/internal/filedesc/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/filedesc)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/ya.make b/vendor/google.golang.org/protobuf/internal/filedesc/ya.make
index 9deb58bad38..561a28ef2df 100644
--- a/vendor/google.golang.org/protobuf/internal/filedesc/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/filedesc/ya.make
@@ -12,11 +12,4 @@ SRCS(
     placeholder.go
 )
 
-GO_XTEST_SRCS(
-    build_test.go
-    desc_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/filetype/ya.make b/vendor/google.golang.org/protobuf/internal/filetype/ya.make
index 4506aaa671c..e0fc61c11b5 100644
--- a/vendor/google.golang.org/protobuf/internal/filetype/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/filetype/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(build.go)
+SRCS(
+    build.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go b/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
index 136f1b21573..8f94230ea1c 100644
--- a/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
+++ b/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
@@ -12,6 +12,12 @@ import (
 
 const File_google_protobuf_descriptor_proto = "google/protobuf/descriptor.proto"
 
+// Full and short names for google.protobuf.Edition.
+const (
+	Edition_enum_fullname = "google.protobuf.Edition"
+	Edition_enum_name     = "Edition"
+)
+
 // Names for google.protobuf.FileDescriptorSet.
 const (
 	FileDescriptorSet_message_name     protoreflect.Name     = "FileDescriptorSet"
@@ -81,7 +87,7 @@ const (
 	FileDescriptorProto_Options_field_number          protoreflect.FieldNumber = 8
 	FileDescriptorProto_SourceCodeInfo_field_number   protoreflect.FieldNumber = 9
 	FileDescriptorProto_Syntax_field_number           protoreflect.FieldNumber = 12
-	FileDescriptorProto_Edition_field_number          protoreflect.FieldNumber = 13
+	FileDescriptorProto_Edition_field_number          protoreflect.FieldNumber = 14
 )
 
 // Names for google.protobuf.DescriptorProto.
@@ -184,10 +190,12 @@ const (
 const (
 	ExtensionRangeOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 	ExtensionRangeOptions_Declaration_field_name         protoreflect.Name = "declaration"
+	ExtensionRangeOptions_Features_field_name            protoreflect.Name = "features"
 	ExtensionRangeOptions_Verification_field_name        protoreflect.Name = "verification"
 
 	ExtensionRangeOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.uninterpreted_option"
 	ExtensionRangeOptions_Declaration_field_fullname         protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.declaration"
+	ExtensionRangeOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.features"
 	ExtensionRangeOptions_Verification_field_fullname        protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.verification"
 )
 
@@ -195,6 +203,7 @@ const (
 const (
 	ExtensionRangeOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 	ExtensionRangeOptions_Declaration_field_number         protoreflect.FieldNumber = 2
+	ExtensionRangeOptions_Features_field_number            protoreflect.FieldNumber = 50
 	ExtensionRangeOptions_Verification_field_number        protoreflect.FieldNumber = 3
 )
 
@@ -212,29 +221,26 @@ const (
 
 // Field names for google.protobuf.ExtensionRangeOptions.Declaration.
 const (
-	ExtensionRangeOptions_Declaration_Number_field_name     protoreflect.Name = "number"
-	ExtensionRangeOptions_Declaration_FullName_field_name   protoreflect.Name = "full_name"
-	ExtensionRangeOptions_Declaration_Type_field_name       protoreflect.Name = "type"
-	ExtensionRangeOptions_Declaration_IsRepeated_field_name protoreflect.Name = "is_repeated"
-	ExtensionRangeOptions_Declaration_Reserved_field_name   protoreflect.Name = "reserved"
-	ExtensionRangeOptions_Declaration_Repeated_field_name   protoreflect.Name = "repeated"
+	ExtensionRangeOptions_Declaration_Number_field_name   protoreflect.Name = "number"
+	ExtensionRangeOptions_Declaration_FullName_field_name protoreflect.Name = "full_name"
+	ExtensionRangeOptions_Declaration_Type_field_name     protoreflect.Name = "type"
+	ExtensionRangeOptions_Declaration_Reserved_field_name protoreflect.Name = "reserved"
+	ExtensionRangeOptions_Declaration_Repeated_field_name protoreflect.Name = "repeated"
 
-	ExtensionRangeOptions_Declaration_Number_field_fullname     protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.number"
-	ExtensionRangeOptions_Declaration_FullName_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.full_name"
-	ExtensionRangeOptions_Declaration_Type_field_fullname       protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.type"
-	ExtensionRangeOptions_Declaration_IsRepeated_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.is_repeated"
-	ExtensionRangeOptions_Declaration_Reserved_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.reserved"
-	ExtensionRangeOptions_Declaration_Repeated_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.repeated"
+	ExtensionRangeOptions_Declaration_Number_field_fullname   protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.number"
+	ExtensionRangeOptions_Declaration_FullName_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.full_name"
+	ExtensionRangeOptions_Declaration_Type_field_fullname     protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.type"
+	ExtensionRangeOptions_Declaration_Reserved_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.reserved"
+	ExtensionRangeOptions_Declaration_Repeated_field_fullname protoreflect.FullName = "google.protobuf.ExtensionRangeOptions.Declaration.repeated"
 )
 
 // Field numbers for google.protobuf.ExtensionRangeOptions.Declaration.
 const (
-	ExtensionRangeOptions_Declaration_Number_field_number     protoreflect.FieldNumber = 1
-	ExtensionRangeOptions_Declaration_FullName_field_number   protoreflect.FieldNumber = 2
-	ExtensionRangeOptions_Declaration_Type_field_number       protoreflect.FieldNumber = 3
-	ExtensionRangeOptions_Declaration_IsRepeated_field_number protoreflect.FieldNumber = 4
-	ExtensionRangeOptions_Declaration_Reserved_field_number   protoreflect.FieldNumber = 5
-	ExtensionRangeOptions_Declaration_Repeated_field_number   protoreflect.FieldNumber = 6
+	ExtensionRangeOptions_Declaration_Number_field_number   protoreflect.FieldNumber = 1
+	ExtensionRangeOptions_Declaration_FullName_field_number protoreflect.FieldNumber = 2
+	ExtensionRangeOptions_Declaration_Type_field_number     protoreflect.FieldNumber = 3
+	ExtensionRangeOptions_Declaration_Reserved_field_number protoreflect.FieldNumber = 5
+	ExtensionRangeOptions_Declaration_Repeated_field_number protoreflect.FieldNumber = 6
 )
 
 // Names for google.protobuf.FieldDescriptorProto.
@@ -478,6 +484,7 @@ const (
 	FileOptions_PhpNamespace_field_name              protoreflect.Name = "php_namespace"
 	FileOptions_PhpMetadataNamespace_field_name      protoreflect.Name = "php_metadata_namespace"
 	FileOptions_RubyPackage_field_name               protoreflect.Name = "ruby_package"
+	FileOptions_Features_field_name                  protoreflect.Name = "features"
 	FileOptions_UninterpretedOption_field_name       protoreflect.Name = "uninterpreted_option"
 
 	FileOptions_JavaPackage_field_fullname               protoreflect.FullName = "google.protobuf.FileOptions.java_package"
@@ -500,6 +507,7 @@ const (
 	FileOptions_PhpNamespace_field_fullname              protoreflect.FullName = "google.protobuf.FileOptions.php_namespace"
 	FileOptions_PhpMetadataNamespace_field_fullname      protoreflect.FullName = "google.protobuf.FileOptions.php_metadata_namespace"
 	FileOptions_RubyPackage_field_fullname               protoreflect.FullName = "google.protobuf.FileOptions.ruby_package"
+	FileOptions_Features_field_fullname                  protoreflect.FullName = "google.protobuf.FileOptions.features"
 	FileOptions_UninterpretedOption_field_fullname       protoreflect.FullName = "google.protobuf.FileOptions.uninterpreted_option"
 )
 
@@ -525,6 +533,7 @@ const (
 	FileOptions_PhpNamespace_field_number              protoreflect.FieldNumber = 41
 	FileOptions_PhpMetadataNamespace_field_number      protoreflect.FieldNumber = 44
 	FileOptions_RubyPackage_field_number               protoreflect.FieldNumber = 45
+	FileOptions_Features_field_number                  protoreflect.FieldNumber = 50
 	FileOptions_UninterpretedOption_field_number       protoreflect.FieldNumber = 999
 )
 
@@ -547,6 +556,7 @@ const (
 	MessageOptions_Deprecated_field_name                         protoreflect.Name = "deprecated"
 	MessageOptions_MapEntry_field_name                           protoreflect.Name = "map_entry"
 	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_name protoreflect.Name = "deprecated_legacy_json_field_conflicts"
+	MessageOptions_Features_field_name                           protoreflect.Name = "features"
 	MessageOptions_UninterpretedOption_field_name                protoreflect.Name = "uninterpreted_option"
 
 	MessageOptions_MessageSetWireFormat_field_fullname               protoreflect.FullName = "google.protobuf.MessageOptions.message_set_wire_format"
@@ -554,6 +564,7 @@ const (
 	MessageOptions_Deprecated_field_fullname                         protoreflect.FullName = "google.protobuf.MessageOptions.deprecated"
 	MessageOptions_MapEntry_field_fullname                           protoreflect.FullName = "google.protobuf.MessageOptions.map_entry"
 	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_fullname protoreflect.FullName = "google.protobuf.MessageOptions.deprecated_legacy_json_field_conflicts"
+	MessageOptions_Features_field_fullname                           protoreflect.FullName = "google.protobuf.MessageOptions.features"
 	MessageOptions_UninterpretedOption_field_fullname                protoreflect.FullName = "google.protobuf.MessageOptions.uninterpreted_option"
 )
 
@@ -564,6 +575,7 @@ const (
 	MessageOptions_Deprecated_field_number                         protoreflect.FieldNumber = 3
 	MessageOptions_MapEntry_field_number                           protoreflect.FieldNumber = 7
 	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_number protoreflect.FieldNumber = 11
+	MessageOptions_Features_field_number                           protoreflect.FieldNumber = 12
 	MessageOptions_UninterpretedOption_field_number                protoreflect.FieldNumber = 999
 )
 
@@ -584,8 +596,9 @@ const (
 	FieldOptions_Weak_field_name                protoreflect.Name = "weak"
 	FieldOptions_DebugRedact_field_name         protoreflect.Name = "debug_redact"
 	FieldOptions_Retention_field_name           protoreflect.Name = "retention"
-	FieldOptions_Target_field_name              protoreflect.Name = "target"
 	FieldOptions_Targets_field_name             protoreflect.Name = "targets"
+	FieldOptions_EditionDefaults_field_name     protoreflect.Name = "edition_defaults"
+	FieldOptions_Features_field_name            protoreflect.Name = "features"
 	FieldOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
 	FieldOptions_Ctype_field_fullname               protoreflect.FullName = "google.protobuf.FieldOptions.ctype"
@@ -597,8 +610,9 @@ const (
 	FieldOptions_Weak_field_fullname                protoreflect.FullName = "google.protobuf.FieldOptions.weak"
 	FieldOptions_DebugRedact_field_fullname         protoreflect.FullName = "google.protobuf.FieldOptions.debug_redact"
 	FieldOptions_Retention_field_fullname           protoreflect.FullName = "google.protobuf.FieldOptions.retention"
-	FieldOptions_Target_field_fullname              protoreflect.FullName = "google.protobuf.FieldOptions.target"
 	FieldOptions_Targets_field_fullname             protoreflect.FullName = "google.protobuf.FieldOptions.targets"
+	FieldOptions_EditionDefaults_field_fullname     protoreflect.FullName = "google.protobuf.FieldOptions.edition_defaults"
+	FieldOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.FieldOptions.features"
 	FieldOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.uninterpreted_option"
 )
 
@@ -613,8 +627,9 @@ const (
 	FieldOptions_Weak_field_number                protoreflect.FieldNumber = 10
 	FieldOptions_DebugRedact_field_number         protoreflect.FieldNumber = 16
 	FieldOptions_Retention_field_number           protoreflect.FieldNumber = 17
-	FieldOptions_Target_field_number              protoreflect.FieldNumber = 18
 	FieldOptions_Targets_field_number             protoreflect.FieldNumber = 19
+	FieldOptions_EditionDefaults_field_number     protoreflect.FieldNumber = 20
+	FieldOptions_Features_field_number            protoreflect.FieldNumber = 21
 	FieldOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
@@ -642,6 +657,27 @@ const (
 	FieldOptions_OptionTargetType_enum_name     = "OptionTargetType"
 )
 
+// Names for google.protobuf.FieldOptions.EditionDefault.
+const (
+	FieldOptions_EditionDefault_message_name     protoreflect.Name     = "EditionDefault"
+	FieldOptions_EditionDefault_message_fullname protoreflect.FullName = "google.protobuf.FieldOptions.EditionDefault"
+)
+
+// Field names for google.protobuf.FieldOptions.EditionDefault.
+const (
+	FieldOptions_EditionDefault_Edition_field_name protoreflect.Name = "edition"
+	FieldOptions_EditionDefault_Value_field_name   protoreflect.Name = "value"
+
+	FieldOptions_EditionDefault_Edition_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.EditionDefault.edition"
+	FieldOptions_EditionDefault_Value_field_fullname   protoreflect.FullName = "google.protobuf.FieldOptions.EditionDefault.value"
+)
+
+// Field numbers for google.protobuf.FieldOptions.EditionDefault.
+const (
+	FieldOptions_EditionDefault_Edition_field_number protoreflect.FieldNumber = 3
+	FieldOptions_EditionDefault_Value_field_number   protoreflect.FieldNumber = 2
+)
+
 // Names for google.protobuf.OneofOptions.
 const (
 	OneofOptions_message_name     protoreflect.Name     = "OneofOptions"
@@ -650,13 +686,16 @@ const (
 
 // Field names for google.protobuf.OneofOptions.
 const (
+	OneofOptions_Features_field_name            protoreflect.Name = "features"
 	OneofOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
+	OneofOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.OneofOptions.features"
 	OneofOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.OneofOptions.uninterpreted_option"
 )
 
 // Field numbers for google.protobuf.OneofOptions.
 const (
+	OneofOptions_Features_field_number            protoreflect.FieldNumber = 1
 	OneofOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
@@ -671,11 +710,13 @@ const (
 	EnumOptions_AllowAlias_field_name                         protoreflect.Name = "allow_alias"
 	EnumOptions_Deprecated_field_name                         protoreflect.Name = "deprecated"
 	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_name protoreflect.Name = "deprecated_legacy_json_field_conflicts"
+	EnumOptions_Features_field_name                           protoreflect.Name = "features"
 	EnumOptions_UninterpretedOption_field_name                protoreflect.Name = "uninterpreted_option"
 
 	EnumOptions_AllowAlias_field_fullname                         protoreflect.FullName = "google.protobuf.EnumOptions.allow_alias"
 	EnumOptions_Deprecated_field_fullname                         protoreflect.FullName = "google.protobuf.EnumOptions.deprecated"
 	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_fullname protoreflect.FullName = "google.protobuf.EnumOptions.deprecated_legacy_json_field_conflicts"
+	EnumOptions_Features_field_fullname                           protoreflect.FullName = "google.protobuf.EnumOptions.features"
 	EnumOptions_UninterpretedOption_field_fullname                protoreflect.FullName = "google.protobuf.EnumOptions.uninterpreted_option"
 )
 
@@ -684,6 +725,7 @@ const (
 	EnumOptions_AllowAlias_field_number                         protoreflect.FieldNumber = 2
 	EnumOptions_Deprecated_field_number                         protoreflect.FieldNumber = 3
 	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_number protoreflect.FieldNumber = 6
+	EnumOptions_Features_field_number                           protoreflect.FieldNumber = 7
 	EnumOptions_UninterpretedOption_field_number                protoreflect.FieldNumber = 999
 )
 
@@ -696,15 +738,21 @@ const (
 // Field names for google.protobuf.EnumValueOptions.
 const (
 	EnumValueOptions_Deprecated_field_name          protoreflect.Name = "deprecated"
+	EnumValueOptions_Features_field_name            protoreflect.Name = "features"
+	EnumValueOptions_DebugRedact_field_name         protoreflect.Name = "debug_redact"
 	EnumValueOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
 	EnumValueOptions_Deprecated_field_fullname          protoreflect.FullName = "google.protobuf.EnumValueOptions.deprecated"
+	EnumValueOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.EnumValueOptions.features"
+	EnumValueOptions_DebugRedact_field_fullname         protoreflect.FullName = "google.protobuf.EnumValueOptions.debug_redact"
 	EnumValueOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.EnumValueOptions.uninterpreted_option"
 )
 
 // Field numbers for google.protobuf.EnumValueOptions.
 const (
 	EnumValueOptions_Deprecated_field_number          protoreflect.FieldNumber = 1
+	EnumValueOptions_Features_field_number            protoreflect.FieldNumber = 2
+	EnumValueOptions_DebugRedact_field_number         protoreflect.FieldNumber = 3
 	EnumValueOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
@@ -716,15 +764,18 @@ const (
 
 // Field names for google.protobuf.ServiceOptions.
 const (
+	ServiceOptions_Features_field_name            protoreflect.Name = "features"
 	ServiceOptions_Deprecated_field_name          protoreflect.Name = "deprecated"
 	ServiceOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
+	ServiceOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.ServiceOptions.features"
 	ServiceOptions_Deprecated_field_fullname          protoreflect.FullName = "google.protobuf.ServiceOptions.deprecated"
 	ServiceOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.ServiceOptions.uninterpreted_option"
 )
 
 // Field numbers for google.protobuf.ServiceOptions.
 const (
+	ServiceOptions_Features_field_number            protoreflect.FieldNumber = 34
 	ServiceOptions_Deprecated_field_number          protoreflect.FieldNumber = 33
 	ServiceOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
@@ -739,10 +790,12 @@ const (
 const (
 	MethodOptions_Deprecated_field_name          protoreflect.Name = "deprecated"
 	MethodOptions_IdempotencyLevel_field_name    protoreflect.Name = "idempotency_level"
+	MethodOptions_Features_field_name            protoreflect.Name = "features"
 	MethodOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
 	MethodOptions_Deprecated_field_fullname          protoreflect.FullName = "google.protobuf.MethodOptions.deprecated"
 	MethodOptions_IdempotencyLevel_field_fullname    protoreflect.FullName = "google.protobuf.MethodOptions.idempotency_level"
+	MethodOptions_Features_field_fullname            protoreflect.FullName = "google.protobuf.MethodOptions.features"
 	MethodOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.MethodOptions.uninterpreted_option"
 )
 
@@ -750,6 +803,7 @@ const (
 const (
 	MethodOptions_Deprecated_field_number          protoreflect.FieldNumber = 33
 	MethodOptions_IdempotencyLevel_field_number    protoreflect.FieldNumber = 34
+	MethodOptions_Features_field_number            protoreflect.FieldNumber = 35
 	MethodOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
@@ -816,6 +870,120 @@ const (
 	UninterpretedOption_NamePart_IsExtension_field_number protoreflect.FieldNumber = 2
 )
 
+// Names for google.protobuf.FeatureSet.
+const (
+	FeatureSet_message_name     protoreflect.Name     = "FeatureSet"
+	FeatureSet_message_fullname protoreflect.FullName = "google.protobuf.FeatureSet"
+)
+
+// Field names for google.protobuf.FeatureSet.
+const (
+	FeatureSet_FieldPresence_field_name         protoreflect.Name = "field_presence"
+	FeatureSet_EnumType_field_name              protoreflect.Name = "enum_type"
+	FeatureSet_RepeatedFieldEncoding_field_name protoreflect.Name = "repeated_field_encoding"
+	FeatureSet_Utf8Validation_field_name        protoreflect.Name = "utf8_validation"
+	FeatureSet_MessageEncoding_field_name       protoreflect.Name = "message_encoding"
+	FeatureSet_JsonFormat_field_name            protoreflect.Name = "json_format"
+
+	FeatureSet_FieldPresence_field_fullname         protoreflect.FullName = "google.protobuf.FeatureSet.field_presence"
+	FeatureSet_EnumType_field_fullname              protoreflect.FullName = "google.protobuf.FeatureSet.enum_type"
+	FeatureSet_RepeatedFieldEncoding_field_fullname protoreflect.FullName = "google.protobuf.FeatureSet.repeated_field_encoding"
+	FeatureSet_Utf8Validation_field_fullname        protoreflect.FullName = "google.protobuf.FeatureSet.utf8_validation"
+	FeatureSet_MessageEncoding_field_fullname       protoreflect.FullName = "google.protobuf.FeatureSet.message_encoding"
+	FeatureSet_JsonFormat_field_fullname            protoreflect.FullName = "google.protobuf.FeatureSet.json_format"
+)
+
+// Field numbers for google.protobuf.FeatureSet.
+const (
+	FeatureSet_FieldPresence_field_number         protoreflect.FieldNumber = 1
+	FeatureSet_EnumType_field_number              protoreflect.FieldNumber = 2
+	FeatureSet_RepeatedFieldEncoding_field_number protoreflect.FieldNumber = 3
+	FeatureSet_Utf8Validation_field_number        protoreflect.FieldNumber = 4
+	FeatureSet_MessageEncoding_field_number       protoreflect.FieldNumber = 5
+	FeatureSet_JsonFormat_field_number            protoreflect.FieldNumber = 6
+)
+
+// Full and short names for google.protobuf.FeatureSet.FieldPresence.
+const (
+	FeatureSet_FieldPresence_enum_fullname = "google.protobuf.FeatureSet.FieldPresence"
+	FeatureSet_FieldPresence_enum_name     = "FieldPresence"
+)
+
+// Full and short names for google.protobuf.FeatureSet.EnumType.
+const (
+	FeatureSet_EnumType_enum_fullname = "google.protobuf.FeatureSet.EnumType"
+	FeatureSet_EnumType_enum_name     = "EnumType"
+)
+
+// Full and short names for google.protobuf.FeatureSet.RepeatedFieldEncoding.
+const (
+	FeatureSet_RepeatedFieldEncoding_enum_fullname = "google.protobuf.FeatureSet.RepeatedFieldEncoding"
+	FeatureSet_RepeatedFieldEncoding_enum_name     = "RepeatedFieldEncoding"
+)
+
+// Full and short names for google.protobuf.FeatureSet.Utf8Validation.
+const (
+	FeatureSet_Utf8Validation_enum_fullname = "google.protobuf.FeatureSet.Utf8Validation"
+	FeatureSet_Utf8Validation_enum_name     = "Utf8Validation"
+)
+
+// Full and short names for google.protobuf.FeatureSet.MessageEncoding.
+const (
+	FeatureSet_MessageEncoding_enum_fullname = "google.protobuf.FeatureSet.MessageEncoding"
+	FeatureSet_MessageEncoding_enum_name     = "MessageEncoding"
+)
+
+// Full and short names for google.protobuf.FeatureSet.JsonFormat.
+const (
+	FeatureSet_JsonFormat_enum_fullname = "google.protobuf.FeatureSet.JsonFormat"
+	FeatureSet_JsonFormat_enum_name     = "JsonFormat"
+)
+
+// Names for google.protobuf.FeatureSetDefaults.
+const (
+	FeatureSetDefaults_message_name     protoreflect.Name     = "FeatureSetDefaults"
+	FeatureSetDefaults_message_fullname protoreflect.FullName = "google.protobuf.FeatureSetDefaults"
+)
+
+// Field names for google.protobuf.FeatureSetDefaults.
+const (
+	FeatureSetDefaults_Defaults_field_name       protoreflect.Name = "defaults"
+	FeatureSetDefaults_MinimumEdition_field_name protoreflect.Name = "minimum_edition"
+	FeatureSetDefaults_MaximumEdition_field_name protoreflect.Name = "maximum_edition"
+
+	FeatureSetDefaults_Defaults_field_fullname       protoreflect.FullName = "google.protobuf.FeatureSetDefaults.defaults"
+	FeatureSetDefaults_MinimumEdition_field_fullname protoreflect.FullName = "google.protobuf.FeatureSetDefaults.minimum_edition"
+	FeatureSetDefaults_MaximumEdition_field_fullname protoreflect.FullName = "google.protobuf.FeatureSetDefaults.maximum_edition"
+)
+
+// Field numbers for google.protobuf.FeatureSetDefaults.
+const (
+	FeatureSetDefaults_Defaults_field_number       protoreflect.FieldNumber = 1
+	FeatureSetDefaults_MinimumEdition_field_number protoreflect.FieldNumber = 4
+	FeatureSetDefaults_MaximumEdition_field_number protoreflect.FieldNumber = 5
+)
+
+// Names for google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.
+const (
+	FeatureSetDefaults_FeatureSetEditionDefault_message_name     protoreflect.Name     = "FeatureSetEditionDefault"
+	FeatureSetDefaults_FeatureSetEditionDefault_message_fullname protoreflect.FullName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault"
+)
+
+// Field names for google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.
+const (
+	FeatureSetDefaults_FeatureSetEditionDefault_Edition_field_name  protoreflect.Name = "edition"
+	FeatureSetDefaults_FeatureSetEditionDefault_Features_field_name protoreflect.Name = "features"
+
+	FeatureSetDefaults_FeatureSetEditionDefault_Edition_field_fullname  protoreflect.FullName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.edition"
+	FeatureSetDefaults_FeatureSetEditionDefault_Features_field_fullname protoreflect.FullName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features"
+)
+
+// Field numbers for google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.
+const (
+	FeatureSetDefaults_FeatureSetEditionDefault_Edition_field_number  protoreflect.FieldNumber = 3
+	FeatureSetDefaults_FeatureSetEditionDefault_Features_field_number protoreflect.FieldNumber = 2
+)
+
 // Names for google.protobuf.SourceCodeInfo.
 const (
 	SourceCodeInfo_message_name     protoreflect.Name     = "SourceCodeInfo"
diff --git a/vendor/google.golang.org/protobuf/internal/impl/codec_gen.go b/vendor/google.golang.org/protobuf/internal/impl/codec_gen.go
index 1a509b63ebc..f55dc01e3a9 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/codec_gen.go
+++ b/vendor/google.golang.org/protobuf/internal/impl/codec_gen.go
@@ -162,11 +162,20 @@ func appendBoolSlice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptions
 func consumeBoolSlice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.BoolSlice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growBoolSlice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -732,11 +741,20 @@ func appendInt32Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOption
 func consumeInt32Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growInt32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -1138,11 +1156,20 @@ func appendSint32Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptio
 func consumeSint32Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growInt32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -1544,11 +1571,20 @@ func appendUint32Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptio
 func consumeUint32Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Uint32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growUint32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -1950,11 +1986,20 @@ func appendInt64Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOption
 func consumeInt64Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growInt64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -2356,11 +2401,20 @@ func appendSint64Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptio
 func consumeSint64Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growInt64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -2762,11 +2816,20 @@ func appendUint64Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptio
 func consumeUint64Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Uint64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := 0
+		for _, v := range b {
+			if v < 0x80 {
+				count++
+			}
+		}
+		if count > 0 {
+			p.growUint64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			var v uint64
 			var n int
@@ -3145,11 +3208,15 @@ func appendSfixed32Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOpt
 func consumeSfixed32Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed32()
+		if count > 0 {
+			p.growInt32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed32(b)
 			if n < 0 {
@@ -3461,11 +3528,15 @@ func appendFixed32Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOpti
 func consumeFixed32Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Uint32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed32()
+		if count > 0 {
+			p.growUint32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed32(b)
 			if n < 0 {
@@ -3777,11 +3848,15 @@ func appendFloatSlice(b []byte, p pointer, f *coderFieldInfo, opts marshalOption
 func consumeFloatSlice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Float32Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed32()
+		if count > 0 {
+			p.growFloat32Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed32(b)
 			if n < 0 {
@@ -4093,11 +4168,15 @@ func appendSfixed64Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOpt
 func consumeSfixed64Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Int64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed64()
+		if count > 0 {
+			p.growInt64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed64(b)
 			if n < 0 {
@@ -4409,11 +4488,15 @@ func appendFixed64Slice(b []byte, p pointer, f *coderFieldInfo, opts marshalOpti
 func consumeFixed64Slice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Uint64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed64()
+		if count > 0 {
+			p.growUint64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed64(b)
 			if n < 0 {
@@ -4725,11 +4808,15 @@ func appendDoubleSlice(b []byte, p pointer, f *coderFieldInfo, opts marshalOptio
 func consumeDoubleSlice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (out unmarshalOutput, err error) {
 	sp := p.Float64Slice()
 	if wtyp == protowire.BytesType {
-		s := *sp
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
 			return out, errDecode
 		}
+		count := len(b) / protowire.SizeFixed64()
+		if count > 0 {
+			p.growFloat64Slice(count)
+		}
+		s := *sp
 		for len(b) > 0 {
 			v, n := protowire.ConsumeFixed64(b)
 			if n < 0 {
diff --git a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
index 61c483fac06..2ab2c629784 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
+++ b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
@@ -206,13 +206,18 @@ func aberrantLoadMessageDescReentrant(t reflect.Type, name protoreflect.FullName
 
 	// Obtain a list of oneof wrapper types.
 	var oneofWrappers []reflect.Type
-	for _, method := range []string{"XXX_OneofFuncs", "XXX_OneofWrappers"} {
-		if fn, ok := t.MethodByName(method); ok {
-			for _, v := range fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))}) {
-				if vs, ok := v.Interface().([]interface{}); ok {
-					for _, v := range vs {
-						oneofWrappers = append(oneofWrappers, reflect.TypeOf(v))
-					}
+	methods := make([]reflect.Method, 0, 2)
+	if m, ok := t.MethodByName("XXX_OneofFuncs"); ok {
+		methods = append(methods, m)
+	}
+	if m, ok := t.MethodByName("XXX_OneofWrappers"); ok {
+		methods = append(methods, m)
+	}
+	for _, fn := range methods {
+		for _, v := range fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))}) {
+			if vs, ok := v.Interface().([]interface{}); ok {
+				for _, v := range vs {
+					oneofWrappers = append(oneofWrappers, reflect.TypeOf(v))
 				}
 			}
 		}
diff --git a/vendor/google.golang.org/protobuf/internal/impl/message.go b/vendor/google.golang.org/protobuf/internal/impl/message.go
index 4f5fb67a0dd..629bacdcedd 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/message.go
+++ b/vendor/google.golang.org/protobuf/internal/impl/message.go
@@ -192,12 +192,17 @@ fieldLoop:
 
 	// Derive a mapping of oneof wrappers to fields.
 	oneofWrappers := mi.OneofWrappers
-	for _, method := range []string{"XXX_OneofFuncs", "XXX_OneofWrappers"} {
-		if fn, ok := reflect.PtrTo(t).MethodByName(method); ok {
-			for _, v := range fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))}) {
-				if vs, ok := v.Interface().([]interface{}); ok {
-					oneofWrappers = vs
-				}
+	methods := make([]reflect.Method, 0, 2)
+	if m, ok := reflect.PtrTo(t).MethodByName("XXX_OneofFuncs"); ok {
+		methods = append(methods, m)
+	}
+	if m, ok := reflect.PtrTo(t).MethodByName("XXX_OneofWrappers"); ok {
+		methods = append(methods, m)
+	}
+	for _, fn := range methods {
+		for _, v := range fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))}) {
+			if vs, ok := v.Interface().([]interface{}); ok {
+				oneofWrappers = vs
 			}
 		}
 	}
diff --git a/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go b/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
index ee0e0573e39..4b020e31164 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
+++ b/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go
@@ -138,6 +138,46 @@ func (p pointer) SetPointer(v pointer) {
 	*(*unsafe.Pointer)(p.p) = (unsafe.Pointer)(v.p)
 }
 
+func (p pointer) growBoolSlice(addCap int) {
+	sp := p.BoolSlice()
+	s := make([]bool, 0, addCap+len(*sp))
+	s = s[:len(*sp)]
+	copy(s, *sp)
+	*sp = s
+}
+
+func (p pointer) growInt32Slice(addCap int) {
+	sp := p.Int32Slice()
+	s := make([]int32, 0, addCap+len(*sp))
+	s = s[:len(*sp)]
+	copy(s, *sp)
+	*sp = s
+}
+
+func (p pointer) growUint32Slice(addCap int) {
+	p.growInt32Slice(addCap)
+}
+
+func (p pointer) growFloat32Slice(addCap int) {
+	p.growInt32Slice(addCap)
+}
+
+func (p pointer) growInt64Slice(addCap int) {
+	sp := p.Int64Slice()
+	s := make([]int64, 0, addCap+len(*sp))
+	s = s[:len(*sp)]
+	copy(s, *sp)
+	*sp = s
+}
+
+func (p pointer) growUint64Slice(addCap int) {
+	p.growInt64Slice(addCap)
+}
+
+func (p pointer) growFloat64Slice(addCap int) {
+	p.growInt64Slice(addCap)
+}
+
 // Static check that MessageState does not exceed the size of a pointer.
 const _ = uint(unsafe.Sizeof(unsafe.Pointer(nil)) - unsafe.Sizeof(MessageState{}))
 
diff --git a/vendor/google.golang.org/protobuf/internal/impl/ya.make b/vendor/google.golang.org/protobuf/internal/impl/ya.make
index 56e551b46f9..3d5e1a10778 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/impl/ya.make
@@ -37,18 +37,6 @@ SRCS(
     weak.go
 )
 
-GO_TEST_SRCS(legacy_export_test.go)
-
-GO_XTEST_SRCS(
-    enum_test.go
-    extension_test.go
-    lazy_test.go
-    legacy_aberrant_test.go
-    legacy_file_test.go
-    legacy_test.go
-    message_reflect_test.go
-)
-
 END()
 
 RECURSE(
diff --git a/vendor/google.golang.org/protobuf/internal/msgfmt/format_test.go b/vendor/google.golang.org/protobuf/internal/msgfmt/format_test.go
deleted file mode 100644
index 6ba076811c7..00000000000
--- a/vendor/google.golang.org/protobuf/internal/msgfmt/format_test.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package msgfmt_test
-
-import (
-	"math"
-	"sync"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/internal/msgfmt"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protocmp"
-	"google.golang.org/protobuf/testing/protopack"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	textpb "google.golang.org/protobuf/internal/testprotos/textpb2"
-	dynpb "google.golang.org/protobuf/types/dynamicpb"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	durpb "google.golang.org/protobuf/types/known/durationpb"
-	tspb "google.golang.org/protobuf/types/known/timestamppb"
-	wpb "google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func init() {
-	detrand.Disable()
-}
-
-func TestFormat(t *testing.T) {
-	optMsg := &testpb.TestAllTypes{
-		OptionalBool:          proto.Bool(false),
-		OptionalInt32:         proto.Int32(-32),
-		OptionalInt64:         proto.Int64(-64),
-		OptionalUint32:        proto.Uint32(32),
-		OptionalUint64:        proto.Uint64(64),
-		OptionalFloat:         proto.Float32(32.32),
-		OptionalDouble:        proto.Float64(64.64),
-		OptionalString:        proto.String("string"),
-		OptionalBytes:         []byte("bytes"),
-		OptionalNestedEnum:    testpb.TestAllTypes_NEG.Enum(),
-		OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{A: proto.Int32(5)},
-	}
-	repMsg := &testpb.TestAllTypes{
-		RepeatedBool:   []bool{false, true},
-		RepeatedInt32:  []int32{32, -32},
-		RepeatedInt64:  []int64{64, -64},
-		RepeatedUint32: []uint32{0, 32},
-		RepeatedUint64: []uint64{0, 64},
-		RepeatedFloat:  []float32{0, 32.32},
-		RepeatedDouble: []float64{0, 64.64},
-		RepeatedString: []string{"s1", "s2"},
-		RepeatedBytes:  [][]byte{{1}, {2}},
-		RepeatedNestedEnum: []testpb.TestAllTypes_NestedEnum{
-			testpb.TestAllTypes_FOO,
-			testpb.TestAllTypes_BAR,
-		},
-		RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{
-			{A: proto.Int32(5)},
-			{A: proto.Int32(-5)},
-		},
-	}
-	mapMsg := &testpb.TestAllTypes{
-		MapBoolBool:     map[bool]bool{true: false},
-		MapInt32Int32:   map[int32]int32{-32: 32},
-		MapInt64Int64:   map[int64]int64{-64: 64},
-		MapUint32Uint32: map[uint32]uint32{0: 32},
-		MapUint64Uint64: map[uint64]uint64{0: 64},
-		MapInt32Float:   map[int32]float32{32: 32.32},
-		MapInt32Double:  map[int32]float64{64: 64.64},
-		MapStringString: map[string]string{"k": "v"},
-		MapStringBytes:  map[string][]byte{"k": []byte("v")},
-		MapStringNestedEnum: map[string]testpb.TestAllTypes_NestedEnum{
-			"k": testpb.TestAllTypes_FOO,
-		},
-		MapStringNestedMessage: map[string]*testpb.TestAllTypes_NestedMessage{
-			"k": {A: proto.Int32(5)},
-		},
-	}
-
-	tests := []struct {
-		in   proto.Message
-		want string
-	}{{
-		in:   optMsg,
-		want: `{optional_int32:-32, optional_int64:-64, optional_uint32:32, optional_uint64:64, optional_float:32.32, optional_double:64.64, optional_bool:false, optional_string:"string", optional_bytes:"bytes", optional_nested_message:{a:5}, optional_nested_enum:NEG}`,
-	}, {
-		in:   repMsg,
-		want: `{repeated_int32:[32, -32], repeated_int64:[64, -64], repeated_uint32:[0, 32], repeated_uint64:[0, 64], repeated_float:[0, 32.32], repeated_double:[0, 64.64], repeated_bool:[false, true], repeated_string:["s1", "s2"], repeated_bytes:["\x01", "\x02"], repeated_nested_message:[{a:5}, {a:-5}], repeated_nested_enum:[FOO, BAR]}`,
-	}, {
-		in:   mapMsg,
-		want: `{map_int32_int32:{-32:32}, map_int64_int64:{-64:64}, map_uint32_uint32:{0:32}, map_uint64_uint64:{0:64}, map_int32_float:{32:32.32}, map_int32_double:{64:64.64}, map_bool_bool:{true:false}, map_string_string:{"k":"v"}, map_string_bytes:{"k":"v"}, map_string_nested_message:{"k":{a:5}}, map_string_nested_enum:{"k":FOO}}`,
-	}, {
-		in: func() proto.Message {
-			m := &testpb.TestAllExtensions{}
-			proto.SetExtension(m, testpb.E_OptionalBool, bool(false))
-			proto.SetExtension(m, testpb.E_OptionalInt32, int32(-32))
-			proto.SetExtension(m, testpb.E_OptionalInt64, int64(-64))
-			proto.SetExtension(m, testpb.E_OptionalUint32, uint32(32))
-			proto.SetExtension(m, testpb.E_OptionalUint64, uint64(64))
-			proto.SetExtension(m, testpb.E_OptionalFloat, float32(32.32))
-			proto.SetExtension(m, testpb.E_OptionalDouble, float64(64.64))
-			proto.SetExtension(m, testpb.E_OptionalString, string("string"))
-			proto.SetExtension(m, testpb.E_OptionalBytes, []byte("bytes"))
-			proto.SetExtension(m, testpb.E_OptionalNestedEnum, testpb.TestAllTypes_NEG)
-			proto.SetExtension(m, testpb.E_OptionalNestedMessage, &testpb.TestAllExtensions_NestedMessage{A: proto.Int32(5)})
-			return m
-		}(),
-		want: `{[goproto.proto.test.optional_bool]:false, [goproto.proto.test.optional_bytes]:"bytes", [goproto.proto.test.optional_double]:64.64, [goproto.proto.test.optional_float]:32.32, [goproto.proto.test.optional_int32]:-32, [goproto.proto.test.optional_int64]:-64, [goproto.proto.test.optional_nested_enum]:NEG, [goproto.proto.test.optional_nested_message]:{a:5}, [goproto.proto.test.optional_string]:"string", [goproto.proto.test.optional_uint32]:32, [goproto.proto.test.optional_uint64]:64}`,
-	}, {
-		in: func() proto.Message {
-			m := &testpb.TestAllExtensions{}
-			proto.SetExtension(m, testpb.E_RepeatedBool, []bool{false, true})
-			proto.SetExtension(m, testpb.E_RepeatedInt32, []int32{32, -32})
-			proto.SetExtension(m, testpb.E_RepeatedInt64, []int64{64, -64})
-			proto.SetExtension(m, testpb.E_RepeatedUint32, []uint32{0, 32})
-			proto.SetExtension(m, testpb.E_RepeatedUint64, []uint64{0, 64})
-			proto.SetExtension(m, testpb.E_RepeatedFloat, []float32{0, 32.32})
-			proto.SetExtension(m, testpb.E_RepeatedDouble, []float64{0, 64.64})
-			proto.SetExtension(m, testpb.E_RepeatedString, []string{"s1", "s2"})
-			proto.SetExtension(m, testpb.E_RepeatedBytes, [][]byte{{1}, {2}})
-			proto.SetExtension(m, testpb.E_RepeatedNestedEnum, []testpb.TestAllTypes_NestedEnum{
-				testpb.TestAllTypes_FOO,
-				testpb.TestAllTypes_BAR,
-			})
-			proto.SetExtension(m, testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions_NestedMessage{
-				{A: proto.Int32(5)},
-				{A: proto.Int32(-5)},
-			})
-			return m
-		}(),
-		want: `{[goproto.proto.test.repeated_bool]:[false, true], [goproto.proto.test.repeated_bytes]:["\x01", "\x02"], [goproto.proto.test.repeated_double]:[0, 64.64], [goproto.proto.test.repeated_float]:[0, 32.32], [goproto.proto.test.repeated_int32]:[32, -32], [goproto.proto.test.repeated_int64]:[64, -64], [goproto.proto.test.repeated_nested_enum]:[FOO, BAR], [goproto.proto.test.repeated_nested_message]:[{a:5}, {a:-5}], [goproto.proto.test.repeated_string]:["s1", "s2"], [goproto.proto.test.repeated_uint32]:[0, 32], [goproto.proto.test.repeated_uint64]:[0, 64]}`,
-	}, {
-		in: func() proto.Message {
-			m := &testpb.TestAllTypes{}
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Uvarint(100),
-				protopack.Tag{Number: 50001, Type: protopack.Fixed32Type}, protopack.Uint32(200),
-				protopack.Tag{Number: 50002, Type: protopack.Fixed64Type}, protopack.Uint64(300),
-				protopack.Tag{Number: 50003, Type: protopack.BytesType}, protopack.String("hello"),
-				protopack.Message{
-					protopack.Tag{Number: 50004, Type: protopack.StartGroupType},
-					protopack.Tag{Number: 1, Type: protopack.VarintType}, protopack.Uvarint(100),
-					protopack.Tag{Number: 1, Type: protopack.Fixed32Type}, protopack.Uint32(200),
-					protopack.Tag{Number: 1, Type: protopack.Fixed64Type}, protopack.Uint64(300),
-					protopack.Tag{Number: 1, Type: protopack.BytesType}, protopack.String("hello"),
-					protopack.Message{
-						protopack.Tag{Number: 1, Type: protopack.StartGroupType},
-						protopack.Tag{Number: 1, Type: protopack.VarintType}, protopack.Uvarint(100),
-						protopack.Tag{Number: 1, Type: protopack.Fixed32Type}, protopack.Uint32(200),
-						protopack.Tag{Number: 1, Type: protopack.Fixed64Type}, protopack.Uint64(300),
-						protopack.Tag{Number: 1, Type: protopack.BytesType}, protopack.String("hello"),
-						protopack.Tag{Number: 1, Type: protopack.EndGroupType},
-					},
-					protopack.Tag{Number: 50004, Type: protopack.EndGroupType},
-				},
-			}.Marshal())
-			return m
-		}(),
-		want: `{50000:100, 50001:0x000000c8, 50002:0x000000000000012c, 50003:"hello", 50004:{1:[100, 0x000000c8, 0x000000000000012c, "hello", {1:[100, 0x000000c8, 0x000000000000012c, "hello"]}]}}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptAny: &anypb.Any{
-				TypeUrl: "google.golang.org/goproto.proto.test.TestAllTypes",
-				Value: func() []byte {
-					b1, _ := proto.MarshalOptions{Deterministic: true}.Marshal(optMsg)
-					b2, _ := proto.MarshalOptions{Deterministic: true}.Marshal(repMsg)
-					b3, _ := proto.MarshalOptions{Deterministic: true}.Marshal(mapMsg)
-					return append(append(append([]byte(nil), b1...), b2...), b3...)
-				}(),
-			},
-		},
-		want: `{opt_any:{[google.golang.org/goproto.proto.test.TestAllTypes]:{optional_int32:-32, optional_int64:-64, optional_uint32:32, optional_uint64:64, optional_float:32.32, optional_double:64.64, optional_bool:false, optional_string:"string", optional_bytes:"bytes", optional_nested_message:{a:5}, optional_nested_enum:NEG, repeated_int32:[32, -32], repeated_int64:[64, -64], repeated_uint32:[0, 32], repeated_uint64:[0, 64], repeated_float:[0, 32.32], repeated_double:[0, 64.64], repeated_bool:[false, true], repeated_string:["s1", "s2"], repeated_bytes:["\x01", "\x02"], repeated_nested_message:[{a:5}, {a:-5}], repeated_nested_enum:[FOO, BAR], map_int32_int32:{-32:32}, map_int64_int64:{-64:64}, map_uint32_uint32:{0:32}, map_uint64_uint64:{0:64}, map_int32_float:{32:32.32}, map_int32_double:{64:64.64}, map_bool_bool:{true:false}, map_string_string:{"k":"v"}, map_string_bytes:{"k":"v"}, map_string_nested_message:{"k":{a:5}}, map_string_nested_enum:{"k":FOO}}}}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptTimestamp: &tspb.Timestamp{Seconds: math.MinInt64, Nanos: math.MaxInt32},
-		},
-		want: `{opt_timestamp:{seconds:-9223372036854775808, nanos:2147483647}}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptTimestamp: &tspb.Timestamp{Seconds: 1257894123, Nanos: 456789},
-		},
-		want: `{opt_timestamp:2009-11-10T23:02:03.000456789Z}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptDuration: &durpb.Duration{Seconds: math.MinInt64, Nanos: math.MaxInt32},
-		},
-		want: `{opt_duration:{seconds:-9223372036854775808, nanos:2147483647}}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptDuration: &durpb.Duration{Seconds: +1257894123, Nanos: +456789},
-		},
-		want: `{opt_duration:1257894123.000456789s}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptDuration: &durpb.Duration{Seconds: -1257894123, Nanos: -456789},
-		},
-		want: `{opt_duration:-1257894123.000456789s}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptDuration: &durpb.Duration{Seconds: 0, Nanos: -1},
-		},
-		want: `{opt_duration:-0.000000001s}`,
-	}, {
-		in: &textpb.KnownTypes{
-			OptBool:   &wpb.BoolValue{},
-			OptInt32:  &wpb.Int32Value{},
-			OptInt64:  &wpb.Int64Value{},
-			OptUint32: &wpb.UInt32Value{},
-			OptUint64: &wpb.UInt64Value{},
-			OptFloat:  &wpb.FloatValue{},
-			OptDouble: &wpb.DoubleValue{},
-			OptString: &wpb.StringValue{},
-			OptBytes:  &wpb.BytesValue{},
-		},
-		want: `{opt_bool:false, opt_int32:0, opt_int64:0, opt_uint32:0, opt_uint64:0, opt_float:0, opt_double:0, opt_string:"", opt_bytes:""}`,
-	}}
-	for _, tt := range tests {
-		t.Run("Generated", func(t *testing.T) {
-			got := msgfmt.Format(tt.in)
-			if diff := cmp.Diff(tt.want, got); diff != "" {
-				t.Errorf("Format() mismatch (-want +got):\n%v", diff)
-			}
-		})
-		t.Run("dynamicpb.Message", func(t *testing.T) {
-			m := dynpb.NewMessage(tt.in.ProtoReflect().Descriptor())
-			proto.Merge(m, tt.in)
-			got := msgfmt.Format(m)
-			if diff := cmp.Diff(tt.want, got); diff != "" {
-				t.Errorf("Format() mismatch (-want +got):\n%v", diff)
-			}
-		})
-		t.Run("protocmp.Message", func(t *testing.T) {
-			// This is a roundabout way to obtain a protocmp.Message since there
-			// is no exported API in protocmp to directly transform a message.
-			var m proto.Message
-			var once sync.Once
-			cmp.Equal(tt.in, tt.in, protocmp.Transform(), cmp.FilterPath(func(p cmp.Path) bool {
-				if v, _ := p.Index(1).Values(); v.IsValid() {
-					once.Do(func() { m = v.Interface().(protocmp.Message) })
-				}
-				return false
-			}, cmp.Ignore()))
-
-			got := msgfmt.Format(m)
-			if diff := cmp.Diff(tt.want, got); diff != "" {
-				t.Errorf("Format() mismatch (-want +got):\n%v", diff)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/msgfmt/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/msgfmt/gotest/ya.make
deleted file mode 100644
index 9934cc5d244..00000000000
--- a/vendor/google.golang.org/protobuf/internal/msgfmt/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/msgfmt)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/msgfmt/ya.make b/vendor/google.golang.org/protobuf/internal/msgfmt/ya.make
index 780f63018d8..5ed4b140dce 100644
--- a/vendor/google.golang.org/protobuf/internal/msgfmt/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/msgfmt/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(format.go)
-
-GO_XTEST_SRCS(format_test.go)
+SRCS(
+    format.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/order/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/order/gotest/ya.make
deleted file mode 100644
index 1e00ab1ef47..00000000000
--- a/vendor/google.golang.org/protobuf/internal/order/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/order)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/order/order_test.go b/vendor/google.golang.org/protobuf/internal/order/order_test.go
deleted file mode 100644
index 94de4212d78..00000000000
--- a/vendor/google.golang.org/protobuf/internal/order/order_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package order
-
-import (
-	"math/rand"
-	"sort"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-type fieldDesc struct {
-	index      int
-	name       protoreflect.FullName
-	number     protoreflect.FieldNumber
-	extension  bool
-	oneofIndex int // non-zero means within oneof; negative means synthetic
-	protoreflect.FieldDescriptor
-}
-
-func (d fieldDesc) Index() int                       { return d.index }
-func (d fieldDesc) Name() protoreflect.Name          { return d.name.Name() }
-func (d fieldDesc) FullName() protoreflect.FullName  { return d.name }
-func (d fieldDesc) Number() protoreflect.FieldNumber { return d.number }
-func (d fieldDesc) IsExtension() bool                { return d.extension }
-func (d fieldDesc) ContainingOneof() protoreflect.OneofDescriptor {
-	switch {
-	case d.oneofIndex < 0:
-		return oneofDesc{index: -d.oneofIndex, synthetic: true}
-	case d.oneofIndex > 0:
-		return oneofDesc{index: +d.oneofIndex, synthetic: false}
-	default:
-		return nil
-	}
-}
-
-type oneofDesc struct {
-	index     int
-	synthetic bool
-	protoreflect.OneofDescriptor
-}
-
-func (d oneofDesc) Index() int        { return d.index }
-func (d oneofDesc) IsSynthetic() bool { return d.synthetic }
-
-func TestFieldOrder(t *testing.T) {
-	tests := []struct {
-		label  string
-		order  FieldOrder
-		fields []fieldDesc
-	}{{
-		label: "LegacyFieldOrder",
-		order: LegacyFieldOrder,
-		fields: []fieldDesc{
-			// Extension fields sorted first by field number.
-			{number: 2, extension: true},
-			{number: 4, extension: true},
-			{number: 100, extension: true},
-			{number: 120, extension: true},
-
-			// Non-extension fields that are not within a oneof
-			// sorted next by field number.
-			{number: 1},
-			{number: 5, oneofIndex: -10}, // synthetic oneof
-			{number: 10},
-			{number: 11, oneofIndex: -9}, // synthetic oneof
-			{number: 12},
-
-			// Non-synthetic oneofs sorted last by index.
-			{number: 13, oneofIndex: 4},
-			{number: 3, oneofIndex: 5},
-			{number: 9, oneofIndex: 5},
-			{number: 7, oneofIndex: 8},
-		},
-	}, {
-		label: "NumberFieldOrder",
-		order: NumberFieldOrder,
-		fields: []fieldDesc{
-			{number: 1, index: 5, name: "c"},
-			{number: 2, index: 2, name: "b"},
-			{number: 3, index: 3, name: "d"},
-			{number: 5, index: 1, name: "a"},
-			{number: 7, index: 7, name: "e"},
-		},
-	}, {
-		label: "IndexNameFieldOrder",
-		order: IndexNameFieldOrder,
-		fields: []fieldDesc{
-			// Non-extension fields sorted first by index.
-			{index: 0, number: 5, name: "c"},
-			{index: 2, number: 2, name: "a"},
-			{index: 4, number: 4, name: "b"},
-			{index: 7, number: 6, name: "d"},
-
-			// Extension fields sorted last by full name.
-			{index: 3, number: 1, name: "d.a", extension: true},
-			{index: 5, number: 3, name: "e", extension: true},
-			{index: 1, number: 7, name: "g", extension: true},
-		},
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.label, func(t *testing.T) {
-			want := tt.fields
-			got := append([]fieldDesc(nil), want...)
-			for i, j := range rand.Perm(len(got)) {
-				got[i], got[j] = got[j], got[i]
-			}
-			sort.Slice(got, func(i, j int) bool {
-				return tt.order(got[i], got[j])
-			})
-			if diff := cmp.Diff(want, got,
-				cmp.Comparer(func(x, y fieldDesc) bool { return x == y }),
-			); diff != "" {
-				t.Errorf("order mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestKeyOrder(t *testing.T) {
-	tests := []struct {
-		label string
-		order KeyOrder
-		keys  []interface{}
-	}{{
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{false, true},
-	}, {
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{int32(-100), int32(-99), int32(-10), int32(-9), int32(-1), int32(0), int32(+1), int32(+9), int32(+10), int32(+99), int32(+100)},
-	}, {
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{int64(-100), int64(-99), int64(-10), int64(-9), int64(-1), int64(0), int64(+1), int64(+9), int64(+10), int64(+99), int64(+100)},
-	}, {
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{uint32(0), uint32(1), uint32(9), uint32(10), uint32(99), uint32(100)},
-	}, {
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{uint64(0), uint64(1), uint64(9), uint64(10), uint64(99), uint64(100)},
-	}, {
-		label: "GenericKeyOrder",
-		order: GenericKeyOrder,
-		keys:  []interface{}{"", "a", "aa", "ab", "ba", "bb", "\u0080", "\u0080\u0081", "\u0082\u0080"},
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.label, func(t *testing.T) {
-			var got, want []protoreflect.MapKey
-			for _, v := range tt.keys {
-				want = append(want, protoreflect.ValueOf(v).MapKey())
-			}
-			got = append(got, want...)
-			for i, j := range rand.Perm(len(got)) {
-				got[i], got[j] = got[j], got[i]
-			}
-			sort.Slice(got, func(i, j int) bool {
-				return tt.order(got[i], got[j])
-			})
-			if diff := cmp.Diff(want, got, cmp.Transformer("", protoreflect.MapKey.Interface)); diff != "" {
-				t.Errorf("order mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/order/ya.make b/vendor/google.golang.org/protobuf/internal/order/ya.make
index a066aa2d928..fbc58d1f9be 100644
--- a/vendor/google.golang.org/protobuf/internal/order/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/order/ya.make
@@ -7,8 +7,4 @@ SRCS(
     range.go
 )
 
-GO_TEST_SRCS(order_test.go)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/pragma/ya.make b/vendor/google.golang.org/protobuf/internal/pragma/ya.make
index e70fc3101a6..521f22ace63 100644
--- a/vendor/google.golang.org/protobuf/internal/pragma/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/pragma/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(pragma.go)
+SRCS(
+    pragma.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/internal/protobuild/build.go b/vendor/google.golang.org/protobuf/internal/protobuild/build.go
deleted file mode 100644
index e432c3b6769..00000000000
--- a/vendor/google.golang.org/protobuf/internal/protobuild/build.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package protobuild constructs messages.
-//
-// This package is used to construct multiple types of message with a similar shape
-// from a common template.
-package protobuild
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-)
-
-// A Value is a value assignable to a field.
-// A Value may be a value accepted by protoreflect.ValueOf. In addition:
-//
-// • An int may be assigned to any numeric field.
-//
-// • A float64 may be assigned to a double field.
-//
-// • Either a string or []byte may be assigned to a string or bytes field.
-//
-// • A string containing the value name may be assigned to an enum field.
-//
-// • A slice may be assigned to a list, and a map may be assigned to a map.
-type Value interface{}
-
-// A Message is a template to apply to a message. Keys are field names, including
-// extension names.
-type Message map[protoreflect.Name]Value
-
-// Unknown is a key associated with the unknown fields of a message.
-// The value should be a []byte.
-const Unknown = "@unknown"
-
-// Build applies the template to a message.
-func (template Message) Build(m protoreflect.Message) {
-	md := m.Descriptor()
-	fields := md.Fields()
-	exts := make(map[protoreflect.Name]protoreflect.FieldDescriptor)
-	protoregistry.GlobalTypes.RangeExtensionsByMessage(md.FullName(), func(xt protoreflect.ExtensionType) bool {
-		xd := xt.TypeDescriptor()
-		exts[xd.Name()] = xd
-		return true
-	})
-	for k, v := range template {
-		if k == Unknown {
-			m.SetUnknown(protoreflect.RawFields(v.([]byte)))
-			continue
-		}
-		fd := fields.ByName(k)
-		if fd == nil {
-			fd = exts[k]
-		}
-		if fd == nil {
-			panic(fmt.Sprintf("%v.%v: not found", md.FullName(), k))
-		}
-		switch {
-		case fd.IsList():
-			list := m.Mutable(fd).List()
-			s := reflect.ValueOf(v)
-			for i := 0; i < s.Len(); i++ {
-				if fd.Message() == nil {
-					list.Append(fieldValue(fd, s.Index(i).Interface()))
-				} else {
-					e := list.NewElement()
-					s.Index(i).Interface().(Message).Build(e.Message())
-					list.Append(e)
-				}
-			}
-		case fd.IsMap():
-			mapv := m.Mutable(fd).Map()
-			rm := reflect.ValueOf(v)
-			for _, k := range rm.MapKeys() {
-				mk := fieldValue(fd.MapKey(), k.Interface()).MapKey()
-				if fd.MapValue().Message() == nil {
-					mv := fieldValue(fd.MapValue(), rm.MapIndex(k).Interface())
-					mapv.Set(mk, mv)
-				} else if mapv.Has(mk) {
-					mv := mapv.Get(mk).Message()
-					rm.MapIndex(k).Interface().(Message).Build(mv)
-				} else {
-					mv := mapv.NewValue()
-					rm.MapIndex(k).Interface().(Message).Build(mv.Message())
-					mapv.Set(mk, mv)
-				}
-			}
-		default:
-			if fd.Message() == nil {
-				m.Set(fd, fieldValue(fd, v))
-			} else {
-				v.(Message).Build(m.Mutable(fd).Message())
-			}
-		}
-	}
-}
-
-func fieldValue(fd protoreflect.FieldDescriptor, v interface{}) protoreflect.Value {
-	switch o := v.(type) {
-	case int:
-		switch fd.Kind() {
-		case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
-			if o < math.MinInt32 || math.MaxInt32 < o {
-				panic(fmt.Sprintf("%v: value %v out of range [%v, %v]", fd.FullName(), o, int32(math.MinInt32), int32(math.MaxInt32)))
-			}
-			v = int32(o)
-		case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
-			if o < 0 || math.MaxUint32 < 0 {
-				panic(fmt.Sprintf("%v: value %v out of range [%v, %v]", fd.FullName(), o, uint32(0), uint32(math.MaxUint32)))
-			}
-			v = uint32(o)
-		case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
-			v = int64(o)
-		case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
-			if o < 0 {
-				panic(fmt.Sprintf("%v: value %v out of range [%v, %v]", fd.FullName(), o, uint64(0), uint64(math.MaxUint64)))
-			}
-			v = uint64(o)
-		case protoreflect.FloatKind:
-			v = float32(o)
-		case protoreflect.DoubleKind:
-			v = float64(o)
-		case protoreflect.EnumKind:
-			v = protoreflect.EnumNumber(o)
-		default:
-			panic(fmt.Sprintf("%v: invalid value type int", fd.FullName()))
-		}
-	case float64:
-		switch fd.Kind() {
-		case protoreflect.FloatKind:
-			v = float32(o)
-		}
-	case string:
-		switch fd.Kind() {
-		case protoreflect.BytesKind:
-			v = []byte(o)
-		case protoreflect.EnumKind:
-			v = fd.Enum().Values().ByName(protoreflect.Name(o)).Number()
-		}
-	case []byte:
-		return protoreflect.ValueOf(append([]byte{}, o...))
-	}
-	return protoreflect.ValueOf(v)
-}
diff --git a/vendor/google.golang.org/protobuf/internal/protobuild/ya.make b/vendor/google.golang.org/protobuf/internal/protobuild/ya.make
deleted file mode 100644
index 4506aaa671c..00000000000
--- a/vendor/google.golang.org/protobuf/internal/protobuild/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(build.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/protolegacy/proto.go b/vendor/google.golang.org/protobuf/internal/protolegacy/proto.go
deleted file mode 100644
index 96b44d919c5..00000000000
--- a/vendor/google.golang.org/protobuf/internal/protolegacy/proto.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package protolegacy is a stub version of the v1 proto package
-// to satisfy internal/testprotos/legacy dependencies.
-package protolegacy
-
-import (
-	"bytes"
-	"compress/gzip"
-	"errors"
-	"fmt"
-	"io/ioutil"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/runtime/protoiface"
-	"google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	ProtoPackageIsVersion1 = true
-	ProtoPackageIsVersion2 = true
-	ProtoPackageIsVersion3 = true
-)
-
-const (
-	WireVarint     = 0
-	WireFixed32    = 5
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-)
-
-type (
-	Message                = protoiface.MessageV1
-	ExtensionRange         = protoiface.ExtensionRangeV1
-	ExtensionDesc          = protoimpl.ExtensionInfo
-	Extension              = protoimpl.ExtensionFieldV1
-	XXX_InternalExtensions = protoimpl.ExtensionFields
-)
-
-func RegisterFile(s string, d []byte) {
-	// Decompress the descriptor.
-	zr, err := gzip.NewReader(bytes.NewReader(d))
-	if err != nil {
-		panic(fmt.Sprintf("proto: invalid compressed file descriptor: %v", err))
-	}
-	b, err := ioutil.ReadAll(zr)
-	if err != nil {
-		panic(fmt.Sprintf("proto: invalid compressed file descriptor: %v", err))
-	}
-
-	// Construct a protoreflect.FileDescriptor from the raw descriptor.
-	// Note that DescBuilder.Build automatically registers the constructed
-	// file descriptor with the v2 registry.
-	protoimpl.DescBuilder{RawDescriptor: b}.Build()
-}
-
-func RegisterType(m Message, s string) {
-	mt := protoimpl.X.LegacyMessageTypeOf(m, protoreflect.FullName(s))
-	if err := protoregistry.GlobalTypes.RegisterMessage(mt); err != nil {
-		panic(err)
-	}
-}
-
-func RegisterMapType(interface{}, string) {
-	// Do nothing.
-}
-
-func RegisterEnum(string, map[int32]string, map[string]int32) {
-	// Do nothing.
-}
-
-func RegisterExtension(d *ExtensionDesc) {
-	if err := protoregistry.GlobalTypes.RegisterExtension(d); err != nil {
-		panic(err)
-	}
-}
-
-var ErrInternalBadWireType = errors.New("not implemented")
-
-func Size(Message) int                { panic("not implemented") }
-func Marshal(Message) ([]byte, error) { panic("not implemented") }
-func Unmarshal([]byte, Message) error { panic("not implemented") }
-
-func SizeVarint(uint64) int             { panic("not implemented") }
-func EncodeVarint(uint64) []byte        { panic("not implemented") }
-func DecodeVarint([]byte) (uint64, int) { panic("not implemented") }
-
-func CompactTextString(Message) string                                  { panic("not implemented") }
-func EnumName(map[int32]string, int32) string                           { panic("not implemented") }
-func UnmarshalJSONEnum(map[string]int32, []byte, string) (int32, error) { panic("not implemented") }
-
-type Buffer struct{}
-
-func (*Buffer) DecodeFixed32() (uint64, error)      { panic("not implemented") }
-func (*Buffer) DecodeFixed64() (uint64, error)      { panic("not implemented") }
-func (*Buffer) DecodeGroup(Message) error           { panic("not implemented") }
-func (*Buffer) DecodeMessage(Message) error         { panic("not implemented") }
-func (*Buffer) DecodeRawBytes(bool) ([]byte, error) { panic("not implemented") }
-func (*Buffer) DecodeStringBytes() (string, error)  { panic("not implemented") }
-func (*Buffer) DecodeVarint() (uint64, error)       { panic("not implemented") }
-func (*Buffer) DecodeZigzag32() (uint64, error)     { panic("not implemented") }
-func (*Buffer) DecodeZigzag64() (uint64, error)     { panic("not implemented") }
-func (*Buffer) EncodeFixed32(uint64) error          { panic("not implemented") }
-func (*Buffer) EncodeFixed64(uint64) error          { panic("not implemented") }
-func (*Buffer) EncodeMessage(Message) error         { panic("not implemented") }
-func (*Buffer) EncodeRawBytes([]byte) error         { panic("not implemented") }
-func (*Buffer) EncodeStringBytes(string) error      { panic("not implemented") }
-func (*Buffer) EncodeVarint(uint64) error           { panic("not implemented") }
-func (*Buffer) EncodeZigzag32(uint64) error         { panic("not implemented") }
-func (*Buffer) EncodeZigzag64(uint64) error         { panic("not implemented") }
-func (*Buffer) Marshal(Message) error               { panic("not implemented") }
-func (*Buffer) Unmarshal(Message) error             { panic("not implemented") }
-
-type InternalMessageInfo struct{}
-
-func (*InternalMessageInfo) DiscardUnknown(Message)                        { panic("not implemented") }
-func (*InternalMessageInfo) Marshal([]byte, Message, bool) ([]byte, error) { panic("not implemented") }
-func (*InternalMessageInfo) Merge(Message, Message)                        { panic("not implemented") }
-func (*InternalMessageInfo) Size(Message) int                              { panic("not implemented") }
-func (*InternalMessageInfo) Unmarshal(Message, []byte) error               { panic("not implemented") }
diff --git a/vendor/google.golang.org/protobuf/internal/protolegacy/ya.make b/vendor/google.golang.org/protobuf/internal/protolegacy/ya.make
deleted file mode 100644
index 913891a3d6b..00000000000
--- a/vendor/google.golang.org/protobuf/internal/protolegacy/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(proto.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/set/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/set/gotest/ya.make
deleted file mode 100644
index ed56dcf44bd..00000000000
--- a/vendor/google.golang.org/protobuf/internal/set/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/set)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/set/ints_test.go b/vendor/google.golang.org/protobuf/internal/set/ints_test.go
deleted file mode 100644
index 9dac18bd3db..00000000000
--- a/vendor/google.golang.org/protobuf/internal/set/ints_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package set
-
-import (
-	"math/rand"
-	"testing"
-)
-
-const maxLimit = 1024
-
-var toSet, toClear [maxLimit]bool
-
-func init() {
-	r := rand.New(rand.NewSource(0))
-	for i := 0; i < maxLimit; i++ {
-		toSet[i] = r.Intn(2) == 0
-		toClear[i] = r.Intn(2) == 0
-	}
-}
-
-func TestInts(t *testing.T) {
-	ns := new(Ints)
-
-	// Check that set starts empty.
-	wantLen := 0
-	if ns.Len() != wantLen {
-		t.Errorf("init: Len() = %d, want %d", ns.Len(), wantLen)
-	}
-	for i := 0; i < maxLimit; i++ {
-		if ns.Has(uint64(i)) {
-			t.Errorf("init: Has(%d) = true, want false", i)
-		}
-	}
-
-	// Set some numbers.
-	for i, b := range toSet[:maxLimit] {
-		if b {
-			ns.Set(uint64(i))
-			wantLen++
-		}
-	}
-
-	// Check that integers were set.
-	if ns.Len() != wantLen {
-		t.Errorf("after Set: Len() = %d, want %d", ns.Len(), wantLen)
-	}
-	for i := 0; i < maxLimit; i++ {
-		if got := ns.Has(uint64(i)); got != toSet[i] {
-			t.Errorf("after Set: Has(%d) = %v, want %v", i, got, !got)
-		}
-	}
-
-	// Clear some numbers.
-	for i, b := range toClear[:maxLimit] {
-		if b {
-			ns.Clear(uint64(i))
-			if toSet[i] {
-				wantLen--
-			}
-		}
-	}
-
-	// Check that integers were cleared.
-	if ns.Len() != wantLen {
-		t.Errorf("after Clear: Len() = %d, want %d", ns.Len(), wantLen)
-	}
-	for i := 0; i < maxLimit; i++ {
-		if got := ns.Has(uint64(i)); got != toSet[i] && !toClear[i] {
-			t.Errorf("after Clear: Has(%d) = %v, want %v", i, got, !got)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/internal/set/ya.make b/vendor/google.golang.org/protobuf/internal/set/ya.make
index d41fc72c986..ef768eff13e 100644
--- a/vendor/google.golang.org/protobuf/internal/set/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/set/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(ints.go)
-
-GO_TEST_SRCS(ints_test.go)
+SRCS(
+    ints.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/strs/gotest/ya.make b/vendor/google.golang.org/protobuf/internal/strs/gotest/ya.make
deleted file mode 100644
index b3f84406562..00000000000
--- a/vendor/google.golang.org/protobuf/internal/strs/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/internal/strs)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/strs/strings_test.go b/vendor/google.golang.org/protobuf/internal/strs/strings_test.go
deleted file mode 100644
index 0bb894a16fd..00000000000
--- a/vendor/google.golang.org/protobuf/internal/strs/strings_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package strs
-
-import (
-	"strconv"
-	"testing"
-)
-
-func TestGoCamelCase(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"", ""},
-		{"one", "One"},
-		{"one_two", "OneTwo"},
-		{"_my_field_name_2", "XMyFieldName_2"},
-		{"Something_Capped", "Something_Capped"},
-		{"my_Name", "My_Name"},
-		{"OneTwo", "OneTwo"},
-		{"_", "X"},
-		{"_a_", "XA_"},
-		{"one.two", "OneTwo"},
-		{"one.Two", "One_Two"},
-		{"one_two.three_four", "OneTwoThreeFour"},
-		{"one_two.Three_four", "OneTwo_ThreeFour"},
-		{"_one._two", "XOne_XTwo"},
-		{"SCREAMING_SNAKE_CASE", "SCREAMING_SNAKE_CASE"},
-		{"double__underscore", "Double_Underscore"},
-		{"camelCase", "CamelCase"},
-		{"go2proto", "Go2Proto"},
-		{"世界", "世界"},
-		{"x世界", "X世界"},
-		{"foo_bar世界", "FooBar世界"},
-	}
-	for _, tc := range tests {
-		if got := GoCamelCase(tc.in); got != tc.want {
-			t.Errorf("GoCamelCase(%q) = %q, want %q", tc.in, got, tc.want)
-		}
-	}
-}
-
-func TestGoSanitized(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"", "_"},
-		{"boo", "boo"},
-		{"Boo", "Boo"},
-		{"ßoo", "ßoo"},
-		{"default", "_default"},
-		{"hello", "hello"},
-		{"hello-world!!", "hello_world__"},
-		{"hello-\xde\xad\xbe\xef\x00", "hello_____"},
-		{"hello 世界", "hello_世界"},
-		{"世界", "世界"},
-	}
-	for _, tc := range tests {
-		if got := GoSanitized(tc.in); got != tc.want {
-			t.Errorf("GoSanitized(%q) = %q, want %q", tc.in, got, tc.want)
-		}
-	}
-}
-
-func TestName(t *testing.T) {
-	tests := []struct {
-		in                string
-		inEnumPrefix      string
-		wantMapEntry      string
-		wantEnumValue     string
-		wantTrimValue     string
-		wantJSONCamelCase string
-		wantJSONSnakeCase string
-	}{{
-		in:                "abc",
-		inEnumPrefix:      "",
-		wantMapEntry:      "AbcEntry",
-		wantEnumValue:     "Abc",
-		wantTrimValue:     "abc",
-		wantJSONCamelCase: "abc",
-		wantJSONSnakeCase: "abc",
-	}, {
-		in:                "foo_baR_",
-		inEnumPrefix:      "foo_bar",
-		wantMapEntry:      "FooBaREntry",
-		wantEnumValue:     "FooBar",
-		wantTrimValue:     "foo_baR_",
-		wantJSONCamelCase: "fooBaR",
-		wantJSONSnakeCase: "foo_ba_r_",
-	}, {
-		in:                "snake_caseCamelCase",
-		inEnumPrefix:      "snakecasecamel",
-		wantMapEntry:      "SnakeCaseCamelCaseEntry",
-		wantEnumValue:     "SnakeCasecamelcase",
-		wantTrimValue:     "Case",
-		wantJSONCamelCase: "snakeCaseCamelCase",
-		wantJSONSnakeCase: "snake_case_camel_case",
-	}, {
-		in:                "FiZz_BuZz",
-		inEnumPrefix:      "fizz",
-		wantMapEntry:      "FiZzBuZzEntry",
-		wantEnumValue:     "FizzBuzz",
-		wantTrimValue:     "BuZz",
-		wantJSONCamelCase: "FiZzBuZz",
-		wantJSONSnakeCase: "_fi_zz__bu_zz",
-	}}
-
-	for _, tt := range tests {
-		if got := MapEntryName(tt.in); got != tt.wantMapEntry {
-			t.Errorf("MapEntryName(%q) = %q, want %q", tt.in, got, tt.wantMapEntry)
-		}
-		if got := EnumValueName(tt.in); got != tt.wantEnumValue {
-			t.Errorf("EnumValueName(%q) = %q, want %q", tt.in, got, tt.wantEnumValue)
-		}
-		if got := TrimEnumPrefix(tt.in, tt.inEnumPrefix); got != tt.wantTrimValue {
-			t.Errorf("ErimEnumPrefix(%q, %q) = %q, want %q", tt.in, tt.inEnumPrefix, got, tt.wantTrimValue)
-		}
-		if got := JSONCamelCase(tt.in); got != tt.wantJSONCamelCase {
-			t.Errorf("JSONCamelCase(%q) = %q, want %q", tt.in, got, tt.wantJSONCamelCase)
-		}
-		if got := JSONSnakeCase(tt.in); got != tt.wantJSONSnakeCase {
-			t.Errorf("JSONSnakeCase(%q) = %q, want %q", tt.in, got, tt.wantJSONSnakeCase)
-		}
-	}
-}
-
-var (
-	srcString = "1234"
-	srcBytes  = []byte(srcString)
-	dst       uint64
-)
-
-func BenchmarkCast(b *testing.B) {
-	b.Run("Ideal", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			dst, _ = strconv.ParseUint(srcString, 0, 64)
-		}
-		if dst != 1234 {
-			b.Errorf("got %d, want %s", dst, srcString)
-		}
-	})
-	b.Run("Copy", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			dst, _ = strconv.ParseUint(string(srcBytes), 0, 64)
-		}
-		if dst != 1234 {
-			b.Errorf("got %d, want %s", dst, srcString)
-		}
-	})
-	b.Run("Cast", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			dst, _ = strconv.ParseUint(UnsafeString(srcBytes), 0, 64)
-		}
-		if dst != 1234 {
-			b.Errorf("got %d, want %s", dst, srcString)
-		}
-	})
-}
diff --git a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe_go121.go
index 61a84d34185..60166f2ba3c 100644
--- a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go
+++ b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe_go121.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !purego && !appengine
-// +build !purego,!appengine
+//go:build !purego && !appengine && go1.21
+// +build !purego,!appengine,go1.21
 
 package strs
 
@@ -13,42 +13,21 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-type (
-	stringHeader struct {
-		Data unsafe.Pointer
-		Len  int
-	}
-	sliceHeader struct {
-		Data unsafe.Pointer
-		Len  int
-		Cap  int
-	}
-)
-
 // UnsafeString returns an unsafe string reference of b.
 // The caller must treat the input slice as immutable.
 //
 // WARNING: Use carefully. The returned result must not leak to the end user
 // unless the input slice is provably immutable.
-func UnsafeString(b []byte) (s string) {
-	src := (*sliceHeader)(unsafe.Pointer(&b))
-	dst := (*stringHeader)(unsafe.Pointer(&s))
-	dst.Data = src.Data
-	dst.Len = src.Len
-	return s
+func UnsafeString(b []byte) string {
+	return unsafe.String(unsafe.SliceData(b), len(b))
 }
 
 // UnsafeBytes returns an unsafe bytes slice reference of s.
 // The caller must treat returned slice as immutable.
 //
 // WARNING: Use carefully. The returned result must not leak to the end user.
-func UnsafeBytes(s string) (b []byte) {
-	src := (*stringHeader)(unsafe.Pointer(&s))
-	dst := (*sliceHeader)(unsafe.Pointer(&b))
-	dst.Data = src.Data
-	dst.Len = src.Len
-	dst.Cap = src.Len
-	return b
+func UnsafeBytes(s string) []byte {
+	return unsafe.Slice(unsafe.StringData(s), len(s))
 }
 
 // Builder builds a set of strings with shared lifetime.
diff --git a/vendor/google.golang.org/protobuf/internal/strs/ya.make b/vendor/google.golang.org/protobuf/internal/strs/ya.make
index ab9bbcbbff7..3e580e19992 100644
--- a/vendor/google.golang.org/protobuf/internal/strs/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/strs/ya.make
@@ -4,11 +4,7 @@ LICENSE(BSD-3-Clause)
 
 SRCS(
     strings.go
-    strings_unsafe.go
+    strings_unsafe_go121.go
 )
 
-GO_TEST_SRCS(strings_test.go)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/enums/enums.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/enums/enums.pb.go
deleted file mode 100644
index 061d112188c..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/enums/enums.pb.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2021 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/enums/enums.proto
-
-package enums
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Enum int32
-
-const (
-	Enum_DEFAULT     Enum = 1337
-	Enum_ZERO        Enum = 0
-	Enum_ONE         Enum = 1
-	Enum_ELEVENT     Enum = 11
-	Enum_SEVENTEEN   Enum = 17
-	Enum_THIRTYSEVEN Enum = 37
-	Enum_SIXTYSEVEN  Enum = 67
-	Enum_NEGATIVE    Enum = -1
-)
-
-// Enum value maps for Enum.
-var (
-	Enum_name = map[int32]string{
-		1337: "DEFAULT",
-		0:    "ZERO",
-		1:    "ONE",
-		11:   "ELEVENT",
-		17:   "SEVENTEEN",
-		37:   "THIRTYSEVEN",
-		67:   "SIXTYSEVEN",
-		-1:   "NEGATIVE",
-	}
-	Enum_value = map[string]int32{
-		"DEFAULT":     1337,
-		"ZERO":        0,
-		"ONE":         1,
-		"ELEVENT":     11,
-		"SEVENTEEN":   17,
-		"THIRTYSEVEN": 37,
-		"SIXTYSEVEN":  67,
-		"NEGATIVE":    -1,
-	}
-)
-
-func (x Enum) Enum() *Enum {
-	p := new(Enum)
-	*p = x
-	return p
-}
-
-func (x Enum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_enums_enums_proto_enumTypes[0].Descriptor()
-}
-
-func (Enum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_enums_enums_proto_enumTypes[0]
-}
-
-func (x Enum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enum(num)
-	return nil
-}
-
-// Deprecated: Use Enum.Descriptor instead.
-func (Enum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_enums_enums_proto_rawDescGZIP(), []int{0}
-}
-
-var File_internal_testprotos_enums_enums_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_enums_enums_proto_rawDesc = []byte{
-	0x0a, 0x25, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2f, 0x65, 0x6e, 0x75, 0x6d,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2a, 0x7b, 0x0a, 0x04,
-	0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0c, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10,
-	0xb9, 0x0a, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03,
-	0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x45, 0x4c, 0x45, 0x56, 0x45, 0x4e, 0x54,
-	0x10, 0x0b, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x45, 0x45, 0x4e, 0x10,
-	0x11, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x48, 0x49, 0x52, 0x54, 0x59, 0x53, 0x45, 0x56, 0x45, 0x4e,
-	0x10, 0x25, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x49, 0x58, 0x54, 0x59, 0x53, 0x45, 0x56, 0x45, 0x4e,
-	0x10, 0x43, 0x12, 0x15, 0x0a, 0x08, 0x4e, 0x45, 0x47, 0x41, 0x54, 0x49, 0x56, 0x45, 0x10, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x65, 0x6e, 0x75, 0x6d,
-	0x73,
-}
-
-var (
-	file_internal_testprotos_enums_enums_proto_rawDescOnce sync.Once
-	file_internal_testprotos_enums_enums_proto_rawDescData = file_internal_testprotos_enums_enums_proto_rawDesc
-)
-
-func file_internal_testprotos_enums_enums_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_enums_enums_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_enums_enums_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_enums_enums_proto_rawDescData)
-	})
-	return file_internal_testprotos_enums_enums_proto_rawDescData
-}
-
-var file_internal_testprotos_enums_enums_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_internal_testprotos_enums_enums_proto_goTypes = []interface{}{
-	(Enum)(0), // 0: goproto.proto.enums.Enum
-}
-var file_internal_testprotos_enums_enums_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_enums_enums_proto_init() }
-func file_internal_testprotos_enums_enums_proto_init() {
-	if File_internal_testprotos_enums_enums_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_enums_enums_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_enums_enums_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_enums_enums_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_enums_enums_proto_enumTypes,
-	}.Build()
-	File_internal_testprotos_enums_enums_proto = out.File
-	file_internal_testprotos_enums_enums_proto_rawDesc = nil
-	file_internal_testprotos_enums_enums_proto_goTypes = nil
-	file_internal_testprotos_enums_enums_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/enums/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/enums/ya.make
deleted file mode 100644
index 25232b9c056..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/enums/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(enums.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/legacy.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/legacy.pb.go
deleted file mode 100644
index d486d3b7c6f..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/legacy.pb.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/legacy/legacy.proto
-
-package legacy
-
-import (
-	proto2_20160225_2fc053c5 "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5"
-	proto2_20160519_a4ab9ec5 "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5"
-	proto2_20180125_92554152 "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152"
-	proto2_20180430_b4deda09 "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09"
-	proto2_20180814_aa810b61 "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61"
-	proto2_20190205_c823c79e "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e"
-	proto3_20160225_2fc053c5 "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5"
-	proto3_20160519_a4ab9ec5 "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5"
-	proto3_20180125_92554152 "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152"
-	proto3_20180430_b4deda09 "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09"
-	proto3_20180814_aa810b61 "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61"
-	proto3_20190205_c823c79e "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Legacy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	F1  *proto2_20160225_2fc053c5.Message `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2  *proto3_20160225_2fc053c5.Message `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"`
-	F3  *proto2_20160519_a4ab9ec5.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	F4  *proto3_20160519_a4ab9ec5.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"`
-	F5  *proto2_20180125_92554152.Message `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"`
-	F6  *proto3_20180125_92554152.Message `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"`
-	F7  *proto2_20180430_b4deda09.Message `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"`
-	F8  *proto3_20180430_b4deda09.Message `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
-	F9  *proto2_20180814_aa810b61.Message `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
-	F10 *proto3_20180814_aa810b61.Message `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
-	F11 *proto2_20190205_c823c79e.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
-	F12 *proto3_20190205_c823c79e.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
-}
-
-func (x *Legacy) Reset() {
-	*x = Legacy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_legacy_legacy_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Legacy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Legacy) ProtoMessage() {}
-
-func (x *Legacy) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_legacy_legacy_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Legacy.ProtoReflect.Descriptor instead.
-func (*Legacy) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_legacy_legacy_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Legacy) GetF1() *proto2_20160225_2fc053c5.Message {
-	if x != nil {
-		return x.F1
-	}
-	return nil
-}
-
-func (x *Legacy) GetF2() *proto3_20160225_2fc053c5.Message {
-	if x != nil {
-		return x.F2
-	}
-	return nil
-}
-
-func (x *Legacy) GetF3() *proto2_20160519_a4ab9ec5.Message {
-	if x != nil {
-		return x.F3
-	}
-	return nil
-}
-
-func (x *Legacy) GetF4() *proto3_20160519_a4ab9ec5.Message {
-	if x != nil {
-		return x.F4
-	}
-	return nil
-}
-
-func (x *Legacy) GetF5() *proto2_20180125_92554152.Message {
-	if x != nil {
-		return x.F5
-	}
-	return nil
-}
-
-func (x *Legacy) GetF6() *proto3_20180125_92554152.Message {
-	if x != nil {
-		return x.F6
-	}
-	return nil
-}
-
-func (x *Legacy) GetF7() *proto2_20180430_b4deda09.Message {
-	if x != nil {
-		return x.F7
-	}
-	return nil
-}
-
-func (x *Legacy) GetF8() *proto3_20180430_b4deda09.Message {
-	if x != nil {
-		return x.F8
-	}
-	return nil
-}
-
-func (x *Legacy) GetF9() *proto2_20180814_aa810b61.Message {
-	if x != nil {
-		return x.F9
-	}
-	return nil
-}
-
-func (x *Legacy) GetF10() *proto3_20180814_aa810b61.Message {
-	if x != nil {
-		return x.F10
-	}
-	return nil
-}
-
-func (x *Legacy) GetF11() *proto2_20190205_c823c79e.Message {
-	if x != nil {
-		return x.F11
-	}
-	return nil
-}
-
-func (x *Legacy) GetF12() *proto3_20190205_c823c79e.Message {
-	if x != nil {
-		return x.F12
-	}
-	return nil
-}
-
-var File_internal_testprotos_legacy_legacy_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_legacy_legacy_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x6c, 0x65, 0x67,
-	0x61, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x36, 0x30, 0x32, 0x32, 0x35, 0x5f, 0x32, 0x66, 0x63, 0x30, 0x35, 0x33, 0x63,
-	0x35, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x36, 0x30, 0x32, 0x32, 0x35, 0x5f, 0x32, 0x66, 0x63, 0x30, 0x35, 0x33, 0x63,
-	0x35, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x36, 0x30, 0x35, 0x31, 0x39, 0x5f, 0x61, 0x34, 0x61, 0x62, 0x39, 0x65, 0x63,
-	0x35, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x36, 0x30, 0x35, 0x31, 0x39, 0x5f, 0x61, 0x34, 0x61, 0x62, 0x39, 0x65, 0x63,
-	0x35, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x31, 0x32, 0x35, 0x5f, 0x39, 0x32, 0x35, 0x35, 0x34, 0x31, 0x35,
-	0x32, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x31, 0x32, 0x35, 0x5f, 0x39, 0x32, 0x35, 0x35, 0x34, 0x31, 0x35,
-	0x32, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x34, 0x33, 0x30, 0x5f, 0x62, 0x34, 0x64, 0x65, 0x64, 0x61, 0x30,
-	0x39, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x34, 0x33, 0x30, 0x5f, 0x62, 0x34, 0x64, 0x65, 0x64, 0x61, 0x30,
-	0x39, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x38, 0x31, 0x34, 0x5f, 0x61, 0x61, 0x38, 0x31, 0x30, 0x62, 0x36,
-	0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x38, 0x30, 0x38, 0x31, 0x34, 0x5f, 0x61, 0x61, 0x38, 0x31, 0x30, 0x62, 0x36,
-	0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f,
-	0x32, 0x30, 0x31, 0x39, 0x30, 0x32, 0x30, 0x35, 0x5f, 0x63, 0x38, 0x32, 0x33, 0x63, 0x37, 0x39,
-	0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f,
-	0x32, 0x30, 0x31, 0x39, 0x30, 0x32, 0x30, 0x35, 0x5f, 0x63, 0x38, 0x32, 0x33, 0x63, 0x37, 0x39,
-	0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xde, 0x05, 0x0a,
-	0x06, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x12, 0x3a, 0x0a, 0x02, 0x66, 0x31, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
-	0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32,
-	0x30, 0x31, 0x36, 0x30, 0x32, 0x32, 0x35, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
-	0x02, 0x66, 0x31, 0x12, 0x3a, 0x0a, 0x02, 0x66, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
-	0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x36, 0x30,
-	0x32, 0x32, 0x35, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x32, 0x12,
-	0x3a, 0x0a, 0x02, 0x66, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32, 0x30, 0x31, 0x36, 0x30, 0x35, 0x31, 0x39, 0x2e,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x33, 0x12, 0x3a, 0x0a, 0x02, 0x66,
-	0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x36, 0x30, 0x35, 0x31, 0x39, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x34, 0x12, 0x3a, 0x0a, 0x02, 0x66, 0x35, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
-	0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32,
-	0x30, 0x31, 0x38, 0x30, 0x31, 0x32, 0x35, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
-	0x02, 0x66, 0x35, 0x12, 0x3a, 0x0a, 0x02, 0x66, 0x36, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
-	0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x38, 0x30,
-	0x31, 0x32, 0x35, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x36, 0x12,
-	0x3a, 0x0a, 0x02, 0x66, 0x37, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32, 0x30, 0x31, 0x38, 0x30, 0x34, 0x33, 0x30, 0x2e,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x37, 0x12, 0x3a, 0x0a, 0x02, 0x66,
-	0x38, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x38, 0x30, 0x34, 0x33, 0x30, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x52, 0x02, 0x66, 0x38, 0x12, 0x3a, 0x0a, 0x02, 0x66, 0x39, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
-	0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32,
-	0x30, 0x31, 0x38, 0x30, 0x38, 0x31, 0x34, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
-	0x02, 0x66, 0x39, 0x12, 0x3c, 0x0a, 0x03, 0x66, 0x31, 0x30, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x38,
-	0x30, 0x38, 0x31, 0x34, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x66, 0x31,
-	0x30, 0x12, 0x3c, 0x0a, 0x03, 0x66, 0x31, 0x31, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
-	0x72, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x5f, 0x32, 0x30, 0x31, 0x39, 0x30, 0x32,
-	0x30, 0x35, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x66, 0x31, 0x31, 0x12,
-	0x3c, 0x0a, 0x03, 0x66, 0x31, 0x32, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x32, 0x30, 0x31, 0x39, 0x30, 0x32, 0x30, 0x35,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x66, 0x31, 0x32, 0x42, 0x37, 0x5a,
-	0x35, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
-	0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
-	0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_internal_testprotos_legacy_legacy_proto_rawDescOnce sync.Once
-	file_internal_testprotos_legacy_legacy_proto_rawDescData = file_internal_testprotos_legacy_legacy_proto_rawDesc
-)
-
-func file_internal_testprotos_legacy_legacy_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_legacy_legacy_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_legacy_legacy_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_legacy_legacy_proto_rawDescData)
-	})
-	return file_internal_testprotos_legacy_legacy_proto_rawDescData
-}
-
-var file_internal_testprotos_legacy_legacy_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_legacy_legacy_proto_goTypes = []interface{}{
-	(*Legacy)(nil),                           // 0: google.golang.org.Legacy
-	(*proto2_20160225_2fc053c5.Message)(nil), // 1: google.golang.org.proto2_20160225.Message
-	(*proto3_20160225_2fc053c5.Message)(nil), // 2: google.golang.org.proto3_20160225.Message
-	(*proto2_20160519_a4ab9ec5.Message)(nil), // 3: google.golang.org.proto2_20160519.Message
-	(*proto3_20160519_a4ab9ec5.Message)(nil), // 4: google.golang.org.proto3_20160519.Message
-	(*proto2_20180125_92554152.Message)(nil), // 5: google.golang.org.proto2_20180125.Message
-	(*proto3_20180125_92554152.Message)(nil), // 6: google.golang.org.proto3_20180125.Message
-	(*proto2_20180430_b4deda09.Message)(nil), // 7: google.golang.org.proto2_20180430.Message
-	(*proto3_20180430_b4deda09.Message)(nil), // 8: google.golang.org.proto3_20180430.Message
-	(*proto2_20180814_aa810b61.Message)(nil), // 9: google.golang.org.proto2_20180814.Message
-	(*proto3_20180814_aa810b61.Message)(nil), // 10: google.golang.org.proto3_20180814.Message
-	(*proto2_20190205_c823c79e.Message)(nil), // 11: google.golang.org.proto2_20190205.Message
-	(*proto3_20190205_c823c79e.Message)(nil), // 12: google.golang.org.proto3_20190205.Message
-}
-var file_internal_testprotos_legacy_legacy_proto_depIdxs = []int32{
-	1,  // 0: google.golang.org.Legacy.f1:type_name -> google.golang.org.proto2_20160225.Message
-	2,  // 1: google.golang.org.Legacy.f2:type_name -> google.golang.org.proto3_20160225.Message
-	3,  // 2: google.golang.org.Legacy.f3:type_name -> google.golang.org.proto2_20160519.Message
-	4,  // 3: google.golang.org.Legacy.f4:type_name -> google.golang.org.proto3_20160519.Message
-	5,  // 4: google.golang.org.Legacy.f5:type_name -> google.golang.org.proto2_20180125.Message
-	6,  // 5: google.golang.org.Legacy.f6:type_name -> google.golang.org.proto3_20180125.Message
-	7,  // 6: google.golang.org.Legacy.f7:type_name -> google.golang.org.proto2_20180430.Message
-	8,  // 7: google.golang.org.Legacy.f8:type_name -> google.golang.org.proto3_20180430.Message
-	9,  // 8: google.golang.org.Legacy.f9:type_name -> google.golang.org.proto2_20180814.Message
-	10, // 9: google.golang.org.Legacy.f10:type_name -> google.golang.org.proto3_20180814.Message
-	11, // 10: google.golang.org.Legacy.f11:type_name -> google.golang.org.proto2_20190205.Message
-	12, // 11: google.golang.org.Legacy.f12:type_name -> google.golang.org.proto3_20190205.Message
-	12, // [12:12] is the sub-list for method output_type
-	12, // [12:12] is the sub-list for method input_type
-	12, // [12:12] is the sub-list for extension type_name
-	12, // [12:12] is the sub-list for extension extendee
-	0,  // [0:12] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_legacy_legacy_proto_init() }
-func file_internal_testprotos_legacy_legacy_proto_init() {
-	if File_internal_testprotos_legacy_legacy_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_legacy_legacy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Legacy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_legacy_legacy_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_legacy_legacy_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_legacy_legacy_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_legacy_legacy_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_legacy_legacy_proto = out.File
-	file_internal_testprotos_legacy_legacy_proto_rawDesc = nil
-	file_internal_testprotos_legacy_legacy_proto_goTypes = nil
-	file_internal_testprotos_legacy_legacy_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/test.pb.go
deleted file mode 100644
index 2f9cad12b43..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/test.pb.go
+++ /dev/null
@@ -1,3534 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go.
-// source: proto2_20160225_2fc053c5/test.proto
-// DO NOT EDIT!
-
-/*
-Package proto2_20160225_2fc053c5 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto2_20160225_2fc053c5/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto2_20160225_2fc053c5
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20160225.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20160225.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	XXX_extensions      map[int32]proto.Extension     `json:"-"`
-	XXX_unrecognized    []byte                        `json:"-"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-var extRange_Message = []proto.ExtensionRange{
-	{10000, 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-func (m *Message) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-type isMessage_OneofDefaultedUnion interface{ isMessage_OneofDefaultedUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum,oneof,def=0"`
-}
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()                          {}
-func (*Message_OneofInt32) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofInt64) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()                      {}
-func (*Message_OneofFloat) isMessage_OneofUnion()                         {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()                      {}
-func (*Message_OneofDouble) isMessage_OneofUnion()                        {}
-func (*Message_OneofString) isMessage_OneofUnion()                        {}
-func (*Message_OneofBytes) isMessage_OneofUnion()                         {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()                     {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()                  {}
-func (*Message_OneofNamedGroup) isMessage_OneofUnion()                    {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()                   {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion()                {}
-func (*Message_Oneofgroup) isMessage_OneofUnion()                         {}
-func (*Message_OneofString1) isMessage_OneofUnion()                       {}
-func (*Message_OneofString2) isMessage_OneofUnion()                       {}
-func (*Message_OneofString3) isMessage_OneofUnion()                       {}
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion()        {}
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion()   {}
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(700<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(701<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(702<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(703<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(704<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(705<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(706<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(707<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(708<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(709<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(710<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(711<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(712<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(713<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(714<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(715<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(716<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofNamedGroup:
-		b.EncodeVarint(717<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNamedGroup); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(718<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(719<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_Oneofgroup:
-		b.EncodeVarint(720<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Oneofgroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		b.EncodeVarint(721<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(722<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(723<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		t := uint64(0)
-		if x.OneofDefaultedBool {
-			t = 1
-		}
-		b.EncodeVarint(800<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofDefaultedInt32:
-		b.EncodeVarint(801<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		b.EncodeVarint(802<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofDefaultedSint32))
-	case *Message_OneofDefaultedUint32:
-		b.EncodeVarint(803<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		b.EncodeVarint(804<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		b.EncodeVarint(805<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofDefaultedSint64))
-	case *Message_OneofDefaultedUint64:
-		b.EncodeVarint(806<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		b.EncodeVarint(807<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedFixed32))
-	case *Message_OneofDefaultedSfixed32:
-		b.EncodeVarint(808<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedSfixed32))
-	case *Message_OneofDefaultedFloat:
-		b.EncodeVarint(809<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofDefaultedFloat)))
-	case *Message_OneofDefaultedFixed64:
-		b.EncodeVarint(810<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedFixed64))
-	case *Message_OneofDefaultedSfixed64:
-		b.EncodeVarint(811<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedSfixed64))
-	case *Message_OneofDefaultedDouble:
-		b.EncodeVarint(812<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDefaultedDouble))
-	case *Message_OneofDefaultedString:
-		b.EncodeVarint(813<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		b.EncodeVarint(814<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		b.EncodeVarint(815<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		b.EncodeVarint(816<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofDefaultedUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 700: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 701: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 702: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 703: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 704: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 705: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 706: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 707: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 708: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 709: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 710: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 711: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 712: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 713: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 714: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 715: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 716: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 717: // oneof_union.oneof_named_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_NamedGroup)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofNamedGroup{msg}
-		return true, err
-	case 718: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 719: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 720: // oneof_union.oneofgroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_OneofGroup)
-		err := b.DecodeGroup(msg)
-		m.OneofUnion = &Message_Oneofgroup{msg}
-		return true, err
-	case 721: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 722: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 723: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	case 800: // oneof_defaulted_union.oneof_defaulted_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBool{x != 0}
-		return true, err
-	case 801: // oneof_defaulted_union.oneof_defaulted_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt32{int32(x)}
-		return true, err
-	case 802: // oneof_defaulted_union.oneof_defaulted_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint32{int32(x)}
-		return true, err
-	case 803: // oneof_defaulted_union.oneof_defaulted_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint32{uint32(x)}
-		return true, err
-	case 804: // oneof_defaulted_union.oneof_defaulted_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt64{int64(x)}
-		return true, err
-	case 805: // oneof_defaulted_union.oneof_defaulted_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint64{int64(x)}
-		return true, err
-	case 806: // oneof_defaulted_union.oneof_defaulted_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint64{x}
-		return true, err
-	case 807: // oneof_defaulted_union.oneof_defaulted_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed32{uint32(x)}
-		return true, err
-	case 808: // oneof_defaulted_union.oneof_defaulted_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed32{int32(x)}
-		return true, err
-	case 809: // oneof_defaulted_union.oneof_defaulted_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 810: // oneof_defaulted_union.oneof_defaulted_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed64{x}
-		return true, err
-	case 811: // oneof_defaulted_union.oneof_defaulted_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed64{int64(x)}
-		return true, err
-	case 812: // oneof_defaulted_union.oneof_defaulted_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedDouble{math.Float64frombits(x)}
-		return true, err
-	case 813: // oneof_defaulted_union.oneof_defaulted_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedString{x}
-		return true, err
-	case 814: // oneof_defaulted_union.oneof_defaulted_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBytes{x}
-		return true, err
-	case 815: // oneof_defaulted_union.oneof_defaulted_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 816: // oneof_defaulted_union.oneof_defaulted_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSiblingEnum{SiblingEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(700<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(701<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(702<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(703<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(704<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(705<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(706<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(707<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(708<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(709<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(710<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(711<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(712<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(713<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(714<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(715<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(716<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofNamedGroup:
-		s := proto.Size(x.OneofNamedGroup)
-		n += proto.SizeVarint(717<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(718<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(719<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_Oneofgroup:
-		n += proto.SizeVarint(720<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Oneofgroup)
-		n += proto.SizeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		n += proto.SizeVarint(721<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(722<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(723<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		n += proto.SizeVarint(800<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofDefaultedInt32:
-		n += proto.SizeVarint(801<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		n += proto.SizeVarint(802<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofDefaultedSint32) << 1) ^ uint32((int32(x.OneofDefaultedSint32) >> 31))))
-	case *Message_OneofDefaultedUint32:
-		n += proto.SizeVarint(803<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		n += proto.SizeVarint(804<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		n += proto.SizeVarint(805<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofDefaultedSint64<<1) ^ uint64((int64(x.OneofDefaultedSint64) >> 63))))
-	case *Message_OneofDefaultedUint64:
-		n += proto.SizeVarint(806<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		n += proto.SizeVarint(807<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedSfixed32:
-		n += proto.SizeVarint(808<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFloat:
-		n += proto.SizeVarint(809<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFixed64:
-		n += proto.SizeVarint(810<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedSfixed64:
-		n += proto.SizeVarint(811<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedDouble:
-		n += proto.SizeVarint(812<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedString:
-		n += proto.SizeVarint(813<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedString)))
-		n += len(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		n += proto.SizeVarint(814<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedBytes)))
-		n += len(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		n += proto.SizeVarint(815<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		n += proto.SizeVarint(816<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool,json=extensionOptionalBool",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32,json=extensionOptionalInt32",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32,json=extensionOptionalSint32",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32,json=extensionOptionalUint32",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64,json=extensionOptionalInt64",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64,json=extensionOptionalSint64",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64,json=extensionOptionalUint64",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32,json=extensionOptionalFixed32",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32,json=extensionOptionalSfixed32",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float,json=extensionOptionalFloat",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64,json=extensionOptionalFixed64",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64,json=extensionOptionalSfixed64",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double,json=extensionOptionalDouble",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string,json=extensionOptionalString",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes,json=extensionOptionalBytes",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,json=extensionOptionalChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message,json=extensionOptionalChildMessage",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group,json=extensionOptionalNamedGroup",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,json=extensionOptionalSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message,json=extensionOptionalSiblingMessage",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20160225.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup,json=extensionoptionalgroup",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,json=extensionDefaultedBool,def=1",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,json=extensionDefaultedInt32,def=-12345",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,json=extensionDefaultedSint32,def=-3200",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,json=extensionDefaultedUint32,def=3200",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,json=extensionDefaultedInt64,def=-123456789",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,json=extensionDefaultedSint64,def=-6400",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,json=extensionDefaultedUint64,def=6400",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,json=extensionDefaultedFixed32,def=320000",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,json=extensionDefaultedSfixed32,def=-320000",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,json=extensionDefaultedFloat,def=3.14159",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,json=extensionDefaultedFixed64,def=640000",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,json=extensionDefaultedSfixed64,def=-640000",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,json=extensionDefaultedDouble,def=3.14159265359",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,json=extensionDefaultedString,def=hello, \"world!\"\n",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,json=extensionDefaultedBytes,def=dead\\336\\255\\276\\357beef",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,json=extensionDefaultedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum,def=0",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,json=extensionDefaultedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum,def=0",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool,json=extensionRepeatedBool",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32,json=extensionRepeatedInt32",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32,json=extensionRepeatedSint32",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32,json=extensionRepeatedUint32",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64,json=extensionRepeatedInt64",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64,json=extensionRepeatedSint64",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64,json=extensionRepeatedUint64",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32,json=extensionRepeatedFixed32",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32,json=extensionRepeatedSfixed32",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float,json=extensionRepeatedFloat",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64,json=extensionRepeatedFixed64",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64,json=extensionRepeatedSfixed64",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double,json=extensionRepeatedDouble",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string,json=extensionRepeatedString",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes,json=extensionRepeatedBytes",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,json=extensionRepeatedChildEnum,enum=google.golang.org.proto2_20160225.Message_ChildEnum",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message,json=extensionRepeatedChildMessage",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group,json=extensionRepeatedNamedGroup",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,json=extensionRepeatedSiblingEnum,enum=google.golang.org.proto2_20160225.SiblingEnum",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20160225.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message,json=extensionRepeatedSiblingMessage",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20160225.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup,json=extensionrepeatedgroup",
-}
-
-type Message_ChildMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()                    { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()               {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()                    { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()               {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 2} }
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()                    { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()               {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 3} }
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()                    { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()               {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 4} }
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()                    { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()               {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 33} }
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 34}
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 35}
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20160225.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20160225.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20160225.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20160225.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20160225.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20160225.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20160225.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20160225.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20160225.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20160225.Message.ExtensionRepeatedGroup")
-	proto.RegisterEnum("google.golang.org.proto2_20160225.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20160225.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-}
-
-var fileDescriptor0 = []byte{
-	// 4469 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x69, 0x70, 0x23, 0xc7,
-	0x75, 0xe6, 0x00, 0x04, 0xb8, 0xec, 0x25, 0x48, 0x70, 0x76, 0x97, 0x9c, 0xa5, 0xa4, 0x08, 0x5e,
-	0x3b, 0x0e, 0xa2, 0x68, 0xb9, 0xe4, 0xb0, 0xd9, 0x2b, 0x21, 0x3a, 0xbc, 0x94, 0x56, 0x86, 0x1c,
-	0x0b, 0x72, 0x8d, 0x6a, 0x53, 0xa9, 0x94, 0x2a, 0x0c, 0x77, 0x09, 0x70, 0x29, 0xe1, 0xa0, 0x48,
-	0x40, 0xd2, 0xc6, 0x4e, 0x69, 0xe3, 0x9c, 0x3f, 0xe5, 0xfb, 0x82, 0x6d, 0x59, 0xb7, 0x2d, 0x69,
-	0x25, 0xdf, 0x97, 0x2e, 0x1f, 0x49, 0xe4, 0xfb, 0xca, 0xe1, 0x5c, 0xce, 0x7d, 0x39, 0xf7, 0x7d,
-	0x1f, 0xd5, 0xfd, 0xba, 0xa7, 0xbb, 0x67, 0x7a, 0x40, 0xf6, 0xc0, 0xa5, 0x1f, 0xaa, 0xd2, 0x36,
-	0x5e, 0xbf, 0xaf, 0xdf, 0x87, 0x7e, 0xef, 0x7d, 0xec, 0x99, 0x06, 0x7a, 0xe9, 0xd6, 0x76, 0xa7,
-	0xdb, 0xf1, 0x57, 0xfd, 0x85, 0x45, 0xb2, 0xe0, 0xfb, 0xcb, 0xab, 0x7e, 0xe3, 0xcc, 0xc2, 0xf2,
-	0xd2, 0x99, 0xe5, 0x63, 0xdd, 0xfa, 0x4e, 0x77, 0x9e, 0x7d, 0xea, 0xbe, 0x64, 0xa3, 0xd3, 0xd9,
-	0x68, 0xd6, 0xe7, 0x37, 0x3a, 0xcd, 0xb5, 0xf6, 0xc6, 0x7c, 0x67, 0x7b, 0x63, 0x3e, 0x32, 0xed,
-	0xc8, 0xeb, 0xd0, 0xe4, 0x2d, 0x9b, 0xa7, 0x9b, 0x9b, 0xed, 0x8d, 0x9b, 0xea, 0x3b, 0x3b, 0x6b,
-	0x1b, 0x75, 0x77, 0x12, 0x65, 0x1a, 0x8b, 0x9e, 0x53, 0x72, 0xca, 0xe3, 0x41, 0xa6, 0xb1, 0xc8,
-	0xfe, 0xed, 0x7b, 0x99, 0x52, 0x86, 0xfd, 0xdb, 0x67, 0xff, 0x5e, 0xf2, 0xb2, 0xa5, 0x2c, 0xfb,
-	0xf7, 0x92, 0x5b, 0x41, 0x99, 0x06, 0xf6, 0x46, 0x4b, 0x4e, 0x79, 0xbf, 0x7f, 0xd9, 0xfc, 0xae,
-	0x88, 0xf3, 0x1c, 0x27, 0xc8, 0x34, 0xf0, 0x91, 0xef, 0x3c, 0xe6, 0xa0, 0x31, 0x01, 0x7c, 0x0a,
-	0xa1, 0xf6, 0x5a, 0xab, 0xbe, 0xbe, 0xb1, 0xdd, 0xe9, 0x6d, 0xb1, 0x05, 0x20, 0x7f, 0x79, 0xef,
-	0x0e, 0xe7, 0x6b, 0x74, 0xf2, 0x2b, 0xe9, 0xe4, 0x40, 0x71, 0xe4, 0xbe, 0x14, 0x15, 0x3a, 0x5b,
-	0xdd, 0xcd, 0x4e, 0x7b, 0xad, 0xb9, 0x7a, 0xba, 0xd3, 0x69, 0x7a, 0xeb, 0x25, 0xa7, 0xbc, 0x2f,
-	0x98, 0x10, 0x83, 0x2b, 0x9d, 0x4e, 0xd3, 0xfd, 0x7e, 0x34, 0x19, 0x1a, 0x6d, 0xb6, 0xbb, 0x4b,
-	0xbe, 0x57, 0x2f, 0x39, 0xe5, 0x5c, 0x10, 0x4e, 0xbd, 0x91, 0x0e, 0xba, 0x3f, 0x80, 0xa6, 0x42,
-	0xb3, 0x1d, 0xb0, 0x6b, 0x94, 0x9c, 0xf2, 0x74, 0x10, 0xce, 0xbe, 0x65, 0x33, 0x66, 0xd8, 0x03,
-	0xc3, 0x8d, 0x92, 0x53, 0x2e, 0x48, 0xc3, 0x53, 0x60, 0x18, 0x01, 0x26, 0xd8, 0x3b, 0x5b, 0x72,
-	0xca, 0x59, 0x0d, 0x98, 0xe0, 0x18, 0x30, 0xc1, 0xde, 0x66, 0xc9, 0x29, 0xbb, 0x3a, 0x70, 0xc4,
-	0xb0, 0x07, 0x86, 0xb7, 0x95, 0x9c, 0xf2, 0xa8, 0x0e, 0x4c, 0xb0, 0xfb, 0x83, 0xa8, 0x18, 0x1a,
-	0x36, 0x36, 0xef, 0xae, 0xaf, 0x2f, 0xf9, 0xde, 0xed, 0x25, 0xa7, 0x3c, 0x16, 0x84, 0x0e, 0x6e,
-	0x80, 0x61, 0xf7, 0x87, 0xd0, 0xb4, 0x04, 0x17, 0xb6, 0xcd, 0x92, 0x53, 0x9e, 0x0a, 0x42, 0x1f,
-	0xb7, 0xf0, 0x71, 0x2d, 0xa0, 0x46, 0xb3, 0xb3, 0xd6, 0xf5, 0x5a, 0x25, 0xa7, 0x9c, 0x91, 0x01,
-	0xdd, 0x40, 0x07, 0xe3, 0xf0, 0x04, 0x7b, 0xed, 0x92, 0x53, 0xce, 0x47, 0xe0, 0x09, 0x36, 0xc0,
-	0x13, 0xec, 0x75, 0x4a, 0x4e, 0xb9, 0x18, 0x85, 0x8f, 0xc4, 0xbf, 0xde, 0xe9, 0x9d, 0x6e, 0xd6,
-	0xbd, 0xad, 0x92, 0x53, 0x76, 0x64, 0xfc, 0xd7, 0xb3, 0x51, 0x9d, 0xd1, 0xee, 0xf6, 0x66, 0x7b,
-	0xc3, 0xbb, 0x83, 0xed, 0x79, 0xc9, 0x28, 0x1b, 0xd5, 0x02, 0x3a, 0x7d, 0xae, 0x5b, 0xdf, 0xf1,
-	0xb6, 0x4b, 0x4e, 0x79, 0x42, 0x06, 0xb4, 0x42, 0x07, 0xdd, 0x75, 0x74, 0x20, 0x34, 0x3b, 0x73,
-	0x76, 0xb3, 0xb9, 0xbe, 0x5a, 0x6f, 0xf7, 0x5a, 0xde, 0x4e, 0xc9, 0x29, 0x4f, 0xfa, 0xd8, 0x62,
-	0x1b, 0x5f, 0x47, 0x27, 0x9f, 0x6c, 0xf7, 0x5a, 0x41, 0x18, 0x76, 0x38, 0xe4, 0xb6, 0xd0, 0x4c,
-	0x04, 0xa5, 0x05, 0xd3, 0xbc, 0x2e, 0x4b, 0xc0, 0xe3, 0xb6, 0x40, 0x22, 0x1b, 0x0f, 0x6a, 0x58,
-	0x22, 0x25, 0x37, 0x50, 0x38, 0xbe, 0xca, 0x52, 0x6a, 0x15, 0x92, 0xb3, 0xc7, 0xc0, 0x52, 0x26,
-	0xa7, 0x2b, 0x5c, 0xca, 0x31, 0xf7, 0x34, 0x3a, 0xa4, 0xec, 0x6f, 0x56, 0x8f, 0x80, 0xbf, 0x3b,
-	0x19, 0x7f, 0xf3, 0x7b, 0x40, 0xe2, 0x65, 0x8c, 0x31, 0x77, 0x40, 0x66, 0x45, 0x38, 0xe8, 0xde,
-	0x8e, 0xbc, 0x18, 0x86, 0x60, 0xef, 0x2e, 0x16, 0xd0, 0xe2, 0xde, 0x61, 0x04, 0x6f, 0x33, 0x11,
-	0x24, 0xc1, 0xdc, 0x4f, 0xc8, 0xaa, 0x03, 0x94, 0xdd, 0xcd, 0xea, 0xd9, 0x15, 0x16, 0x94, 0xdd,
-	0xcc, 0xe7, 0x03, 0x6b, 0xba, 0x3b, 0xf7, 0x72, 0x34, 0xb9, 0x5e, 0x6f, 0xac, 0xf5, 0x9a, 0xdd,
-	0xfa, 0x3a, 0x94, 0xb5, 0x17, 0x68, 0xc5, 0xdc, 0x57, 0x19, 0xed, 0x6e, 0xf7, 0xea, 0x41, 0x21,
-	0xfc, 0x90, 0x95, 0xb7, 0x05, 0x34, 0x25, 0xad, 0xa1, 0x1c, 0x7d, 0x81, 0x9a, 0xe7, 0x2a, 0xf9,
-	0xa3, 0x8b, 0xfe, 0x12, 0x5e, 0x0e, 0xa4, 0x37, 0xa8, 0x74, 0x8b, 0xa8, 0x28, 0x67, 0xf0, 0x52,
-	0xf7, 0x45, 0x3a, 0x65, 0xba, 0x92, 0x3b, 0xba, 0xe4, 0x2f, 0x2c, 0x04, 0xd2, 0x23, 0xaf, 0x79,
-	0x0b, 0xea, 0x14, 0x5e, 0xf4, 0xbe, 0x44, 0xa7, 0x14, 0x2a, 0xa3, 0x91, 0x19, 0xbc, 0xf8, 0xe1,
-	0xc8, 0xb2, 0x08, 0xf6, 0xbe, 0x4c, 0x27, 0x64, 0x2b, 0x08, 0x96, 0x45, 0x8e, 0x5f, 0x71, 0xa5,
-	0xbe, 0x34, 0x82, 0xe3, 0x4b, 0x23, 0xd8, 0xfb, 0x0a, 0x9d, 0xe6, 0x56, 0x72, 0x47, 0x09, 0x8e,
-	0x2d, 0x8d, 0xe0, 0xf8, 0xd2, 0x08, 0xf6, 0xbe, 0x4a, 0xa7, 0x8c, 0x56, 0x46, 0x23, 0x33, 0x78,
-	0x79, 0xc4, 0x68, 0x5a, 0xce, 0x10, 0x35, 0xef, 0x6b, 0x74, 0xca, 0x58, 0x25, 0x4f, 0xa3, 0x59,
-	0x58, 0x08, 0xa4, 0x4f, 0x51, 0x29, 0x8f, 0x23, 0x57, 0x59, 0x9a, 0x98, 0xf6, 0x75, 0x3a, 0x6d,
-	0xaa, 0x32, 0x76, 0x94, 0xcf, 0x93, 0x9e, 0xc3, 0xaa, 0xb9, 0xa8, 0x32, 0x01, 0x65, 0xf3, 0x1b,
-	0x74, 0x56, 0xa6, 0x32, 0xb6, 0x34, 0xbf, 0x88, 0x17, 0x97, 0x55, 0x1a, 0xa0, 0x82, 0xc6, 0x57,
-	0x48, 0xb0, 0xf7, 0x4d, 0x3a, 0x29, 0x5f, 0xc9, 0xd3, 0xa0, 0xe2, 0x2b, 0x24, 0xd8, 0xb4, 0x42,
-	0x82, 0xbd, 0x6f, 0xd1, 0x69, 0xc5, 0xca, 0xd8, 0x51, 0x3e, 0x2f, 0xba, 0x42, 0x82, 0xdd, 0x2b,
-	0x55, 0x0a, 0x79, 0x65, 0xfd, 0x35, 0x3a, 0xcd, 0xa9, 0x14, 0xf8, 0x12, 0x7d, 0xb2, 0xbc, 0xb4,
-	0x7c, 0xa5, 0xc2, 0x25, 0x2f, 0xb5, 0x57, 0x69, 0x5f, 0x18, 0xd4, 0xda, 0x5f, 0x67, 0x02, 0xa3,
-	0x52, 0x3c, 0x5b, 0x6f, 0x36, 0x3b, 0x97, 0x97, 0x8e, 0xdc, 0xd5, 0xd9, 0x6e, 0xae, 0xbf, 0xe4,
-	0x08, 0x52, 0xbf, 0x3b, 0xa8, 0xbf, 0x2b, 0x2a, 0x35, 0x50, 0x80, 0x7f, 0x83, 0x4e, 0x9e, 0xa8,
-	0x78, 0xeb, 0xf5, 0xb5, 0xf5, 0x5b, 0x97, 0x96, 0xc8, 0xad, 0xfe, 0xf2, 0xf2, 0xad, 0xfe, 0x71,
-	0x72, 0xeb, 0xd2, 0xf2, 0xf1, 0xd3, 0xf5, 0x7a, 0x43, 0xe1, 0x0a, 0x8a, 0x73, 0x1b, 0x1d, 0x94,
-	0x3e, 0x94, 0xea, 0xfc, 0x9b, 0x4e, 0xfa, 0xf2, 0x5c, 0xc9, 0x9d, 0x78, 0xf5, 0x6b, 0xaa, 0x27,
-	0x02, 0xc9, 0xa7, 0x2c, 0xd3, 0x4d, 0x34, 0xa3, 0x6e, 0x51, 0xa5, 0x9e, 0x7d, 0xdb, 0x49, 0x53,
-	0xd0, 0x04, 0xd6, 0x41, 0x65, 0x63, 0xcb, 0xc2, 0xf6, 0x32, 0x54, 0xd8, 0xae, 0xdf, 0xd1, 0xdb,
-	0xdc, 0x16, 0xa5, 0xe0, 0x71, 0xaa, 0xd6, 0xf6, 0x05, 0x13, 0x62, 0x94, 0xd5, 0x80, 0x97, 0xa3,
-	0xc9, 0xd0, 0x0a, 0x92, 0xf3, 0x09, 0x6a, 0x96, 0x0b, 0xc2, 0xc9, 0x90, 0xf9, 0x65, 0x34, 0x15,
-	0xda, 0xf1, 0xc4, 0xbf, 0x40, 0x0d, 0xa7, 0x83, 0x70, 0x3e, 0x4f, 0x78, 0xd5, 0x92, 0xe7, 0xfb,
-	0x93, 0xd4, 0xb2, 0x20, 0x2d, 0x79, 0xa2, 0x47, 0xb0, 0x09, 0xf6, 0x9e, 0xa2, 0x86, 0x59, 0x0d,
-	0x9b, 0xe0, 0x18, 0x36, 0xc1, 0xde, 0x07, 0xa9, 0xa1, 0xab, 0x63, 0x47, 0x2c, 0x79, 0x42, 0x7f,
-	0x88, 0x5a, 0x8e, 0xea, 0xd8, 0x04, 0xbb, 0x97, 0xa1, 0x62, 0x68, 0x29, 0x32, 0xf2, 0xc3, 0xd4,
-	0x74, 0x2c, 0x08, 0x5d, 0x88, 0xfc, 0xbd, 0x1c, 0x4d, 0x4b, 0x7c, 0x61, 0xfc, 0x11, 0x6a, 0x3c,
-	0x15, 0x84, 0x5e, 0xc2, 0xa4, 0x55, 0xa3, 0x82, 0x9c, 0xfd, 0x28, 0x35, 0xcd, 0xc8, 0xa8, 0x20,
-	0x53, 0x63, 0x2b, 0x20, 0xd8, 0xfb, 0x18, 0xb5, 0xcc, 0x47, 0x56, 0x40, 0xb0, 0x61, 0x05, 0x04,
-	0x7b, 0x1f, 0xa7, 0xc6, 0xc5, 0xe8, 0x0a, 0x22, 0x2c, 0xf0, 0x9c, 0xfc, 0x04, 0xb5, 0x75, 0x24,
-	0x0b, 0x3c, 0x07, 0x35, 0x66, 0x21, 0x05, 0x3f, 0x09, 0x9a, 0x5e, 0x32, 0x0b, 0xf9, 0xa6, 0x46,
-	0x05, 0xe9, 0xf6, 0x29, 0x6a, 0x38, 0x21, 0xa3, 0x82, 0x9c, 0xaa, 0xa3, 0x03, 0xa1, 0x9d, 0x92,
-	0x52, 0x9f, 0xa6, 0xc6, 0xa9, 0x15, 0x8f, 0xf0, 0x28, 0x53, 0xa9, 0x8d, 0x66, 0x22, 0x30, 0xa2,
-	0x67, 0x3f, 0x4d, 0x91, 0x86, 0x91, 0x3c, 0x1a, 0x98, 0x68, 0xdc, 0x67, 0x51, 0x38, 0xae, 0x49,
-	0x9e, 0x67, 0x00, 0x2d, 0xad, 0xe6, 0x11, 0x3e, 0x15, 0xcd, 0x73, 0x06, 0x1d, 0x52, 0x36, 0xbb,
-	0x52, 0x23, 0x9e, 0x05, 0x0a, 0xad, 0x45, 0x8f, 0x4c, 0x11, 0x59, 0x1b, 0x9a, 0xc8, 0x8b, 0x81,
-	0x08, 0x02, 0x9f, 0x83, 0x90, 0xd2, 0xa8, 0x9e, 0x08, 0x94, 0x20, 0x6f, 0x55, 0x56, 0x22, 0x60,
-	0xed, 0x79, 0x0a, 0x61, 0x27, 0x7b, 0x02, 0xee, 0x80, 0xcb, 0x1e, 0xcd, 0x9f, 0x7b, 0x35, 0x9a,
-	0x95, 0x1b, 0x5e, 0xd7, 0x3f, 0xf7, 0x66, 0x69, 0xd1, 0xe3, 0xfa, 0x27, 0x64, 0xf6, 0x7a, 0x4d,
-	0x07, 0x9d, 0x50, 0xd8, 0x88, 0x0a, 0xa2, 0x37, 0xd0, 0xf9, 0x52, 0x10, 0xcd, 0xc4, 0x3c, 0x40,
-	0x79, 0x5c, 0x41, 0x87, 0x0d, 0x2e, 0x78, 0xa1, 0x7c, 0x23, 0xf5, 0x11, 0x2a, 0xa4, 0xd9, 0x98,
-	0x0b, 0x5e, 0x38, 0x4f, 0x18, 0x7d, 0xf0, 0x12, 0xfa, 0x26, 0xea, 0x43, 0x48, 0xa6, 0xb8, 0x0b,
-	0x5e, 0x51, 0x4f, 0x26, 0x45, 0x42, 0xb0, 0xf7, 0x66, 0xea, 0x41, 0xd7, 0x50, 0xc6, 0x68, 0x08,
-	0x1e, 0x10, 0x0d, 0xc1, 0xde, 0x5b, 0xa8, 0x9f, 0x50, 0x54, 0x99, 0xa3, 0x21, 0x78, 0x40, 0x34,
-	0x04, 0x7b, 0x6f, 0xa5, 0x3e, 0x84, 0xca, 0x32, 0x47, 0x43, 0xb0, 0x7b, 0x12, 0xcd, 0x19, 0x5c,
-	0x88, 0x02, 0xfc, 0x36, 0xea, 0x43, 0xca, 0x2e, 0x2f, 0xe6, 0x45, 0x94, 0xef, 0x2a, 0xba, 0xc8,
-	0x14, 0x8d, 0xf0, 0xf3, 0x76, 0xea, 0x47, 0xd1, 0x61, 0x87, 0xe3, 0x11, 0x89, 0xd2, 0xbe, 0x62,
-	0xa4, 0x17, 0x8a, 0xfc, 0x3b, 0xa8, 0x1b, 0x45, 0x98, 0xc5, 0xb9, 0x85, 0xb2, 0x3f, 0x20, 0x28,
-	0x82, 0xbd, 0x77, 0x52, 0x2f, 0x52, 0xa9, 0x25, 0x04, 0x45, 0xf0, 0xc0, 0xa0, 0x08, 0xf6, 0xde,
-	0x45, 0xfd, 0x28, 0xd2, 0x2d, 0x29, 0x28, 0x82, 0xdd, 0x57, 0x19, 0xbf, 0x28, 0xde, 0x37, 0xfa,
-	0xd4, 0x4f, 0x4c, 0xcb, 0xc5, 0xbf, 0x31, 0xde, 0x4f, 0x6e, 0x32, 0x6f, 0x1c, 0xe8, 0x2c, 0xef,
-	0xa6, 0xbe, 0x4c, 0xe2, 0xce, 0xb0, 0x87, 0xa0, 0xe9, 0xdc, 0x62, 0xe4, 0x1b, 0xda, 0xcf, 0x7b,
-	0xa8, 0xb7, 0x41, 0x6a, 0x2f, 0xfe, 0x05, 0x40, 0x87, 0xba, 0x07, 0x5d, 0x62, 0x70, 0xaa, 0xf4,
-	0xaa, 0xf7, 0x66, 0xd3, 0xf7, 0x2a, 0x21, 0xc9, 0xe6, 0x62, 0xe0, 0xb2, 0x77, 0xfd, 0x34, 0xba,
-	0xd4, 0x98, 0x5d, 0x4a, 0xad, 0xbf, 0x2f, 0x9b, 0xa6, 0xd6, 0x0b, 0xf0, 0x8b, 0x0d, 0x39, 0x19,
-	0xd1, 0x85, 0x5b, 0xf5, 0xb5, 0xb0, 0x44, 0xfe, 0x73, 0xb6, 0x94, 0x05, 0x5d, 0x08, 0xa3, 0x52,
-	0x17, 0x72, 0x2b, 0xa8, 0x40, 0xff, 0x42, 0xcd, 0x98, 0x2e, 0x84, 0x61, 0x45, 0x17, 0x72, 0x3b,
-	0x5e, 0xee, 0xfe, 0x95, 0x1a, 0x32, 0x5d, 0x08, 0xe3, 0xaa, 0x2e, 0xe4, 0x96, 0xbc, 0xa8, 0xfd,
-	0x1b, 0xb5, 0x2c, 0x48, 0x4b, 0x55, 0x17, 0x4a, 0x6c, 0x82, 0xbd, 0x7f, 0xa7, 0x86, 0x59, 0x0d,
-	0x5b, 0xe8, 0x1c, 0x05, 0x9b, 0x60, 0xef, 0x3f, 0xa8, 0xa1, 0xab, 0x63, 0x47, 0x2c, 0x79, 0x09,
-	0xfa, 0x4f, 0x6a, 0x39, 0xaa, 0x63, 0x0b, 0x5d, 0xc8, 0x2d, 0x45, 0x85, 0xf8, 0x2f, 0x6a, 0xca,
-	0x74, 0x21, 0x7c, 0xa0, 0xe9, 0x42, 0x81, 0x2f, 0x8c, 0xff, 0x9b, 0x1a, 0x33, 0x5d, 0xc8, 0x57,
-	0xa0, 0xe9, 0x42, 0xe1, 0x99, 0x95, 0x8c, 0xff, 0xa1, 0xa6, 0x19, 0x19, 0x95, 0xa2, 0x0b, 0xd5,
-	0x15, 0x10, 0xec, 0xfd, 0x2f, 0xb5, 0xcc, 0x47, 0x56, 0x20, 0x74, 0xa1, 0xb6, 0x02, 0x82, 0xbd,
-	0xff, 0xa3, 0xc6, 0xc5, 0xe8, 0x0a, 0x22, 0x2c, 0xf0, 0xfc, 0x3e, 0x3f, 0x5a, 0xca, 0x82, 0x2e,
-	0x84, 0x71, 0x55, 0x17, 0x0a, 0xbf, 0x90, 0xbd, 0x3f, 0x33, 0xca, 0xce, 0x76, 0x25, 0xb3, 0x8a,
-	0x2e, 0x14, 0xbb, 0x89, 0x25, 0xe6, 0xeb, 0xa9, 0xe1, 0x84, 0x8c, 0x4a, 0xd1, 0x85, 0xdc, 0x4e,
-	0xc9, 0xb5, 0x9f, 0xa5, 0xc6, 0x43, 0xe8, 0x42, 0xf0, 0x18, 0xd1, 0x85, 0x1a, 0x8c, 0x90, 0x35,
-	0x3f, 0x47, 0x91, 0x86, 0xd3, 0x85, 0x0a, 0x98, 0xa6, 0x0b, 0x39, 0x9e, 0xaa, 0x0b, 0x7f, 0x1e,
-	0xd0, 0xd2, 0xeb, 0x42, 0xf0, 0x19, 0xd5, 0x85, 0xe1, 0x66, 0x57, 0x6a, 0xc5, 0x2f, 0x00, 0x85,
-	0x29, 0x74, 0xa1, 0x48, 0x91, 0x88, 0x2e, 0x8c, 0x80, 0x08, 0x02, 0x7f, 0x11, 0x42, 0x4a, 0xa7,
-	0x0b, 0x35, 0x28, 0x4d, 0x17, 0xc2, 0x27, 0xc0, 0xda, 0x2f, 0x51, 0x08, 0x5b, 0x5d, 0x08, 0x0e,
-	0x42, 0x5d, 0xa8, 0xf8, 0x73, 0x7f, 0x12, 0x15, 0x5a, 0x6b, 0x5b, 0xac, 0xca, 0x41, 0xa9, 0xfb,
-	0x36, 0xc4, 0xf0, 0xc3, 0x16, 0x00, 0x37, 0xad, 0x6d, 0xd1, 0x82, 0x48, 0xff, 0x3b, 0xd9, 0xee,
-	0x6e, 0x9f, 0x0b, 0xf6, 0xb7, 0xe4, 0x88, 0x7b, 0x06, 0x4d, 0x86, 0x08, 0x50, 0xd3, 0x7e, 0x0b,
-	0x20, 0xae, 0xb2, 0x87, 0x60, 0x05, 0x15, 0x30, 0x26, 0x5a, 0xca, 0x90, 0xdb, 0x40, 0x53, 0x21,
-	0x08, 0xaf, 0xb1, 0xbf, 0x0d, 0x28, 0x57, 0xdb, 0xa3, 0x40, 0x35, 0x06, 0x98, 0x42, 0x4b, 0x1d,
-	0xd3, 0x70, 0x78, 0x85, 0xfe, 0x9d, 0xd4, 0x38, 0xa7, 0x0c, 0x38, 0xbc, 0xbe, 0x47, 0x48, 0x23,
-	0xd8, 0xfb, 0xdd, 0x61, 0x48, 0x23, 0x38, 0x46, 0x1a, 0xc1, 0x31, 0xd2, 0x08, 0xf6, 0x7e, 0x6f,
-	0x28, 0xd2, 0x04, 0x8c, 0x4a, 0x5a, 0x04, 0x87, 0xb7, 0x96, 0xef, 0x0c, 0x45, 0x5a, 0x14, 0x87,
-	0x37, 0xa6, 0x4d, 0x54, 0x0c, 0x71, 0x44, 0xaf, 0xf9, 0x7d, 0x00, 0xba, 0xc6, 0x1e, 0x88, 0xb7,
-	0x30, 0x40, 0x9a, 0x6c, 0x69, 0x83, 0x6e, 0x13, 0x4d, 0x4b, 0xea, 0x04, 0xd6, 0x1f, 0x00, 0xd6,
-	0xb5, 0x29, 0xc8, 0x6b, 0xa8, 0x60, 0x53, 0x2d, 0x7d, 0x54, 0xdb, 0x0d, 0xd0, 0x17, 0xff, 0x30,
-	0xf5, 0x6e, 0x60, 0x1d, 0x54, 0xdf, 0x0d, 0xd0, 0x54, 0x63, 0xec, 0x11, 0xec, 0xfd, 0xd1, 0x70,
-	0xec, 0x89, 0xef, 0x49, 0x63, 0x8f, 0x60, 0x03, 0x7b, 0x04, 0x7b, 0x7f, 0x3c, 0x24, 0x7b, 0x02,
-	0x4c, 0x67, 0x2f, 0xb2, 0xfd, 0x78, 0x4f, 0xff, 0x93, 0xd4, 0xdb, 0x0f, 0xba, 0xbf, 0xbe, 0xfd,
-	0xb8, 0x22, 0xd0, 0xd2, 0x09, 0x14, 0xc1, 0x9f, 0xa6, 0x4f, 0x27, 0xe6, 0x20, 0x92, 0x4e, 0xa0,
-	0x27, 0xd4, 0xdd, 0x00, 0x7a, 0xe2, 0xcf, 0x52, 0xef, 0x06, 0xa6, 0x3c, 0xf4, 0xdd, 0x00, 0x62,
-	0x64, 0x0b, 0x1d, 0x08, 0x41, 0x14, 0x31, 0xf2, 0xe7, 0x80, 0xf4, 0x0a, 0x7b, 0xa4, 0x50, 0x80,
-	0x00, 0x5a, 0xb1, 0x15, 0x19, 0x76, 0xcf, 0xa1, 0x99, 0x08, 0xa2, 0x68, 0xab, 0x7f, 0x01, 0xa0,
-	0xd7, 0xa5, 0x04, 0xe5, 0x63, 0x80, 0x7b, 0xa0, 0x15, 0xff, 0xc4, 0xdd, 0x41, 0x07, 0x43, 0x68,
-	0x55, 0xa2, 0xfc, 0x25, 0x00, 0x9f, 0xb0, 0x07, 0x96, 0xaa, 0x04, 0x60, 0xa7, 0x5b, 0xd1, 0x71,
-	0xf7, 0x4e, 0x74, 0x48, 0xa9, 0xbe, 0x8a, 0x5a, 0xf9, 0x2e, 0xa0, 0xae, 0xa4, 0xa9, 0xc1, 0xa1,
-	0x4e, 0x01, 0x58, 0xb7, 0x15, 0xfb, 0xc0, 0xbd, 0x07, 0x79, 0x31, 0x5c, 0xc1, 0xf4, 0x5f, 0x01,
-	0xf4, 0xc9, 0xd4, 0xd0, 0x1a, 0xd7, 0x87, 0x5a, 0xa6, 0xcf, 0xc4, 0xfe, 0x65, 0x8d, 0x0e, 0x34,
-	0xc7, 0x5f, 0xa7, 0xda, 0xbf, 0xac, 0xf3, 0x4b, 0xd1, 0x41, 0xf7, 0x6f, 0x38, 0x24, 0x92, 0x71,
-	0x47, 0x41, 0xf9, 0x9b, 0x54, 0xc9, 0x08, 0x8d, 0x5f, 0xc2, 0xd0, 0x64, 0x94, 0x63, 0x02, 0xa7,
-	0xa7, 0xe0, 0xfc, 0x6d, 0x2a, 0x9c, 0x53, 0x06, 0x1c, 0x39, 0xa6, 0x90, 0x46, 0x30, 0xc0, 0xfc,
-	0x5d, 0x5a, 0xd2, 0x08, 0x8e, 0x91, 0x06, 0x43, 0x2a, 0x69, 0x02, 0xe5, 0xef, 0x53, 0x93, 0xa6,
-	0xc2, 0x08, 0xd2, 0x74, 0x9c, 0x9e, 0x82, 0xf3, 0x0f, 0xa9, 0x49, 0x8b, 0xe2, 0xc8, 0x31, 0xd1,
-	0xd2, 0x78, 0x1b, 0x05, 0xa0, 0x7f, 0x4c, 0xd5, 0xd2, 0x78, 0xdf, 0x97, 0x48, 0xf4, 0xdb, 0x50,
-	0x06, 0x43, 0xea, 0x58, 0x89, 0x06, 0xa4, 0x7f, 0x4a, 0x47, 0x1d, 0xf3, 0x10, 0xa1, 0x2e, 0x1c,
-	0x73, 0x4b, 0x08, 0x75, 0xda, 0xf5, 0x4e, 0x03, 0x20, 0x9e, 0xce, 0x95, 0x9c, 0xf2, 0xbe, 0xea,
-	0x48, 0x30, 0xce, 0x06, 0x99, 0xc5, 0x11, 0xb4, 0x1f, 0x2c, 0x40, 0x9e, 0x3e, 0x43, 0x4d, 0x72,
-	0xd5, 0x91, 0x00, 0xe6, 0x81, 0x5c, 0x7e, 0x19, 0x9a, 0x00, 0x1b, 0xae, 0x95, 0x9f, 0xa5, 0x46,
-	0xd3, 0xd5, 0x91, 0x00, 0xa6, 0x72, 0xb1, 0x1b, 0x5a, 0x71, 0xa5, 0xfb, 0x1c, 0xb5, 0x2a, 0x84,
-	0x56, 0x5c, 0xaa, 0xaa, 0x78, 0x04, 0x7b, 0xcf, 0x53, 0xa3, 0xac, 0x8a, 0x47, 0xb0, 0x8e, 0x47,
-	0xb0, 0xf7, 0x19, 0x6a, 0xe4, 0x6a, 0x78, 0xaa, 0x15, 0x17, 0x89, 0x9f, 0xa5, 0x56, 0xa3, 0x1a,
-	0x1e, 0xc1, 0xee, 0xcb, 0x51, 0x01, 0xac, 0x84, 0xec, 0xfa, 0x1c, 0x35, 0x1b, 0xab, 0x8e, 0x04,
-	0x30, 0x5b, 0x48, 0xb4, 0x32, 0x9a, 0xe4, 0x98, 0xc2, 0xf0, 0xf3, 0xd4, 0x70, 0xaa, 0x3a, 0x12,
-	0x80, 0x83, 0x50, 0x5e, 0x85, 0x11, 0x80, 0xb6, 0xfa, 0x65, 0x6a, 0x96, 0x09, 0x23, 0x00, 0x75,
-	0xa4, 0xa3, 0x12, 0xec, 0xfd, 0x0a, 0xb5, 0xca, 0xeb, 0xa8, 0xec, 0x00, 0x41, 0x43, 0x25, 0xd8,
-	0xfb, 0x55, 0x6a, 0x58, 0x8c, 0xa0, 0xaa, 0xd1, 0x72, 0x4d, 0xf2, 0x02, 0xb5, 0x73, 0xc2, 0x68,
-	0xb9, 0xa8, 0x90, 0xcc, 0x81, 0xa2, 0xf8, 0x02, 0xb5, 0x1a, 0x97, 0xcc, 0x81, 0x24, 0x08, 0x23,
-	0x00, 0x3d, 0xf0, 0x45, 0x6a, 0x34, 0x11, 0x46, 0x00, 0x1d, 0x7d, 0x0d, 0x15, 0xc1, 0x46, 0x69,
-	0xe7, 0x5f, 0xca, 0xa5, 0x7f, 0x8c, 0x5b, 0x1d, 0x09, 0x20, 0x54, 0xd9, 0xc2, 0x6f, 0x43, 0x07,
-	0x54, 0x08, 0xd1, 0x55, 0xbe, 0x9c, 0x1b, 0xea, 0x15, 0x9b, 0xea, 0x48, 0x30, 0x2d, 0x81, 0x44,
-	0x17, 0x59, 0x47, 0x30, 0xa8, 0x35, 0xec, 0xaf, 0xe4, 0x86, 0x78, 0xbf, 0xa6, 0x3a, 0x12, 0x4c,
-	0x31, 0x97, 0x4a, 0x93, 0x5e, 0x45, 0xae, 0xd8, 0xb8, 0x4a, 0x87, 0xfe, 0x6a, 0x2e, 0xcd, 0xb3,
-	0xe8, 0xea, 0x48, 0x50, 0xe4, 0xdb, 0x5d, 0x76, 0xe3, 0xb3, 0xe8, 0x90, 0x0e, 0x20, 0x48, 0xfb,
-	0x5a, 0x2e, 0xe5, 0x9b, 0x35, 0xd5, 0x91, 0xe0, 0x80, 0x0a, 0x23, 0x08, 0xfb, 0x31, 0x5e, 0x39,
-	0x80, 0xa9, 0xaf, 0xe7, 0xac, 0x5f, 0x13, 0xbc, 0x99, 0xce, 0x16, 0x4c, 0x29, 0xbe, 0x64, 0x6e,
-	0xc0, 0x1e, 0x5d, 0xf4, 0xbe, 0x21, 0x36, 0xe9, 0x84, 0xb2, 0x49, 0x17, 0xa3, 0x76, 0xbe, 0xf7,
-	0x4d, 0x93, 0x9d, 0x1f, 0xb5, 0x5b, 0xf2, 0xbe, 0x65, 0xb2, 0x5b, 0x72, 0xaf, 0x44, 0x07, 0x79,
-	0x06, 0xe9, 0x0f, 0xb4, 0xee, 0xcb, 0xcb, 0x17, 0x7a, 0xaa, 0x4e, 0x00, 0xdf, 0xa0, 0xfe, 0x3c,
-	0xeb, 0x6a, 0x41, 0x7b, 0xf4, 0x61, 0xd6, 0xfb, 0xf2, 0xea, 0xdb, 0x3d, 0x55, 0x87, 0x73, 0x19,
-	0x79, 0x96, 0x75, 0x0d, 0x9a, 0x89, 0x4e, 0xe7, 0x95, 0xf4, 0xfe, 0xbc, 0xf2, 0xaa, 0x4f, 0xd5,
-	0x09, 0x0e, 0xea, 0xd3, 0x79, 0x65, 0xbd, 0x3a, 0x3e, 0x9f, 0xd7, 0xd8, 0x07, 0xf2, 0xf2, 0xbd,
-	0x9f, 0xf8, 0xf4, 0x53, 0xe2, 0x31, 0x98, 0x69, 0xf5, 0x04, 0x7b, 0x0f, 0xe6, 0xa3, 0x2f, 0x01,
-	0x19, 0x23, 0x20, 0x38, 0x29, 0x02, 0x82, 0xbd, 0x87, 0xf2, 0xca, 0x1b, 0x41, 0xe6, 0x08, 0x08,
-	0x4e, 0x8a, 0x80, 0x60, 0xef, 0xe1, 0xbc, 0x7c, 0x3d, 0xc8, 0x1c, 0x01, 0x7b, 0xf4, 0x35, 0x1b,
-	0x9d, 0x2e, 0xaa, 0xf4, 0x23, 0x79, 0xf5, 0x5d, 0xa1, 0xaa, 0x13, 0x1c, 0xd2, 0x3d, 0x88, 0xfa,
-	0x7e, 0x3d, 0xf2, 0x62, 0x11, 0x08, 0x1f, 0x8f, 0xe6, 0xb5, 0x17, 0x87, 0xaa, 0x4e, 0x30, 0x13,
-	0x89, 0x42, 0xd4, 0xfe, 0x6b, 0xe2, 0x54, 0x42, 0x17, 0x78, 0x7f, 0x5e, 0x7b, 0x8b, 0x28, 0xce,
-	0x23, 0xf4, 0x85, 0xa4, 0x40, 0x08, 0xf6, 0x3e, 0x90, 0x57, 0x5f, 0x29, 0x4a, 0x08, 0x84, 0xe0,
-	0xe4, 0x40, 0x08, 0xf6, 0x1e, 0xcb, 0x6b, 0xef, 0x17, 0x25, 0x05, 0x42, 0xb0, 0x7b, 0x43, 0xfc,
-	0x0b, 0xe1, 0x8d, 0xe5, 0xf1, 0xbc, 0xe1, 0x65, 0xa3, 0xf8, 0x37, 0xc3, 0x1b, 0xce, 0x8d, 0x86,
-	0x8d, 0x01, 0xad, 0xe7, 0x89, 0xbc, 0xf9, 0xcd, 0x23, 0xc3, 0x1e, 0x81, 0xae, 0x74, 0x73, 0x9c,
-	0x5b, 0xe8, 0x4f, 0x17, 0xf2, 0x83, 0x5f, 0x43, 0x8a, 0x93, 0x0d, 0x2d, 0xec, 0xb5, 0x68, 0x2e,
-	0xea, 0x50, 0x69, 0x66, 0x4f, 0xe6, 0x87, 0x7e, 0x27, 0xa9, 0xea, 0x04, 0xb3, 0x3a, 0xb0, 0xfa,
-	0xf7, 0xe9, 0xc5, 0xf1, 0x8c, 0x51, 0x9a, 0xc2, 0x53, 0xf9, 0x21, 0x5e, 0x50, 0xaa, 0x3a, 0xc1,
-	0xe1, 0x68, 0x9e, 0x85, 0x36, 0x73, 0x3f, 0x85, 0x26, 0xb4, 0xde, 0xf7, 0x22, 0xbe, 0x69, 0x3e,
-	0x77, 0x37, 0x42, 0x4a, 0x3f, 0x7c, 0x31, 0x91, 0xaf, 0x45, 0x05, 0xed, 0x4d, 0x4e, 0x5b, 0x70,
-	0xea, 0x40, 0x7b, 0x27, 0x22, 0x9d, 0x03, 0xe5, 0xf0, 0xdc, 0xda, 0xc1, 0x35, 0xa8, 0x18, 0x3d,
-	0x1c, 0x77, 0x8b, 0x28, 0x7b, 0x7b, 0xfd, 0x1c, 0x73, 0xb2, 0x2f, 0xa0, 0xff, 0xeb, 0x1e, 0x44,
-	0xb9, 0x3b, 0xd7, 0x9a, 0xbd, 0xba, 0x97, 0x61, 0x63, 0xf0, 0x8f, 0x4a, 0xe6, 0x0a, 0x67, 0xee,
-	0x5a, 0x34, 0x1d, 0x3b, 0xf9, 0xde, 0xcd, 0x41, 0x4e, 0x75, 0xf0, 0x0a, 0xe4, 0xc6, 0x0f, 0xb5,
-	0x77, 0xf3, 0x30, 0x6d, 0xf6, 0x70, 0x6a, 0xef, 0x1e, 0x0a, 0x89, 0x41, 0xf0, 0x53, 0xba, 0xdd,
-	0x1c, 0x64, 0x93, 0x83, 0xd8, 0xa3, 0x07, 0x37, 0x39, 0x88, 0x3d, 0x7a, 0x18, 0x55, 0x3d, 0x9c,
-	0x40, 0x07, 0x0c, 0xe7, 0xc2, 0xbb, 0xb9, 0x18, 0x53, 0x5d, 0xac, 0xa0, 0x83, 0xa6, 0xe3, 0xde,
-	0xdd, 0x7c, 0x4c, 0x99, 0xb9, 0x94, 0xe7, 0xb8, 0xbb, 0x39, 0xc8, 0x0c, 0x88, 0x63, 0x8f, 0x54,
-	0xe4, 0x07, 0xc5, 0xb1, 0x47, 0x1f, 0x45, 0xf3, 0x17, 0xa2, 0x1c, 0xa8, 0xee, 0xe6, 0xc1, 0x49,
-	0xd8, 0x14, 0xf2, 0xa8, 0x74, 0x37, 0x0f, 0xe3, 0x66, 0x2e, 0xe5, 0x29, 0xe8, 0x6e, 0x0e, 0x26,
-	0x54, 0x07, 0xe7, 0xd0, 0x21, 0xe3, 0xe1, 0xa6, 0xc1, 0xc9, 0xab, 0x54, 0x27, 0x69, 0x1f, 0xe6,
-	0x2a, 0xd0, 0xf7, 0x20, 0x2f, 0xe9, 0x88, 0xd3, 0x80, 0x7e, 0x93, 0x8a, 0x3e, 0xc4, 0x03, 0x5e,
-	0x65, 0x01, 0xaf, 0x45, 0x33, 0xe6, 0xa3, 0x4e, 0x03, 0xfc, 0x8f, 0xe8, 0xf0, 0x29, 0x9f, 0xf8,
-	0x2a, 0xe0, 0x3d, 0x34, 0x9b, 0x70, 0xe2, 0x69, 0x40, 0xbf, 0x5e, 0xa7, 0xde, 0xf6, 0x21, 0xb0,
-	0x16, 0xf3, 0x5c, 0xf2, 0x69, 0xa7, 0x01, 0xf9, 0x95, 0x7a, 0xdc, 0x29, 0x1e, 0x0b, 0xc7, 0x76,
-	0xab, 0x7e, 0xe6, 0xa9, 0x62, 0xe6, 0x76, 0xeb, 0x25, 0x90, 0x30, 0x91, 0xe3, 0x4c, 0xd5, 0xc3,
-	0xf4, 0xde, 0x3c, 0x9c, 0x4a, 0xf6, 0x50, 0xd8, 0x5b, 0x3f, 0xd3, 0xcf, 0x20, 0x55, 0x07, 0xd9,
-	0xbd, 0x07, 0x91, 0xe0, 0xc1, 0xdd, 0x7b, 0x10, 0x09, 0x1e, 0x46, 0x77, 0xf3, 0x00, 0x25, 0x34,
-	0x7a, 0x22, 0xa8, 0xba, 0x18, 0xdb, 0x63, 0x18, 0xfa, 0x51, 0x9f, 0xea, 0x61, 0x7c, 0x37, 0x0f,
-	0x57, 0x21, 0x24, 0xff, 0x1e, 0xb7, 0xd6, 0x25, 0x55, 0x34, 0x73, 0xf2, 0xee, 0x6e, 0xbd, 0xbd,
-	0xb3, 0xd9, 0x69, 0x0f, 0xa7, 0xb1, 0x54, 0x4f, 0x43, 0x69, 0xa5, 0x23, 0xf3, 0x68, 0x5c, 0x8a,
-	0xed, 0x71, 0x04, 0xba, 0xb8, 0x38, 0x42, 0xff, 0x77, 0x25, 0x38, 0xf1, 0xa3, 0x37, 0x17, 0x1d,
-	0x77, 0x3f, 0x1a, 0xbb, 0xae, 0x7a, 0x22, 0x78, 0xf5, 0x8d, 0x27, 0x8b, 0x99, 0xcb, 0xc6, 0xf7,
-	0xdd, 0x5b, 0x2b, 0x9e, 0x3f, 0x7f, 0xfe, 0x7c, 0xc6, 0x3f, 0x83, 0x66, 0xeb, 0x62, 0x11, 0xab,
-	0xda, 0x9d, 0x45, 0xd7, 0x42, 0x74, 0x7a, 0xf7, 0xd6, 0x18, 0xcb, 0x87, 0xea, 0x51, 0x6a, 0xe8,
-	0x57, 0xe4, 0xd7, 0x91, 0x67, 0x00, 0x81, 0x3f, 0xc8, 0x6d, 0x50, 0xde, 0x50, 0x63, 0xd9, 0x3a,
-	0x13, 0x43, 0x61, 0xb9, 0xed, 0x6f, 0xa0, 0xc3, 0x06, 0x98, 0x1d, 0x7b, 0x9c, 0x37, 0xd6, 0x58,
-	0x4e, 0xcf, 0xc6, 0x70, 0xa0, 0x04, 0x24, 0x00, 0xf5, 0xec, 0x81, 0xde, 0x54, 0x63, 0xa9, 0x1f,
-	0x07, 0x82, 0x4a, 0x91, 0x4c, 0x1c, 0xc1, 0x56, 0x38, 0x6f, 0xae, 0xb1, 0x0a, 0x61, 0x24, 0x8e,
-	0xe0, 0x01, 0xc4, 0x59, 0xe2, 0xbc, 0xa5, 0xc6, 0xea, 0x88, 0x99, 0xb8, 0x44, 0xa0, 0x9e, 0x3d,
-	0xd0, 0x5b, 0x6b, 0xac, 0xdc, 0x98, 0x89, 0x23, 0xd8, 0xdf, 0x44, 0x73, 0x06, 0x20, 0x71, 0x72,
-	0x61, 0x83, 0xf4, 0xb6, 0x1a, 0xab, 0x4a, 0x5e, 0x0c, 0x89, 0x57, 0x31, 0xff, 0x76, 0x74, 0x91,
-	0x89, 0xbc, 0x34, 0x58, 0x6f, 0xaf, 0x31, 0xd1, 0x7a, 0x38, 0x4e, 0x1f, 0xf7, 0x96, 0xb0, 0x21,
-	0x1a, 0xf0, 0x6a, 0x9f, 0x05, 0xd2, 0x3b, 0x6a, 0x4c, 0xdd, 0xc6, 0x37, 0x04, 0xd3, 0xc6, 0x83,
-	0xe8, 0xb3, 0xfc, 0xa2, 0xde, 0x59, 0x63, 0x1a, 0x38, 0x81, 0x3e, 0x82, 0x07, 0xd2, 0x67, 0x89,
-	0xf5, 0xae, 0x1a, 0xd3, 0xca, 0x49, 0xf4, 0x25, 0xee, 0x3f, 0x38, 0xec, 0xb1, 0x82, 0xea, 0xd7,
-	0x98, 0xa8, 0x8e, 0xef, 0x3f, 0xd0, 0xe4, 0x49, 0x19, 0x05, 0x87, 0x3b, 0x36, 0x40, 0xef, 0xae,
-	0xb1, 0x2e, 0x60, 0xc8, 0x28, 0x38, 0xf1, 0x35, 0x6f, 0x08, 0x76, 0x56, 0x64, 0x85, 0xf3, 0x9e,
-	0x1a, 0x93, 0xe8, 0xf1, 0x0d, 0xc1, 0x04, 0xbe, 0xff, 0xa0, 0x83, 0x2e, 0x31, 0xe0, 0xc8, 0x23,
-	0x24, 0x2b, 0xb0, 0xf7, 0xd6, 0x86, 0x90, 0xf2, 0x73, 0xb1, 0x25, 0x86, 0x9f, 0xf9, 0x4f, 0x38,
-	0xa8, 0x94, 0xb8, 0x4c, 0xfe, 0x78, 0xc0, 0x6a, 0xa5, 0xf7, 0xd5, 0x86, 0x93, 0xfd, 0x97, 0x98,
-	0x17, 0xcb, 0x3f, 0xf6, 0x1f, 0x71, 0xd0, 0xf7, 0x19, 0xd6, 0xab, 0x3c, 0x97, 0xb1, 0x5a, 0xed,
-	0xfb, 0x6a, 0xc3, 0xfc, 0x95, 0x70, 0x51, 0x6c, 0xad, 0xf2, 0x43, 0xff, 0x7e, 0x07, 0x5d, 0x6a,
-	0xec, 0x11, 0xf2, 0x18, 0xcf, 0x6a, 0xa9, 0xf7, 0xd7, 0x52, 0xfd, 0x49, 0x71, 0xb1, 0xa1, 0xb3,
-	0x84, 0x9f, 0xfa, 0x8f, 0x39, 0xe8, 0xc8, 0x80, 0x45, 0xa6, 0xd9, 0x00, 0x0f, 0xd4, 0xd2, 0xfe,
-	0x01, 0x72, 0x69, 0xd2, 0x52, 0xc5, 0x97, 0xff, 0xb0, 0x83, 0x64, 0xba, 0xe9, 0x37, 0xad, 0x6d,
-	0x56, 0xf8, 0x60, 0x8d, 0x3d, 0x8e, 0xb2, 0x79, 0xd3, 0xc6, 0x2c, 0x60, 0x83, 0x84, 0xd5, 0xf8,
-	0x4d, 0xb5, 0xc6, 0xe8, 0x0f, 0x8c, 0xec, 0x92, 0xa9, 0xaf, 0x5e, 0x17, 0x97, 0x68, 0xda, 0xf3,
-	0x25, 0x7f, 0x4b, 0x2d, 0x9d, 0x91, 0x67, 0x4c, 0x76, 0xd9, 0xd0, 0xd7, 0xaf, 0x9b, 0xcf, 0xc6,
-	0x01, 0x41, 0x37, 0xde, 0xa1, 0x76, 0xbb, 0xe8, 0x63, 0x29, 0xbb, 0x5d, 0xdd, 0xd7, 0xae, 0xab,
-	0x7b, 0x71, 0x44, 0xae, 0x20, 0xb7, 0xcc, 0x90, 0x29, 0x24, 0xe4, 0x03, 0x7d, 0xf5, 0xba, 0xbb,
-	0x01, 0x91, 0x4b, 0xc9, 0x6e, 0x22, 0xad, 0x96, 0x5d, 0xf6, 0xc1, 0x7e, 0xfc, 0xba, 0xbc, 0x99,
-	0x5a, 0x82, 0x07, 0x51, 0x6b, 0x09, 0xfb, 0x50, 0x5f, 0xbb, 0x6e, 0x9f, 0x40, 0x2d, 0xc1, 0x83,
-	0xa8, 0xb5, 0x84, 0x7c, 0xb8, 0xaf, 0x5e, 0xd7, 0x4f, 0xa0, 0x96, 0x60, 0xbf, 0xab, 0x4a, 0x98,
-	0xd8, 0x53, 0x39, 0x2b, 0xc8, 0x47, 0xfa, 0xfa, 0x75, 0xff, 0xc3, 0x71, 0x50, 0xa1, 0x3b, 0xef,
-	0x42, 0x17, 0x1b, 0xa9, 0x4d, 0x03, 0xfb, 0x68, 0x3f, 0xf2, 0x73, 0x01, 0x73, 0x06, 0x7a, 0x85,
-	0x06, 0xbd, 0xc3, 0xbc, 0x93, 0xec, 0x45, 0xe8, 0xfb, 0xfb, 0x91, 0x9f, 0x1b, 0x30, 0x6c, 0x23,
-	0xd0, 0xa3, 0x83, 0x18, 0xb6, 0xfc, 0x52, 0x3f, 0xd0, 0xd7, 0x7f, 0xae, 0x20, 0x89, 0x61, 0x82,
-	0x07, 0x33, 0x6c, 0x09, 0xfb, 0x58, 0x3f, 0xf2, 0x73, 0x07, 0x89, 0x0c, 0x13, 0xec, 0x9f, 0x33,
-	0x6f, 0xe1, 0x14, 0x3a, 0xf5, 0xf1, 0xbe, 0xf1, 0xe7, 0x12, 0x0c, 0x7b, 0x99, 0x0b, 0xd7, 0xd7,
-	0x25, 0x24, 0xac, 0xbd, 0x72, 0x7d, 0xa2, 0x9f, 0xf4, 0x73, 0x0b, 0xa6, 0xdc, 0x05, 0x35, 0xfb,
-	0x7a, 0xc7, 0xbc, 0xb7, 0xec, 0xf5, 0xec, 0x85, 0xfe, 0x6e, 0xbf, 0xd7, 0x60, 0xd8, 0x6c, 0xa0,
-	0x75, 0x2f, 0x68, 0xa2, 0xcc, 0xf4, 0xbc, 0xd4, 0x6a, 0x25, 0x4f, 0xf6, 0xbf, 0x07, 0x3f, 0xf8,
-	0x70, 0x51, 0x7c, 0xb1, 0x52, 0xf5, 0x3e, 0xae, 0xa9, 0x5e, 0xf3, 0x33, 0x56, 0xab, 0x25, 0x3f,
-	0xd5, 0x1f, 0xea, 0x17, 0x23, 0x2e, 0x31, 0xd5, 0x66, 0xa9, 0xd2, 0xd6, 0xd5, 0x23, 0x27, 0xed,
-	0xb2, 0xa0, 0xdd, 0x22, 0xbf, 0xeb, 0xb0, 0x9b, 0x85, 0xf2, 0xcc, 0x29, 0x50, 0xae, 0x18, 0xfa,
-	0x0d, 0x55, 0xb4, 0xe8, 0x97, 0x0d, 0xad, 0x60, 0x3e, 0xc8, 0x60, 0xd4, 0x43, 0xa7, 0x40, 0xbd,
-	0xa2, 0xe8, 0x9f, 0x55, 0x77, 0x6c, 0xe4, 0xb2, 0xa2, 0x15, 0xd0, 0x87, 0x18, 0x90, 0x7a, 0xea,
-	0x14, 0x68, 0x57, 0x1c, 0x13, 0x90, 0x52, 0x48, 0x86, 0x0f, 0x33, 0xa4, 0x82, 0x01, 0x89, 0x6b,
-	0x85, 0x44, 0xee, 0x2c, 0x8b, 0xde, 0x47, 0x18, 0x50, 0xd6, 0xcc, 0x1d, 0xc1, 0x03, 0xb8, 0xb3,
-	0x04, 0xfa, 0x28, 0x03, 0x72, 0x13, 0xb8, 0x4b, 0x44, 0x4a, 0xa1, 0x09, 0x3e, 0xc6, 0x90, 0x46,
-	0x13, 0xb8, 0x23, 0xd8, 0xbf, 0x4d, 0x2d, 0xa0, 0xd1, 0xcb, 0x9e, 0x56, 0x50, 0x1f, 0x67, 0x50,
-	0xea, 0xd1, 0x53, 0xa0, 0x5f, 0x11, 0xf5, 0x9b, 0x6a, 0x5b, 0x8c, 0x5d, 0x16, 0xb5, 0x02, 0xfb,
-	0x04, 0x03, 0x53, 0xcf, 0x9e, 0x82, 0xc8, 0x15, 0xd3, 0x84, 0x5d, 0x61, 0xdf, 0xf6, 0x3f, 0xc9,
-	0xa0, 0x32, 0x86, 0x5d, 0x01, 0xcd, 0x7e, 0x00, 0x83, 0x96, 0x5f, 0xd6, 0xa7, 0x18, 0x52, 0x3e,
-	0x89, 0x41, 0x82, 0x07, 0x32, 0x68, 0x09, 0xf6, 0x69, 0x06, 0x56, 0x4c, 0x64, 0x30, 0x71, 0x17,
-	0xa6, 0x68, 0xeb, 0x4f, 0x33, 0x2c, 0xc7, 0xb0, 0x0b, 0x79, 0x1b, 0x4f, 0xc8, 0x2c, 0xfb, 0x2e,
-	0xfe, 0x0c, 0x43, 0x1a, 0x37, 0x65, 0x16, 0xb4, 0x6c, 0xf3, 0xae, 0xb0, 0x6f, 0xd8, 0xcf, 0x32,
-	0xa0, 0x09, 0xc3, 0xae, 0x80, 0xae, 0xfc, 0x90, 0x76, 0x02, 0x65, 0xb8, 0xed, 0x6b, 0x85, 0xf6,
-	0x1c, 0x43, 0x1b, 0xfe, 0x08, 0x2a, 0x88, 0xde, 0x11, 0xa6, 0xea, 0xa1, 0x94, 0xb8, 0xce, 0x34,
-	0x27, 0x10, 0xcf, 0xb3, 0xa5, 0x7e, 0x4f, 0xce, 0xa0, 0x02, 0xc3, 0x25, 0x63, 0xff, 0x51, 0x4d,
-	0xee, 0x98, 0xee, 0x1b, 0x5b, 0x2d, 0xf7, 0x33, 0x7c, 0xb9, 0x43, 0x1f, 0x42, 0x05, 0xb1, 0x5b,
-	0xca, 0xfe, 0x03, 0xda, 0x21, 0x94, 0xf1, 0xc2, 0xb2, 0xd5, 0x5a, 0x3f, 0xcb, 0x77, 0x41, 0xfa,
-	0x53, 0xa8, 0x20, 0x7e, 0xcd, 0x99, 0xca, 0xb1, 0x23, 0x03, 0x56, 0x99, 0x66, 0x0f, 0x7c, 0x8e,
-	0x93, 0x3a, 0xd4, 0x31, 0x54, 0x60, 0xbc, 0x27, 0xed, 0x3f, 0xa2, 0x1e, 0x43, 0xe9, 0x37, 0x9c,
-	0x6d, 0x96, 0xf8, 0x79, 0xb6, 0xc4, 0x94, 0xe7, 0x50, 0xfa, 0x3d, 0xeb, 0x84, 0xe5, 0xac, 0x14,
-	0xc4, 0xab, 0xfa, 0xbd, 0xf6, 0x66, 0xa7, 0xbd, 0x32, 0x1b, 0x7f, 0x47, 0x92, 0x7d, 0x70, 0xd9,
-	0x22, 0xda, 0xaf, 0xbe, 0x27, 0x6e, 0x7a, 0x20, 0x8a, 0xdc, 0x09, 0xf9, 0x40, 0xf4, 0x05, 0x67,
-	0xe5, 0x35, 0x3f, 0x5e, 0x8b, 0x2d, 0xfb, 0x18, 0x5b, 0xf6, 0xe9, 0x5e, 0xe3, 0xd8, 0x66, 0xbb,
-	0x5b, 0xdf, 0x6e, 0xaf, 0x35, 0xd9, 0xef, 0xdc, 0xb2, 0xd1, 0x9d, 0x63, 0xcd, 0xfa, 0xc6, 0xda,
-	0x99, 0x73, 0xc7, 0x92, 0x7e, 0x12, 0xf7, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x96, 0xc9,
-	0xde, 0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/test.pb.go
deleted file mode 100644
index 5511441021a..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/test.pb.go
+++ /dev/null
@@ -1,3534 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go.
-// source: proto2_20160519_a4ab9ec5/test.proto
-// DO NOT EDIT!
-
-/*
-Package proto2_20160519_a4ab9ec5 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto2_20160519_a4ab9ec5/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto2_20160519_a4ab9ec5
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20160519.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20160519.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	XXX_extensions      map[int32]proto.Extension     `json:"-"`
-	XXX_unrecognized    []byte                        `json:"-"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-var extRange_Message = []proto.ExtensionRange{
-	{10000, 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-func (m *Message) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("dead\\336\\255\\276\\357beef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-type isMessage_OneofDefaultedUnion interface{ isMessage_OneofDefaultedUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum,oneof,def=0"`
-}
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()                          {}
-func (*Message_OneofInt32) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofInt64) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()                      {}
-func (*Message_OneofFloat) isMessage_OneofUnion()                         {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()                      {}
-func (*Message_OneofDouble) isMessage_OneofUnion()                        {}
-func (*Message_OneofString) isMessage_OneofUnion()                        {}
-func (*Message_OneofBytes) isMessage_OneofUnion()                         {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()                     {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()                  {}
-func (*Message_OneofNamedGroup) isMessage_OneofUnion()                    {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()                   {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion()                {}
-func (*Message_Oneofgroup) isMessage_OneofUnion()                         {}
-func (*Message_OneofString1) isMessage_OneofUnion()                       {}
-func (*Message_OneofString2) isMessage_OneofUnion()                       {}
-func (*Message_OneofString3) isMessage_OneofUnion()                       {}
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion()        {}
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion()   {}
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(700<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(701<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(702<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(703<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(704<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(705<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(706<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(707<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(708<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(709<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(710<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(711<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(712<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(713<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(714<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(715<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(716<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofNamedGroup:
-		b.EncodeVarint(717<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNamedGroup); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(718<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(719<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_Oneofgroup:
-		b.EncodeVarint(720<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Oneofgroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		b.EncodeVarint(721<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(722<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(723<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		t := uint64(0)
-		if x.OneofDefaultedBool {
-			t = 1
-		}
-		b.EncodeVarint(800<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofDefaultedInt32:
-		b.EncodeVarint(801<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		b.EncodeVarint(802<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofDefaultedSint32))
-	case *Message_OneofDefaultedUint32:
-		b.EncodeVarint(803<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		b.EncodeVarint(804<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		b.EncodeVarint(805<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofDefaultedSint64))
-	case *Message_OneofDefaultedUint64:
-		b.EncodeVarint(806<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		b.EncodeVarint(807<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedFixed32))
-	case *Message_OneofDefaultedSfixed32:
-		b.EncodeVarint(808<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedSfixed32))
-	case *Message_OneofDefaultedFloat:
-		b.EncodeVarint(809<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofDefaultedFloat)))
-	case *Message_OneofDefaultedFixed64:
-		b.EncodeVarint(810<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedFixed64))
-	case *Message_OneofDefaultedSfixed64:
-		b.EncodeVarint(811<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedSfixed64))
-	case *Message_OneofDefaultedDouble:
-		b.EncodeVarint(812<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDefaultedDouble))
-	case *Message_OneofDefaultedString:
-		b.EncodeVarint(813<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		b.EncodeVarint(814<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		b.EncodeVarint(815<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		b.EncodeVarint(816<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofDefaultedUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 700: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 701: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 702: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 703: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 704: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 705: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 706: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 707: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 708: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 709: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 710: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 711: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 712: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 713: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 714: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 715: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 716: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 717: // oneof_union.oneof_named_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_NamedGroup)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofNamedGroup{msg}
-		return true, err
-	case 718: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 719: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 720: // oneof_union.oneofgroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_OneofGroup)
-		err := b.DecodeGroup(msg)
-		m.OneofUnion = &Message_Oneofgroup{msg}
-		return true, err
-	case 721: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 722: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 723: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	case 800: // oneof_defaulted_union.oneof_defaulted_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBool{x != 0}
-		return true, err
-	case 801: // oneof_defaulted_union.oneof_defaulted_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt32{int32(x)}
-		return true, err
-	case 802: // oneof_defaulted_union.oneof_defaulted_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint32{int32(x)}
-		return true, err
-	case 803: // oneof_defaulted_union.oneof_defaulted_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint32{uint32(x)}
-		return true, err
-	case 804: // oneof_defaulted_union.oneof_defaulted_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt64{int64(x)}
-		return true, err
-	case 805: // oneof_defaulted_union.oneof_defaulted_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint64{int64(x)}
-		return true, err
-	case 806: // oneof_defaulted_union.oneof_defaulted_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint64{x}
-		return true, err
-	case 807: // oneof_defaulted_union.oneof_defaulted_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed32{uint32(x)}
-		return true, err
-	case 808: // oneof_defaulted_union.oneof_defaulted_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed32{int32(x)}
-		return true, err
-	case 809: // oneof_defaulted_union.oneof_defaulted_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 810: // oneof_defaulted_union.oneof_defaulted_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed64{x}
-		return true, err
-	case 811: // oneof_defaulted_union.oneof_defaulted_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed64{int64(x)}
-		return true, err
-	case 812: // oneof_defaulted_union.oneof_defaulted_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedDouble{math.Float64frombits(x)}
-		return true, err
-	case 813: // oneof_defaulted_union.oneof_defaulted_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedString{x}
-		return true, err
-	case 814: // oneof_defaulted_union.oneof_defaulted_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBytes{x}
-		return true, err
-	case 815: // oneof_defaulted_union.oneof_defaulted_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 816: // oneof_defaulted_union.oneof_defaulted_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSiblingEnum{SiblingEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(700<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(701<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(702<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(703<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(704<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(705<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(706<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(707<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(708<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(709<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(710<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(711<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(712<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(713<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(714<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(715<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(716<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofNamedGroup:
-		s := proto.Size(x.OneofNamedGroup)
-		n += proto.SizeVarint(717<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(718<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(719<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_Oneofgroup:
-		n += proto.SizeVarint(720<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Oneofgroup)
-		n += proto.SizeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		n += proto.SizeVarint(721<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(722<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(723<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		n += proto.SizeVarint(800<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofDefaultedInt32:
-		n += proto.SizeVarint(801<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		n += proto.SizeVarint(802<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofDefaultedSint32) << 1) ^ uint32((int32(x.OneofDefaultedSint32) >> 31))))
-	case *Message_OneofDefaultedUint32:
-		n += proto.SizeVarint(803<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		n += proto.SizeVarint(804<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		n += proto.SizeVarint(805<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofDefaultedSint64<<1) ^ uint64((int64(x.OneofDefaultedSint64) >> 63))))
-	case *Message_OneofDefaultedUint64:
-		n += proto.SizeVarint(806<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		n += proto.SizeVarint(807<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedSfixed32:
-		n += proto.SizeVarint(808<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFloat:
-		n += proto.SizeVarint(809<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFixed64:
-		n += proto.SizeVarint(810<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedSfixed64:
-		n += proto.SizeVarint(811<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedDouble:
-		n += proto.SizeVarint(812<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedString:
-		n += proto.SizeVarint(813<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedString)))
-		n += len(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		n += proto.SizeVarint(814<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedBytes)))
-		n += len(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		n += proto.SizeVarint(815<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		n += proto.SizeVarint(816<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool,json=extensionOptionalBool",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32,json=extensionOptionalInt32",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32,json=extensionOptionalSint32",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32,json=extensionOptionalUint32",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64,json=extensionOptionalInt64",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64,json=extensionOptionalSint64",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64,json=extensionOptionalUint64",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32,json=extensionOptionalFixed32",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32,json=extensionOptionalSfixed32",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float,json=extensionOptionalFloat",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64,json=extensionOptionalFixed64",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64,json=extensionOptionalSfixed64",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double,json=extensionOptionalDouble",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string,json=extensionOptionalString",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes,json=extensionOptionalBytes",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,json=extensionOptionalChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message,json=extensionOptionalChildMessage",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group,json=extensionOptionalNamedGroup",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,json=extensionOptionalSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message,json=extensionOptionalSiblingMessage",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20160519.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup,json=extensionoptionalgroup",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,json=extensionDefaultedBool,def=1",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,json=extensionDefaultedInt32,def=-12345",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,json=extensionDefaultedSint32,def=-3200",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,json=extensionDefaultedUint32,def=3200",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,json=extensionDefaultedInt64,def=-123456789",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,json=extensionDefaultedSint64,def=-6400",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,json=extensionDefaultedUint64,def=6400",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,json=extensionDefaultedFixed32,def=320000",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,json=extensionDefaultedSfixed32,def=-320000",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,json=extensionDefaultedFloat,def=3.14159",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,json=extensionDefaultedFixed64,def=640000",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,json=extensionDefaultedSfixed64,def=-640000",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,json=extensionDefaultedDouble,def=3.14159265359",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,json=extensionDefaultedString,def=hello, \"world!\"\n",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,json=extensionDefaultedBytes,def=dead\\336\\255\\276\\357beef",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,json=extensionDefaultedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum,def=0",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,json=extensionDefaultedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum,def=0",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool,json=extensionRepeatedBool",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32,json=extensionRepeatedInt32",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32,json=extensionRepeatedSint32",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32,json=extensionRepeatedUint32",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64,json=extensionRepeatedInt64",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64,json=extensionRepeatedSint64",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64,json=extensionRepeatedUint64",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32,json=extensionRepeatedFixed32",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32,json=extensionRepeatedSfixed32",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float,json=extensionRepeatedFloat",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64,json=extensionRepeatedFixed64",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64,json=extensionRepeatedSfixed64",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double,json=extensionRepeatedDouble",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string,json=extensionRepeatedString",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes,json=extensionRepeatedBytes",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,json=extensionRepeatedChildEnum,enum=google.golang.org.proto2_20160519.Message_ChildEnum",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message,json=extensionRepeatedChildMessage",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group,json=extensionRepeatedNamedGroup",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,json=extensionRepeatedSiblingEnum,enum=google.golang.org.proto2_20160519.SiblingEnum",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20160519.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message,json=extensionRepeatedSiblingMessage",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20160519.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup,json=extensionrepeatedgroup",
-}
-
-type Message_ChildMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()                    { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()               {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()                    { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()               {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 2} }
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()                    { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()               {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 3} }
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()                    { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()               {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 4} }
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()                    { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()               {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 33} }
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 34}
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 35}
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20160519.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20160519.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20160519.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20160519.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20160519.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20160519.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20160519.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20160519.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20160519.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20160519.Message.ExtensionRepeatedGroup")
-	proto.RegisterEnum("google.golang.org.proto2_20160519.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20160519.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-}
-
-var fileDescriptor0 = []byte{
-	// 4468 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x69, 0x70, 0x23, 0xc7,
-	0x75, 0xe6, 0x00, 0x04, 0xb8, 0xec, 0x25, 0x48, 0x70, 0x76, 0x97, 0x9c, 0xa5, 0xa4, 0x08, 0x5e,
-	0x3b, 0x0e, 0xa2, 0x68, 0xb9, 0xcb, 0x61, 0xb3, 0x57, 0x8b, 0xe8, 0xf0, 0x52, 0x5a, 0x19, 0x72,
-	0x2c, 0xc8, 0x35, 0xaa, 0x4d, 0xa5, 0x52, 0xaa, 0x30, 0xe0, 0x12, 0xe4, 0x52, 0xc2, 0x41, 0x91,
-	0x80, 0xa4, 0x8d, 0x9d, 0xd2, 0xc6, 0x39, 0x7f, 0xca, 0xf7, 0x05, 0xdb, 0xb2, 0x6e, 0x5b, 0xa7,
-	0xef, 0x4b, 0x97, 0x8f, 0x24, 0xf2, 0x7d, 0xe5, 0x70, 0x2e, 0xe7, 0xbe, 0x9c, 0xfb, 0xbe, 0x8f,
-	0xea, 0x7e, 0xdd, 0xd3, 0xdd, 0x33, 0x3d, 0x20, 0x7b, 0xe0, 0xd2, 0x0f, 0x55, 0x69, 0x1b, 0xaf,
-	0xdf, 0xd7, 0xef, 0x43, 0xbf, 0xf7, 0x3e, 0xf6, 0x4c, 0x03, 0xbd, 0x74, 0x6b, 0xbb, 0xd3, 0xed,
-	0xf8, 0x2b, 0xfe, 0xf1, 0x05, 0x72, 0x7c, 0x69, 0xe1, 0xe4, 0x4a, 0x1d, 0xd7, 0x57, 0x4f, 0x36,
-	0xce, 0x2e, 0x1d, 0xeb, 0x36, 0x76, 0xba, 0xf3, 0xec, 0x53, 0xf7, 0x25, 0x1b, 0x9d, 0xce, 0x46,
-	0xb3, 0x31, 0xbf, 0xd1, 0x69, 0xd6, 0xdb, 0x1b, 0xf3, 0x9d, 0xed, 0x8d, 0xf9, 0xc8, 0xb4, 0x23,
-	0xaf, 0x43, 0x93, 0x37, 0x6f, 0xae, 0x36, 0x37, 0xdb, 0x1b, 0x37, 0x36, 0x76, 0x76, 0xea, 0x1b,
-	0x0d, 0x77, 0x12, 0x65, 0xd6, 0x17, 0x3c, 0xa7, 0xe4, 0x94, 0xc7, 0x83, 0xcc, 0xfa, 0x02, 0xfb,
-	0xb7, 0xef, 0x65, 0x4a, 0x19, 0xf6, 0x6f, 0x9f, 0xfd, 0x7b, 0xd1, 0xcb, 0x96, 0xb2, 0xec, 0xdf,
-	0x8b, 0x6e, 0x05, 0x65, 0xd6, 0xb1, 0x37, 0x5a, 0x72, 0xca, 0xfb, 0xfd, 0xcb, 0xe6, 0x77, 0x45,
-	0x9c, 0xe7, 0x38, 0x41, 0x66, 0x1d, 0x1f, 0xf9, 0xce, 0xa3, 0x0e, 0x1a, 0x13, 0xc0, 0x67, 0x10,
-	0x6a, 0xd7, 0x5b, 0x8d, 0xb5, 0x8d, 0xed, 0x4e, 0x6f, 0x8b, 0x2d, 0x00, 0xf9, 0x4b, 0x7b, 0x77,
-	0x38, 0x5f, 0xa3, 0x93, 0x5f, 0x49, 0x27, 0x07, 0x8a, 0x23, 0xf7, 0xa5, 0xa8, 0xd0, 0xd9, 0xea,
-	0x6e, 0x76, 0xda, 0xf5, 0xe6, 0xca, 0x6a, 0xa7, 0xd3, 0xf4, 0xd6, 0x4a, 0x4e, 0x79, 0x5f, 0x30,
-	0x21, 0x06, 0x97, 0x3b, 0x9d, 0xa6, 0xfb, 0xfd, 0x68, 0x32, 0x34, 0xda, 0x6c, 0x77, 0x17, 0x7d,
-	0xaf, 0x51, 0x72, 0xca, 0xb9, 0x20, 0x9c, 0x7a, 0x03, 0x1d, 0x74, 0x7f, 0x00, 0x4d, 0x85, 0x66,
-	0x3b, 0x60, 0xb7, 0x5e, 0x72, 0xca, 0xd3, 0x41, 0x38, 0xfb, 0xe6, 0xcd, 0x98, 0x61, 0x0f, 0x0c,
-	0x37, 0x4a, 0x4e, 0xb9, 0x20, 0x0d, 0xcf, 0x80, 0x61, 0x04, 0x98, 0x60, 0xef, 0x5c, 0xc9, 0x29,
-	0x67, 0x35, 0x60, 0x82, 0x63, 0xc0, 0x04, 0x7b, 0x9b, 0x25, 0xa7, 0xec, 0xea, 0xc0, 0x11, 0xc3,
-	0x1e, 0x18, 0xde, 0x5a, 0x72, 0xca, 0xa3, 0x3a, 0x30, 0xc1, 0xee, 0x0f, 0xa2, 0x62, 0x68, 0xb8,
-	0xbe, 0x79, 0x57, 0x63, 0x6d, 0xd1, 0xf7, 0x6e, 0x2b, 0x39, 0xe5, 0xb1, 0x20, 0x74, 0x70, 0x3d,
-	0x0c, 0xbb, 0x3f, 0x84, 0xa6, 0x25, 0xb8, 0xb0, 0x6d, 0x96, 0x9c, 0xf2, 0x54, 0x10, 0xfa, 0xb8,
-	0x99, 0x8f, 0x6b, 0x01, 0xad, 0x37, 0x3b, 0xf5, 0xae, 0xd7, 0x2a, 0x39, 0xe5, 0x8c, 0x0c, 0xe8,
-	0x7a, 0x3a, 0x18, 0x87, 0x27, 0xd8, 0x6b, 0x97, 0x9c, 0x72, 0x3e, 0x02, 0x4f, 0xb0, 0x01, 0x9e,
-	0x60, 0xaf, 0x53, 0x72, 0xca, 0xc5, 0x28, 0x7c, 0x24, 0xfe, 0xb5, 0x4e, 0x6f, 0xb5, 0xd9, 0xf0,
-	0xb6, 0x4a, 0x4e, 0xd9, 0x91, 0xf1, 0x5f, 0xc7, 0x46, 0x75, 0x46, 0xbb, 0xdb, 0x9b, 0xed, 0x0d,
-	0xef, 0x76, 0xb6, 0xe7, 0x25, 0xa3, 0x6c, 0x54, 0x0b, 0x68, 0xf5, 0x7c, 0xb7, 0xb1, 0xe3, 0x6d,
-	0x97, 0x9c, 0xf2, 0x84, 0x0c, 0x68, 0x99, 0x0e, 0xba, 0x6b, 0xe8, 0x40, 0x68, 0x76, 0xf6, 0xdc,
-	0x66, 0x73, 0x6d, 0xa5, 0xd1, 0xee, 0xb5, 0xbc, 0x9d, 0x92, 0x53, 0x9e, 0xf4, 0xb1, 0xc5, 0x36,
-	0xbe, 0x96, 0x4e, 0x3e, 0xdd, 0xee, 0xb5, 0x82, 0x30, 0xec, 0x70, 0xc8, 0x6d, 0xa1, 0x99, 0x08,
-	0x4a, 0x0b, 0xa6, 0x79, 0x5d, 0x96, 0x80, 0x27, 0x6c, 0x81, 0x44, 0x36, 0x1e, 0xd4, 0xb0, 0x44,
-	0x4a, 0x6e, 0xa0, 0x70, 0x7c, 0x85, 0xa5, 0xd4, 0x0a, 0x24, 0x67, 0x8f, 0x81, 0xa5, 0x4c, 0x4e,
-	0x57, 0xb8, 0x94, 0x63, 0xee, 0x2a, 0x3a, 0xa4, 0xec, 0x6f, 0x56, 0x8f, 0x80, 0xbf, 0x3b, 0x18,
-	0x7f, 0xf3, 0x7b, 0x40, 0xe2, 0x65, 0x8c, 0x31, 0x77, 0x40, 0x66, 0x45, 0x38, 0xe8, 0xde, 0x86,
-	0xbc, 0x18, 0x86, 0x60, 0xef, 0x4e, 0x16, 0xd0, 0xc2, 0xde, 0x61, 0x04, 0x6f, 0x33, 0x11, 0x24,
-	0xc1, 0xdc, 0x4f, 0xc8, 0xaa, 0x03, 0x94, 0xdd, 0xc5, 0xea, 0xd9, 0x15, 0x16, 0x94, 0xdd, 0xc4,
-	0xe7, 0x03, 0x6b, 0xba, 0x3b, 0xf7, 0x72, 0x34, 0xb9, 0xd6, 0x58, 0xaf, 0xf7, 0x9a, 0xdd, 0xc6,
-	0x1a, 0x94, 0xb5, 0x17, 0x68, 0xc5, 0xdc, 0x57, 0x19, 0xed, 0x6e, 0xf7, 0x1a, 0x41, 0x21, 0xfc,
-	0x90, 0x95, 0xb7, 0xe3, 0x68, 0x4a, 0x5a, 0x43, 0x39, 0xfa, 0x02, 0x35, 0xcf, 0x55, 0xf2, 0x47,
-	0x17, 0xfc, 0x45, 0xbc, 0x14, 0x48, 0x6f, 0x50, 0xe9, 0x16, 0x50, 0x51, 0xce, 0xe0, 0xa5, 0xee,
-	0x8b, 0x74, 0xca, 0x74, 0x25, 0x77, 0x74, 0xd1, 0x3f, 0x7e, 0x3c, 0x90, 0x1e, 0x79, 0xcd, 0x3b,
-	0xae, 0x4e, 0xe1, 0x45, 0xef, 0x4b, 0x74, 0x4a, 0xa1, 0x32, 0x1a, 0x99, 0xc1, 0x8b, 0x1f, 0x8e,
-	0x2c, 0x8b, 0x60, 0xef, 0xcb, 0x74, 0x42, 0xb6, 0x82, 0x60, 0x59, 0xe4, 0xc4, 0x15, 0x27, 0xf5,
-	0xa5, 0x11, 0x1c, 0x5f, 0x1a, 0xc1, 0xde, 0x57, 0xe8, 0x34, 0xb7, 0x92, 0x3b, 0x4a, 0x70, 0x6c,
-	0x69, 0x04, 0xc7, 0x97, 0x46, 0xb0, 0xf7, 0x55, 0x3a, 0x65, 0xb4, 0x32, 0x1a, 0x99, 0xc1, 0xcb,
-	0x23, 0x46, 0xd3, 0x72, 0x86, 0xa8, 0x79, 0x5f, 0xa3, 0x53, 0xc6, 0x2a, 0x79, 0x1a, 0xcd, 0xf1,
-	0xe3, 0x81, 0xf4, 0x29, 0x2a, 0xe5, 0x09, 0xe4, 0x2a, 0x4b, 0x13, 0xd3, 0xbe, 0x4e, 0xa7, 0x4d,
-	0x55, 0xc6, 0x8e, 0xf2, 0x79, 0xd2, 0x73, 0x58, 0x35, 0x17, 0x54, 0x26, 0xa0, 0x6c, 0x7e, 0x83,
-	0xce, 0xca, 0x54, 0xc6, 0x16, 0xe7, 0x17, 0xf0, 0xc2, 0x92, 0x4a, 0x03, 0x54, 0xd0, 0xf8, 0x0a,
-	0x09, 0xf6, 0xbe, 0x49, 0x27, 0xe5, 0x2b, 0x79, 0x1a, 0x54, 0x7c, 0x85, 0x04, 0x9b, 0x56, 0x48,
-	0xb0, 0xf7, 0x2d, 0x3a, 0xad, 0x58, 0x19, 0x3b, 0xca, 0xe7, 0x45, 0x57, 0x48, 0xb0, 0x7b, 0x52,
-	0xa5, 0x90, 0x57, 0xd6, 0x5f, 0xa3, 0xd3, 0x9c, 0x4a, 0x81, 0x2f, 0xd1, 0x27, 0x4b, 0x8b, 0x4b,
-	0x27, 0x15, 0x2e, 0x79, 0xa9, 0xbd, 0x52, 0xfb, 0xc2, 0xa0, 0xd6, 0xfe, 0x3a, 0x13, 0x18, 0x95,
-	0xe2, 0xb9, 0x46, 0xb3, 0xd9, 0xb9, 0xbc, 0x74, 0xe4, 0xce, 0xce, 0x76, 0x73, 0xed, 0x25, 0x47,
-	0x90, 0xfa, 0xdd, 0x41, 0xfd, 0x5d, 0x56, 0xa9, 0x81, 0x02, 0xfc, 0x1b, 0x74, 0xf2, 0x44, 0xc5,
-	0x5b, 0x6b, 0xd4, 0xd7, 0x6e, 0x59, 0x5c, 0x24, 0xb7, 0xf8, 0x4b, 0x4b, 0xb7, 0xf8, 0x27, 0xc8,
-	0x2d, 0x8b, 0x4b, 0x27, 0x56, 0x1b, 0x8d, 0x75, 0x85, 0x2b, 0x28, 0xce, 0x6d, 0x74, 0x50, 0xfa,
-	0x50, 0xaa, 0xf3, 0x6f, 0x3a, 0xe9, 0xcb, 0x73, 0x25, 0x77, 0xea, 0xd5, 0xaf, 0xa9, 0x9e, 0x0a,
-	0x24, 0x9f, 0xb2, 0x4c, 0x37, 0xd1, 0x8c, 0xba, 0x45, 0x95, 0x7a, 0xf6, 0x6d, 0x27, 0x4d, 0x41,
-	0x13, 0x58, 0x07, 0x95, 0x8d, 0x2d, 0x0b, 0xdb, 0xcb, 0x50, 0x61, 0xbb, 0x71, 0x7b, 0x6f, 0x73,
-	0x5b, 0x94, 0x82, 0xc7, 0xa8, 0x5a, 0xdb, 0x17, 0x4c, 0x88, 0x51, 0x56, 0x03, 0x5e, 0x8e, 0x26,
-	0x43, 0x2b, 0x48, 0xce, 0xc7, 0xa9, 0x59, 0x2e, 0x08, 0x27, 0x43, 0xe6, 0x97, 0xd1, 0x54, 0x68,
-	0xc7, 0x13, 0xff, 0x09, 0x6a, 0x38, 0x1d, 0x84, 0xf3, 0x79, 0xc2, 0xab, 0x96, 0x3c, 0xdf, 0x9f,
-	0xa4, 0x96, 0x05, 0x69, 0xc9, 0x13, 0x3d, 0x82, 0x4d, 0xb0, 0xf7, 0x14, 0x35, 0xcc, 0x6a, 0xd8,
-	0x04, 0xc7, 0xb0, 0x09, 0xf6, 0x3e, 0x48, 0x0d, 0x5d, 0x1d, 0x3b, 0x62, 0xc9, 0x13, 0xfa, 0x43,
-	0xd4, 0x72, 0x54, 0xc7, 0x26, 0xd8, 0xbd, 0x0c, 0x15, 0x43, 0x4b, 0x91, 0x91, 0x1f, 0xa6, 0xa6,
-	0x63, 0x41, 0xe8, 0x42, 0xe4, 0xef, 0xe5, 0x68, 0x5a, 0xe2, 0x0b, 0xe3, 0x8f, 0x50, 0xe3, 0xa9,
-	0x20, 0xf4, 0x12, 0x26, 0xad, 0x1a, 0x15, 0xe4, 0xec, 0x47, 0xa9, 0x69, 0x46, 0x46, 0x05, 0x99,
-	0x1a, 0x5b, 0x01, 0xc1, 0xde, 0xc7, 0xa8, 0x65, 0x3e, 0xb2, 0x02, 0x82, 0x0d, 0x2b, 0x20, 0xd8,
-	0xfb, 0x38, 0x35, 0x2e, 0x46, 0x57, 0x10, 0x61, 0x81, 0xe7, 0xe4, 0x27, 0xa8, 0xad, 0x23, 0x59,
-	0xe0, 0x39, 0xa8, 0x31, 0x0b, 0x29, 0xf8, 0x49, 0xd0, 0xf4, 0x92, 0x59, 0xc8, 0x37, 0x35, 0x2a,
-	0x48, 0xb7, 0x4f, 0x51, 0xc3, 0x09, 0x19, 0x15, 0xe4, 0x54, 0x03, 0x1d, 0x08, 0xed, 0x94, 0x94,
-	0xfa, 0x34, 0x35, 0x4e, 0xad, 0x78, 0x84, 0x47, 0x99, 0x4a, 0x6d, 0x34, 0x13, 0x81, 0x11, 0x3d,
-	0xfb, 0x69, 0x8a, 0x34, 0x8c, 0xe4, 0xd1, 0xc0, 0x44, 0xe3, 0x3e, 0x87, 0xc2, 0x71, 0x4d, 0xf2,
-	0x3c, 0x03, 0x68, 0x69, 0x35, 0x8f, 0xf0, 0xa9, 0x68, 0x9e, 0xb3, 0xe8, 0x90, 0xb2, 0xd9, 0x95,
-	0x1a, 0xf1, 0x2c, 0x50, 0x68, 0x2d, 0x7a, 0x64, 0x8a, 0xc8, 0xda, 0xd0, 0x44, 0x5e, 0x0c, 0x44,
-	0x10, 0xf8, 0x1c, 0x84, 0x94, 0x46, 0xf5, 0x44, 0xa0, 0x04, 0x79, 0x2b, 0xb2, 0x12, 0x01, 0x6b,
-	0xcf, 0x53, 0x08, 0x3b, 0xd9, 0x13, 0x70, 0x07, 0x5c, 0xf6, 0x68, 0xfe, 0xdc, 0xab, 0xd0, 0xac,
-	0xdc, 0xf0, 0xba, 0xfe, 0xb9, 0x27, 0x4b, 0x8b, 0x1e, 0xd7, 0x3f, 0x21, 0xb3, 0xd7, 0x69, 0x3a,
-	0xe8, 0x94, 0xc2, 0x46, 0x54, 0x10, 0xbd, 0x81, 0xce, 0x97, 0x82, 0x68, 0x26, 0xe6, 0x01, 0xca,
-	0xe3, 0x32, 0x3a, 0x6c, 0x70, 0xc1, 0x0b, 0xe5, 0x1b, 0xa9, 0x8f, 0x50, 0x21, 0xcd, 0xc6, 0x5c,
-	0xf0, 0xc2, 0x79, 0xca, 0xe8, 0x83, 0x97, 0xd0, 0x37, 0x51, 0x1f, 0x42, 0x32, 0xc5, 0x5d, 0xf0,
-	0x8a, 0x7a, 0x3a, 0x29, 0x12, 0x82, 0xbd, 0x37, 0x53, 0x0f, 0xba, 0x86, 0x32, 0x46, 0x43, 0xf0,
-	0x80, 0x68, 0x08, 0xf6, 0xde, 0x42, 0xfd, 0x84, 0xa2, 0xca, 0x1c, 0x0d, 0xc1, 0x03, 0xa2, 0x21,
-	0xd8, 0x7b, 0x2b, 0xf5, 0x21, 0x54, 0x96, 0x39, 0x1a, 0x82, 0xdd, 0xd3, 0x68, 0xce, 0xe0, 0x42,
-	0x14, 0xe0, 0xb7, 0x51, 0x1f, 0x52, 0x76, 0x79, 0x31, 0x2f, 0xa2, 0x7c, 0x57, 0xd1, 0x45, 0xa6,
-	0x68, 0x84, 0x9f, 0xb7, 0x53, 0x3f, 0x8a, 0x0e, 0x3b, 0x1c, 0x8f, 0x48, 0x94, 0xf6, 0x65, 0x23,
-	0xbd, 0x50, 0xe4, 0xdf, 0x41, 0xdd, 0x28, 0xc2, 0x2c, 0xce, 0x2d, 0x94, 0xfd, 0x01, 0x41, 0x11,
-	0xec, 0xbd, 0x93, 0x7a, 0x91, 0x4a, 0x2d, 0x21, 0x28, 0x82, 0x07, 0x06, 0x45, 0xb0, 0xf7, 0x2e,
-	0xea, 0x47, 0x91, 0x6e, 0x49, 0x41, 0x11, 0xec, 0xbe, 0xca, 0xf8, 0x45, 0xf1, 0xbe, 0xd1, 0xa7,
-	0x7e, 0x62, 0x5a, 0x2e, 0xfe, 0x8d, 0xf1, 0x7e, 0x72, 0xa3, 0x79, 0xe3, 0x40, 0x67, 0x79, 0x37,
-	0xf5, 0x65, 0x12, 0x77, 0x86, 0x3d, 0x04, 0x4d, 0xe7, 0x66, 0x23, 0xdf, 0xd0, 0x7e, 0xde, 0x43,
-	0xbd, 0x0d, 0x52, 0x7b, 0xf1, 0x2f, 0x00, 0x3a, 0xd4, 0xdd, 0xe8, 0x12, 0x83, 0x53, 0xa5, 0x57,
-	0xbd, 0x37, 0x9b, 0xbe, 0x57, 0x09, 0x49, 0x36, 0x17, 0x03, 0x97, 0xbd, 0xeb, 0xa7, 0xd1, 0xa5,
-	0xc6, 0xec, 0x52, 0x6a, 0xfd, 0xbd, 0xd9, 0x34, 0xb5, 0x5e, 0x80, 0x5f, 0x6c, 0xc8, 0xc9, 0x88,
-	0x2e, 0xdc, 0x6a, 0xd4, 0xc3, 0x12, 0xf9, 0xcf, 0xd9, 0x52, 0x16, 0x74, 0x21, 0x8c, 0x4a, 0x5d,
-	0xc8, 0xad, 0xa0, 0x02, 0xfd, 0x0b, 0x35, 0x63, 0xba, 0x10, 0x86, 0x15, 0x5d, 0xc8, 0xed, 0x78,
-	0xb9, 0xfb, 0x57, 0x6a, 0xc8, 0x74, 0x21, 0x8c, 0xab, 0xba, 0x90, 0x5b, 0xf2, 0xa2, 0xf6, 0x6f,
-	0xd4, 0xb2, 0x20, 0x2d, 0x55, 0x5d, 0x28, 0xb1, 0x09, 0xf6, 0xfe, 0x9d, 0x1a, 0x66, 0x35, 0x6c,
-	0xa1, 0x73, 0x14, 0x6c, 0x82, 0xbd, 0xff, 0xa0, 0x86, 0xae, 0x8e, 0x1d, 0xb1, 0xe4, 0x25, 0xe8,
-	0x3f, 0xa9, 0xe5, 0xa8, 0x8e, 0x2d, 0x74, 0x21, 0xb7, 0x14, 0x15, 0xe2, 0xbf, 0xa8, 0x29, 0xd3,
-	0x85, 0xf0, 0x81, 0xa6, 0x0b, 0x05, 0xbe, 0x30, 0xfe, 0x6f, 0x6a, 0xcc, 0x74, 0x21, 0x5f, 0x81,
-	0xa6, 0x0b, 0x85, 0x67, 0x56, 0x32, 0xfe, 0x87, 0x9a, 0x66, 0x64, 0x54, 0x8a, 0x2e, 0x54, 0x57,
-	0x40, 0xb0, 0xf7, 0xbf, 0xd4, 0x32, 0x1f, 0x59, 0x81, 0xd0, 0x85, 0xda, 0x0a, 0x08, 0xf6, 0xfe,
-	0x8f, 0x1a, 0x17, 0xa3, 0x2b, 0x88, 0xb0, 0xc0, 0xf3, 0xfb, 0xc2, 0x68, 0x29, 0x0b, 0xba, 0x10,
-	0xc6, 0x55, 0x5d, 0x28, 0xfc, 0x42, 0xf6, 0xfe, 0xcc, 0x28, 0x3b, 0xdb, 0x95, 0xcc, 0x2a, 0xba,
-	0x50, 0xec, 0x26, 0x96, 0x98, 0xaf, 0xa7, 0x86, 0x13, 0x32, 0x2a, 0x45, 0x17, 0x72, 0x3b, 0x25,
-	0xd7, 0x7e, 0x96, 0x1a, 0x0f, 0xa1, 0x0b, 0xc1, 0x63, 0x44, 0x17, 0x6a, 0x30, 0x42, 0xd6, 0xfc,
-	0x1c, 0x45, 0x1a, 0x4e, 0x17, 0x2a, 0x60, 0x9a, 0x2e, 0xe4, 0x78, 0xaa, 0x2e, 0xfc, 0x79, 0x40,
-	0x4b, 0xaf, 0x0b, 0xc1, 0x67, 0x54, 0x17, 0x86, 0x9b, 0x5d, 0xa9, 0x15, 0xbf, 0x00, 0x14, 0xa6,
-	0xd0, 0x85, 0x22, 0x45, 0x22, 0xba, 0x30, 0x02, 0x22, 0x08, 0xfc, 0x45, 0x08, 0x29, 0x9d, 0x2e,
-	0xd4, 0xa0, 0x34, 0x5d, 0x08, 0x9f, 0x00, 0x6b, 0xbf, 0x44, 0x21, 0x6c, 0x75, 0x21, 0x38, 0x08,
-	0x75, 0xa1, 0xe2, 0xcf, 0xfd, 0x49, 0x54, 0x68, 0xd5, 0xb7, 0x58, 0x95, 0x83, 0x52, 0xf7, 0x6d,
-	0x88, 0xe1, 0x87, 0x2d, 0x00, 0x6e, 0xac, 0x6f, 0xd1, 0x82, 0x48, 0xff, 0x3b, 0xdd, 0xee, 0x6e,
-	0x9f, 0x0f, 0xf6, 0xb7, 0xe4, 0x88, 0x7b, 0x16, 0x4d, 0x86, 0x08, 0x50, 0xd3, 0x7e, 0x0b, 0x20,
-	0xae, 0xb4, 0x87, 0x60, 0x05, 0x15, 0x30, 0x26, 0x5a, 0xca, 0x90, 0xbb, 0x8e, 0xa6, 0x42, 0x10,
-	0x5e, 0x63, 0x7f, 0x1b, 0x50, 0xae, 0xb2, 0x47, 0x81, 0x6a, 0x0c, 0x30, 0x85, 0x96, 0x3a, 0xa6,
-	0xe1, 0xf0, 0x0a, 0xfd, 0x3b, 0xa9, 0x71, 0xce, 0x18, 0x70, 0x78, 0x7d, 0x8f, 0x90, 0x46, 0xb0,
-	0xf7, 0xbb, 0xc3, 0x90, 0x46, 0x70, 0x8c, 0x34, 0x82, 0x63, 0xa4, 0x11, 0xec, 0xfd, 0xde, 0x50,
-	0xa4, 0x09, 0x18, 0x95, 0xb4, 0x08, 0x0e, 0x6f, 0x2d, 0xdf, 0x19, 0x8a, 0xb4, 0x28, 0x0e, 0x6f,
-	0x4c, 0x9b, 0xa8, 0x18, 0xe2, 0x88, 0x5e, 0xf3, 0xfb, 0x00, 0x74, 0xb5, 0x3d, 0x10, 0x6f, 0x61,
-	0x80, 0x34, 0xd9, 0xd2, 0x06, 0xdd, 0x26, 0x9a, 0x96, 0xd4, 0x09, 0xac, 0x3f, 0x00, 0xac, 0x6b,
-	0x52, 0x90, 0xb7, 0xae, 0x82, 0x4d, 0xb5, 0xf4, 0x51, 0x6d, 0x37, 0x40, 0x5f, 0xfc, 0xc3, 0xd4,
-	0xbb, 0x81, 0x75, 0x50, 0x7d, 0x37, 0x40, 0x53, 0x8d, 0xb1, 0x47, 0xb0, 0xf7, 0x47, 0xc3, 0xb1,
-	0x27, 0xbe, 0x27, 0x8d, 0x3d, 0x82, 0x0d, 0xec, 0x11, 0xec, 0xfd, 0xf1, 0x90, 0xec, 0x09, 0x30,
-	0x9d, 0xbd, 0xc8, 0xf6, 0xe3, 0x3d, 0xfd, 0x4f, 0x52, 0x6f, 0x3f, 0xe8, 0xfe, 0xfa, 0xf6, 0xe3,
-	0x8a, 0x40, 0x4b, 0x27, 0x50, 0x04, 0x7f, 0x9a, 0x3e, 0x9d, 0x98, 0x83, 0x48, 0x3a, 0x81, 0x9e,
-	0x50, 0x77, 0x03, 0xe8, 0x89, 0x3f, 0x4b, 0xbd, 0x1b, 0x98, 0xf2, 0xd0, 0x77, 0x03, 0x88, 0x91,
-	0x2d, 0x74, 0x20, 0x04, 0x51, 0xc4, 0xc8, 0x9f, 0x03, 0xd2, 0x2b, 0xec, 0x91, 0x42, 0x01, 0x02,
-	0x68, 0xc5, 0x56, 0x64, 0xd8, 0x3d, 0x8f, 0x66, 0x22, 0x88, 0xa2, 0xad, 0xfe, 0x05, 0x80, 0x5e,
-	0x9b, 0x12, 0x94, 0x8f, 0x01, 0xee, 0x81, 0x56, 0xfc, 0x13, 0x77, 0x07, 0x1d, 0x0c, 0xa1, 0x55,
-	0x89, 0xf2, 0x97, 0x00, 0x7c, 0xca, 0x1e, 0x58, 0xaa, 0x12, 0x80, 0x9d, 0x6e, 0x45, 0xc7, 0xdd,
-	0x3b, 0xd0, 0x21, 0xa5, 0xfa, 0x2a, 0x6a, 0xe5, 0xbb, 0x80, 0xba, 0x9c, 0xa6, 0x06, 0x87, 0x3a,
-	0x05, 0x60, 0xdd, 0x56, 0xec, 0x03, 0xf7, 0x6e, 0xe4, 0xc5, 0x70, 0x05, 0xd3, 0x7f, 0x05, 0xd0,
-	0xa7, 0x53, 0x43, 0x6b, 0x5c, 0x1f, 0x6a, 0x99, 0x3e, 0x13, 0xfb, 0x97, 0x35, 0x3a, 0xd0, 0x1c,
-	0x7f, 0x9d, 0x6a, 0xff, 0xb2, 0xce, 0x2f, 0x45, 0x07, 0xdd, 0xbf, 0xe1, 0x90, 0x48, 0xc6, 0x1d,
-	0x05, 0xe5, 0x6f, 0x52, 0x25, 0x23, 0x34, 0x7e, 0x09, 0x43, 0x93, 0x51, 0x8e, 0x09, 0x9c, 0x9e,
-	0x82, 0xf3, 0xb7, 0xa9, 0x70, 0xce, 0x18, 0x70, 0xe4, 0x98, 0x42, 0x1a, 0xc1, 0x00, 0xf3, 0x77,
-	0x69, 0x49, 0x23, 0x38, 0x46, 0x1a, 0x0c, 0xa9, 0xa4, 0x09, 0x94, 0xbf, 0x4f, 0x4d, 0x9a, 0x0a,
-	0x23, 0x48, 0xd3, 0x71, 0x7a, 0x0a, 0xce, 0x3f, 0xa4, 0x26, 0x2d, 0x8a, 0x23, 0xc7, 0x44, 0x4b,
-	0xe3, 0x6d, 0x14, 0x80, 0xfe, 0x31, 0x55, 0x4b, 0xe3, 0x7d, 0x5f, 0x22, 0xd1, 0x6f, 0x43, 0x19,
-	0x0c, 0xa9, 0x63, 0x25, 0x1a, 0x90, 0xfe, 0x29, 0x1d, 0x75, 0xcc, 0x43, 0x84, 0xba, 0x70, 0xcc,
-	0x2d, 0x21, 0xd4, 0x69, 0x37, 0x3a, 0xeb, 0x00, 0xf1, 0x74, 0xae, 0xe4, 0x94, 0xf7, 0x55, 0x47,
-	0x82, 0x71, 0x36, 0xc8, 0x2c, 0x8e, 0xa0, 0xfd, 0x60, 0x01, 0xf2, 0xf4, 0x19, 0x6a, 0x92, 0xab,
-	0x8e, 0x04, 0x30, 0x0f, 0xe4, 0xf2, 0xcb, 0xd0, 0x04, 0xd8, 0x70, 0xad, 0xfc, 0x2c, 0x35, 0x9a,
-	0xae, 0x8e, 0x04, 0x30, 0x95, 0x8b, 0xdd, 0xd0, 0x8a, 0x2b, 0xdd, 0xe7, 0xa8, 0x55, 0x21, 0xb4,
-	0xe2, 0x52, 0x55, 0xc5, 0x23, 0xd8, 0x7b, 0x9e, 0x1a, 0x65, 0x55, 0x3c, 0x82, 0x75, 0x3c, 0x82,
-	0xbd, 0xcf, 0x50, 0x23, 0x57, 0xc3, 0x53, 0xad, 0xb8, 0x48, 0xfc, 0x2c, 0xb5, 0x1a, 0xd5, 0xf0,
-	0x08, 0x76, 0x5f, 0x8e, 0x0a, 0x60, 0x25, 0x64, 0xd7, 0xe7, 0xa8, 0xd9, 0x58, 0x75, 0x24, 0x80,
-	0xd9, 0x42, 0xa2, 0x95, 0xd1, 0x24, 0xc7, 0x14, 0x86, 0x9f, 0xa7, 0x86, 0x53, 0xd5, 0x91, 0x00,
-	0x1c, 0x84, 0xf2, 0x2a, 0x8c, 0x00, 0xb4, 0xd5, 0x2f, 0x53, 0xb3, 0x4c, 0x18, 0x01, 0xa8, 0x23,
-	0x1d, 0x95, 0x60, 0xef, 0x57, 0xa8, 0x55, 0x5e, 0x47, 0x65, 0x07, 0x08, 0x1a, 0x2a, 0xc1, 0xde,
-	0xaf, 0x52, 0xc3, 0x62, 0x04, 0x55, 0x8d, 0x96, 0x6b, 0x92, 0x17, 0xa8, 0x9d, 0x13, 0x46, 0xcb,
-	0x45, 0x85, 0x64, 0x0e, 0x14, 0xc5, 0x17, 0xa8, 0xd5, 0xb8, 0x64, 0x0e, 0x24, 0x41, 0x18, 0x01,
-	0xe8, 0x81, 0x2f, 0x52, 0xa3, 0x89, 0x30, 0x02, 0xe8, 0xe8, 0x75, 0x54, 0x04, 0x1b, 0xa5, 0x9d,
-	0x7f, 0x29, 0x97, 0xfe, 0x31, 0x6e, 0x75, 0x24, 0x80, 0x50, 0x65, 0x0b, 0xbf, 0x15, 0x1d, 0x50,
-	0x21, 0x44, 0x57, 0xf9, 0x72, 0x6e, 0xa8, 0x57, 0x6c, 0xaa, 0x23, 0xc1, 0xb4, 0x04, 0x12, 0x5d,
-	0x64, 0x0d, 0xc1, 0xa0, 0xd6, 0xb0, 0xbf, 0x92, 0x1b, 0xe2, 0xfd, 0x9a, 0xea, 0x48, 0x30, 0xc5,
-	0x5c, 0x2a, 0x4d, 0x7a, 0x05, 0xb9, 0x62, 0xe3, 0x2a, 0x1d, 0xfa, 0xab, 0xb9, 0x34, 0xcf, 0xa2,
-	0xab, 0x23, 0x41, 0x91, 0x6f, 0x77, 0xd9, 0x8d, 0xcf, 0xa1, 0x43, 0x3a, 0x80, 0x20, 0xed, 0x6b,
-	0xb9, 0x94, 0x6f, 0xd6, 0x54, 0x47, 0x82, 0x03, 0x2a, 0x8c, 0x20, 0xec, 0xc7, 0x78, 0xe5, 0x00,
-	0xa6, 0xbe, 0x9e, 0xb3, 0x7e, 0x4d, 0xf0, 0x26, 0x3a, 0x5b, 0x30, 0xa5, 0xf8, 0x92, 0xb9, 0x01,
-	0x7b, 0x74, 0xc1, 0xfb, 0x86, 0xd8, 0xa4, 0x13, 0xca, 0x26, 0x5d, 0x88, 0xda, 0xf9, 0xde, 0x37,
-	0x4d, 0x76, 0x7e, 0xd4, 0x6e, 0xd1, 0xfb, 0x96, 0xc9, 0x6e, 0xd1, 0x3d, 0x89, 0x0e, 0xf2, 0x0c,
-	0xd2, 0x1f, 0x68, 0xdd, 0x9b, 0x97, 0x2f, 0xf4, 0x54, 0x9d, 0x00, 0xbe, 0x41, 0xfd, 0x79, 0xd6,
-	0x55, 0x82, 0xf6, 0xe8, 0xc3, 0xac, 0xf7, 0xe5, 0xd5, 0xb7, 0x7b, 0xaa, 0x0e, 0xe7, 0x32, 0xf2,
-	0x2c, 0xeb, 0x6a, 0x34, 0x13, 0x9d, 0xce, 0x2b, 0xe9, 0x7d, 0x79, 0xe5, 0x55, 0x9f, 0xaa, 0x13,
-	0x1c, 0xd4, 0xa7, 0xf3, 0xca, 0x7a, 0x55, 0x7c, 0x3e, 0xaf, 0xb1, 0xf7, 0xe7, 0xe5, 0x7b, 0x3f,
-	0xf1, 0xe9, 0x67, 0xc4, 0x63, 0x30, 0xd3, 0xea, 0x09, 0xf6, 0x1e, 0xc8, 0x47, 0x5f, 0x02, 0x32,
-	0x46, 0x40, 0x70, 0x52, 0x04, 0x04, 0x7b, 0x0f, 0xe6, 0x95, 0x37, 0x82, 0xcc, 0x11, 0x10, 0x9c,
-	0x14, 0x01, 0xc1, 0xde, 0x43, 0x79, 0xf9, 0x7a, 0x90, 0x39, 0x02, 0xf6, 0xe8, 0x6b, 0x36, 0x3a,
-	0x5d, 0x54, 0xe9, 0x87, 0xf3, 0xea, 0xbb, 0x42, 0x55, 0x27, 0x38, 0xa4, 0x7b, 0x10, 0xf5, 0xfd,
-	0x3a, 0xe4, 0xc5, 0x22, 0x10, 0x3e, 0x1e, 0xc9, 0x6b, 0x2f, 0x0e, 0x55, 0x9d, 0x60, 0x26, 0x12,
-	0x85, 0xa8, 0xfd, 0x57, 0xc7, 0xa9, 0x84, 0x2e, 0xf0, 0xfe, 0xbc, 0xf6, 0x16, 0x51, 0x9c, 0x47,
-	0xe8, 0x0b, 0x49, 0x81, 0x10, 0xec, 0x7d, 0x20, 0xaf, 0xbe, 0x52, 0x94, 0x10, 0x08, 0xc1, 0xc9,
-	0x81, 0x10, 0xec, 0x3d, 0x9a, 0xd7, 0xde, 0x2f, 0x4a, 0x0a, 0x84, 0x60, 0xf7, 0xfa, 0xf8, 0x17,
-	0xc2, 0x1b, 0xcb, 0x63, 0x79, 0xc3, 0xcb, 0x46, 0xf1, 0x6f, 0x86, 0x37, 0x9c, 0x1b, 0x0c, 0x1b,
-	0x03, 0x5a, 0xcf, 0xe3, 0x79, 0xf3, 0x9b, 0x47, 0x86, 0x3d, 0x02, 0x5d, 0xe9, 0xa6, 0x38, 0xb7,
-	0xd0, 0x9f, 0x9e, 0xc8, 0x0f, 0x7e, 0x0d, 0x29, 0x4e, 0x36, 0xb4, 0xb0, 0xd7, 0xa2, 0xb9, 0xa8,
-	0x43, 0xa5, 0x99, 0x3d, 0x99, 0x1f, 0xfa, 0x9d, 0xa4, 0xaa, 0x13, 0xcc, 0xea, 0xc0, 0xea, 0xdf,
-	0xa7, 0x17, 0xc7, 0x33, 0x46, 0x69, 0x0a, 0x4f, 0xe5, 0x87, 0x78, 0x41, 0xa9, 0xea, 0x04, 0x87,
-	0xa3, 0x79, 0x16, 0xda, 0xcc, 0xfd, 0x14, 0x9a, 0xd0, 0x7a, 0xdf, 0x8b, 0xf8, 0xa6, 0xf9, 0xdc,
-	0x5d, 0x08, 0x29, 0xfd, 0xf0, 0xc5, 0x44, 0xbe, 0x06, 0x15, 0xb4, 0x37, 0x39, 0x6d, 0xc1, 0xa9,
-	0x03, 0xed, 0x9d, 0x88, 0x74, 0x0e, 0x94, 0xc3, 0x73, 0x6b, 0x07, 0x57, 0xa3, 0x62, 0xf4, 0x70,
-	0xdc, 0x2d, 0xa2, 0xec, 0x6d, 0x8d, 0xf3, 0xcc, 0xc9, 0xbe, 0x80, 0xfe, 0xaf, 0x7b, 0x10, 0xe5,
-	0xee, 0xa8, 0x37, 0x7b, 0x0d, 0x2f, 0xc3, 0xc6, 0xe0, 0x1f, 0x95, 0xcc, 0x15, 0xce, 0xdc, 0x35,
-	0x68, 0x3a, 0x76, 0xf2, 0xbd, 0x9b, 0x83, 0x9c, 0xea, 0xe0, 0x15, 0xc8, 0x8d, 0x1f, 0x6a, 0xef,
-	0xe6, 0x61, 0xda, 0xec, 0xe1, 0xcc, 0xde, 0x3d, 0x14, 0x12, 0x83, 0xe0, 0xa7, 0x74, 0xbb, 0x39,
-	0xc8, 0x26, 0x07, 0xb1, 0x47, 0x0f, 0x6e, 0x72, 0x10, 0x7b, 0xf4, 0x30, 0xaa, 0x7a, 0x38, 0x85,
-	0x0e, 0x18, 0xce, 0x85, 0x77, 0x73, 0x31, 0xa6, 0xba, 0x58, 0x46, 0x07, 0x4d, 0xc7, 0xbd, 0xbb,
-	0xf9, 0x98, 0x32, 0x73, 0x29, 0xcf, 0x71, 0x77, 0x73, 0x90, 0x19, 0x10, 0xc7, 0x1e, 0xa9, 0xc8,
-	0x0f, 0x8a, 0x63, 0x8f, 0x3e, 0x8a, 0xe6, 0x2f, 0x44, 0x39, 0x50, 0xdd, 0xcd, 0x83, 0x93, 0xb0,
-	0x29, 0xe4, 0x51, 0xe9, 0x6e, 0x1e, 0xc6, 0xcd, 0x5c, 0xca, 0x53, 0xd0, 0xdd, 0x1c, 0x4c, 0xa8,
-	0x0e, 0xce, 0xa3, 0x43, 0xc6, 0xc3, 0x4d, 0x83, 0x93, 0x57, 0xa9, 0x4e, 0xd2, 0x3e, 0xcc, 0x55,
-	0xa0, 0xef, 0x46, 0x5e, 0xd2, 0x11, 0xa7, 0x01, 0xfd, 0x46, 0x15, 0x7d, 0x88, 0x07, 0xbc, 0xca,
-	0x02, 0x5e, 0x8b, 0x66, 0xcc, 0x47, 0x9d, 0x06, 0xf8, 0x1f, 0xd1, 0xe1, 0x53, 0x3e, 0xf1, 0x55,
-	0xc0, 0x7b, 0x68, 0x36, 0xe1, 0xc4, 0xd3, 0x80, 0x7e, 0x9d, 0x4e, 0xbd, 0xed, 0x43, 0x60, 0x2d,
-	0xe6, 0xb9, 0xe4, 0xd3, 0x4e, 0x03, 0xf2, 0x2b, 0xf5, 0xb8, 0x53, 0x3c, 0x16, 0x8e, 0xed, 0x56,
-	0xfd, 0xcc, 0x53, 0xc5, 0xcc, 0xed, 0xd6, 0x4b, 0x20, 0x61, 0x22, 0xc7, 0x99, 0xaa, 0x87, 0xe9,
-	0xbd, 0x79, 0x38, 0x93, 0xec, 0xa1, 0xb0, 0xb7, 0x7e, 0xa6, 0x9f, 0x41, 0xaa, 0x0e, 0xb2, 0x7b,
-	0x0f, 0x22, 0xc1, 0x83, 0xbb, 0xf7, 0x20, 0x12, 0x3c, 0x8c, 0xee, 0xe6, 0x01, 0x4a, 0x68, 0xf4,
-	0x44, 0x50, 0x75, 0x31, 0xb6, 0xc7, 0x30, 0xf4, 0xa3, 0x3e, 0xd5, 0xc3, 0xf8, 0x6e, 0x1e, 0xae,
-	0x44, 0x48, 0xfe, 0x3d, 0x6e, 0xad, 0x4b, 0xaa, 0x68, 0xe6, 0xf4, 0x5d, 0xdd, 0x46, 0x7b, 0x67,
-	0xb3, 0xd3, 0x1e, 0x4e, 0x63, 0xa9, 0x9e, 0x86, 0xd2, 0x4a, 0x47, 0xe6, 0xd1, 0xb8, 0x14, 0xdb,
-	0xe3, 0x08, 0x74, 0x71, 0x71, 0x84, 0xfe, 0xef, 0x72, 0x70, 0xea, 0x47, 0x6f, 0x2a, 0x3a, 0xee,
-	0x7e, 0x34, 0x76, 0x6d, 0xf5, 0x54, 0xf0, 0xea, 0x1b, 0x4e, 0x17, 0x33, 0x97, 0x8d, 0xef, 0xbb,
-	0xa7, 0x56, 0xbc, 0x70, 0xe1, 0xc2, 0x85, 0x8c, 0x7f, 0x16, 0xcd, 0x36, 0xc4, 0x22, 0x56, 0xb4,
-	0x3b, 0x8b, 0xae, 0x85, 0xe8, 0xf4, 0xee, 0xa9, 0x31, 0x96, 0x0f, 0x35, 0xa2, 0xd4, 0xd0, 0xaf,
-	0xc8, 0x6f, 0x20, 0xcf, 0x00, 0x02, 0x7f, 0x90, 0xdb, 0xa0, 0xbc, 0xa1, 0xc6, 0xb2, 0x75, 0x26,
-	0x86, 0xc2, 0x72, 0xdb, 0xdf, 0x40, 0x87, 0x0d, 0x30, 0x3b, 0xf6, 0x38, 0x6f, 0xac, 0xb1, 0x9c,
-	0x9e, 0x8d, 0xe1, 0x40, 0x09, 0x48, 0x00, 0xea, 0xd9, 0x03, 0xbd, 0xa9, 0xc6, 0x52, 0x3f, 0x0e,
-	0x04, 0x95, 0x22, 0x99, 0x38, 0x82, 0xad, 0x70, 0xde, 0x5c, 0x63, 0x15, 0xc2, 0x48, 0x1c, 0xc1,
-	0x03, 0x88, 0xb3, 0xc4, 0x79, 0x4b, 0x8d, 0xd5, 0x11, 0x33, 0x71, 0x89, 0x40, 0x3d, 0x7b, 0xa0,
-	0xb7, 0xd6, 0x58, 0xb9, 0x31, 0x13, 0x47, 0xb0, 0xbf, 0x89, 0xe6, 0x0c, 0x40, 0xe2, 0xe4, 0xc2,
-	0x06, 0xe9, 0x6d, 0x35, 0x56, 0x95, 0xbc, 0x18, 0x12, 0xaf, 0x62, 0xfe, 0x6d, 0xe8, 0x22, 0x13,
-	0x79, 0x69, 0xb0, 0xde, 0x5e, 0x63, 0xa2, 0xf5, 0x70, 0x9c, 0x3e, 0xee, 0x2d, 0x61, 0x43, 0xac,
-	0xc3, 0xab, 0x7d, 0x16, 0x48, 0xef, 0xa8, 0x31, 0x75, 0x1b, 0xdf, 0x10, 0x4c, 0x1b, 0x0f, 0xa2,
-	0xcf, 0xf2, 0x8b, 0x7a, 0x67, 0x8d, 0x69, 0xe0, 0x04, 0xfa, 0x08, 0x1e, 0x48, 0x9f, 0x25, 0xd6,
-	0xbb, 0x6a, 0x4c, 0x2b, 0x27, 0xd1, 0x97, 0xb8, 0xff, 0xe0, 0xb0, 0xc7, 0x0a, 0xaa, 0x5f, 0x63,
-	0xa2, 0x3a, 0xbe, 0xff, 0x40, 0x93, 0x27, 0x65, 0x14, 0x1c, 0xee, 0xd8, 0x00, 0xbd, 0xbb, 0xc6,
-	0xba, 0x80, 0x21, 0xa3, 0xe0, 0xc4, 0xd7, 0xbc, 0x21, 0xd8, 0x59, 0x91, 0x15, 0xce, 0x7b, 0x6a,
-	0x4c, 0xa2, 0xc7, 0x37, 0x04, 0x13, 0xf8, 0xfe, 0x03, 0x0e, 0xba, 0xc4, 0x80, 0x23, 0x8f, 0x90,
-	0xac, 0xc0, 0xde, 0x5b, 0x1b, 0x42, 0xca, 0xcf, 0xc5, 0x96, 0x18, 0x7e, 0xe6, 0x3f, 0xee, 0xa0,
-	0x52, 0xe2, 0x32, 0xf9, 0xe3, 0x01, 0xab, 0x95, 0xde, 0x5b, 0x1b, 0x4e, 0xf6, 0x5f, 0x62, 0x5e,
-	0x2c, 0xff, 0xd8, 0x7f, 0xd8, 0x41, 0xdf, 0x67, 0x58, 0xaf, 0xf2, 0x5c, 0xc6, 0x6a, 0xb5, 0xef,
-	0xab, 0x0d, 0xf3, 0x57, 0xc2, 0x45, 0xb1, 0xb5, 0xca, 0x0f, 0xfd, 0xfb, 0x1c, 0x74, 0xa9, 0xb1,
-	0x47, 0xc8, 0x63, 0x3c, 0xab, 0xa5, 0xde, 0x57, 0x4b, 0xf5, 0x27, 0xc5, 0xc5, 0x86, 0xce, 0x12,
-	0x7e, 0xea, 0x3f, 0xea, 0xa0, 0x23, 0x03, 0x16, 0x99, 0x66, 0x03, 0xdc, 0x5f, 0x4b, 0xfb, 0x07,
-	0xc8, 0xa5, 0x49, 0x4b, 0x15, 0x5f, 0xfe, 0x43, 0x0e, 0x92, 0xe9, 0xa6, 0xdf, 0xb4, 0xb6, 0x59,
-	0xe1, 0x03, 0x35, 0xf6, 0x38, 0xca, 0xe6, 0x4d, 0x1b, 0xb3, 0x80, 0x0d, 0x12, 0x56, 0xe3, 0x37,
-	0xd5, 0x1a, 0xa3, 0x3f, 0x30, 0xb2, 0x4b, 0xa6, 0xbe, 0x7a, 0x5d, 0x5c, 0xa2, 0x69, 0xcf, 0x97,
-	0xfc, 0x2d, 0xb5, 0x74, 0x46, 0x9e, 0x31, 0xd9, 0x65, 0x43, 0x5f, 0xbf, 0x6e, 0x3e, 0x1b, 0x07,
-	0x04, 0xdd, 0x78, 0xbb, 0xda, 0xed, 0xa2, 0x8f, 0xa5, 0xec, 0x76, 0x75, 0x5f, 0xbb, 0xae, 0xee,
-	0xc5, 0x11, 0xb9, 0x82, 0xdc, 0x32, 0x43, 0xa6, 0x90, 0x90, 0xf7, 0xf7, 0xd5, 0xeb, 0xee, 0x06,
-	0x44, 0x2e, 0x25, 0xbb, 0x89, 0xb4, 0x5a, 0x76, 0xd9, 0x07, 0xfa, 0xf1, 0xeb, 0xf2, 0x66, 0x6a,
-	0x09, 0x1e, 0x44, 0xad, 0x25, 0xec, 0x83, 0x7d, 0xed, 0xba, 0x7d, 0x02, 0xb5, 0x04, 0x0f, 0xa2,
-	0xd6, 0x12, 0xf2, 0xa1, 0xbe, 0x7a, 0x5d, 0x3f, 0x81, 0x5a, 0x82, 0xfd, 0xae, 0x2a, 0x61, 0x62,
-	0x4f, 0xe5, 0xac, 0x20, 0x1f, 0xee, 0xeb, 0xd7, 0xfd, 0x0f, 0xc7, 0x41, 0x85, 0xee, 0xbc, 0x13,
-	0x5d, 0x6c, 0xa4, 0x36, 0x0d, 0xec, 0x23, 0xfd, 0xc8, 0xcf, 0x05, 0xcc, 0x19, 0xe8, 0x15, 0x1a,
-	0xf4, 0x76, 0xf3, 0x4e, 0xb2, 0x17, 0xa1, 0xef, 0xef, 0x47, 0x7e, 0x6e, 0xc0, 0xb0, 0x8d, 0x40,
-	0x8f, 0x0e, 0x62, 0xd8, 0xf2, 0x4b, 0xfd, 0x40, 0x5f, 0xff, 0xb9, 0x82, 0x24, 0x86, 0x09, 0x1e,
-	0xcc, 0xb0, 0x25, 0xec, 0xa3, 0xfd, 0xc8, 0xcf, 0x1d, 0x24, 0x32, 0x4c, 0xb0, 0x7f, 0xde, 0xbc,
-	0x85, 0x53, 0xe8, 0xd4, 0xc7, 0xfa, 0xc6, 0x9f, 0x4b, 0x30, 0xec, 0x65, 0x2e, 0x5c, 0x5f, 0x97,
-	0x90, 0xb0, 0xf6, 0xca, 0xf5, 0xf1, 0x7e, 0xd2, 0xcf, 0x2d, 0x98, 0x72, 0x17, 0xd4, 0xec, 0xeb,
-	0x1d, 0xf3, 0xde, 0xb2, 0xd7, 0xb3, 0x4f, 0xf4, 0x77, 0xfb, 0xbd, 0x06, 0xc3, 0x66, 0x03, 0xad,
-	0xfb, 0x84, 0x26, 0xca, 0x4c, 0xcf, 0x4b, 0xad, 0x56, 0xf2, 0x64, 0xff, 0x7b, 0xf0, 0x83, 0x0f,
-	0x17, 0xc5, 0x17, 0x2b, 0x55, 0xef, 0x63, 0x9a, 0xea, 0x35, 0x3f, 0x63, 0xb5, 0x5a, 0xf2, 0x53,
-	0xfd, 0xa1, 0x7e, 0x31, 0xe2, 0x12, 0x53, 0x6d, 0x96, 0x2a, 0x6d, 0x4d, 0x3d, 0x72, 0xd2, 0x2e,
-	0x0b, 0xda, 0x2d, 0xf2, 0xbb, 0x0e, 0xbb, 0x59, 0x28, 0xcf, 0x9c, 0x02, 0xe5, 0x8a, 0xa1, 0xbf,
-	0xae, 0x8a, 0x16, 0xfd, 0xb2, 0xa1, 0x15, 0xcc, 0x07, 0x19, 0x8c, 0x7a, 0xe8, 0x14, 0xa8, 0x57,
-	0x14, 0xfd, 0x73, 0xea, 0x8e, 0x8d, 0x5c, 0x56, 0xb4, 0x02, 0xfa, 0x10, 0x03, 0x52, 0x4f, 0x9d,
-	0x02, 0xed, 0x8a, 0x63, 0x02, 0x52, 0x0a, 0xc9, 0xf0, 0x61, 0x86, 0x54, 0x30, 0x20, 0x71, 0xad,
-	0x90, 0xc8, 0x9d, 0x65, 0xd1, 0xfb, 0x08, 0x03, 0xca, 0x9a, 0xb9, 0x23, 0x78, 0x00, 0x77, 0x96,
-	0x40, 0x1f, 0x65, 0x40, 0x6e, 0x02, 0x77, 0x89, 0x48, 0x29, 0x34, 0xc1, 0xc7, 0x18, 0xd2, 0x68,
-	0x02, 0x77, 0x04, 0xfb, 0xb7, 0xaa, 0x05, 0x34, 0x7a, 0xd9, 0xd3, 0x0a, 0xea, 0xe3, 0x0c, 0x4a,
-	0x3d, 0x7a, 0x0a, 0xf4, 0x2b, 0xa2, 0x7e, 0x53, 0x6d, 0x8b, 0xb1, 0xcb, 0xa2, 0x56, 0x60, 0x9f,
-	0x60, 0x60, 0xea, 0xd9, 0x53, 0x10, 0xb9, 0x62, 0x9a, 0xb0, 0x2b, 0xec, 0xdb, 0xfe, 0x27, 0x19,
-	0x54, 0xc6, 0xb0, 0x2b, 0xa0, 0xd9, 0x0f, 0x60, 0xd0, 0xf2, 0xcb, 0xfa, 0x14, 0x43, 0xca, 0x27,
-	0x31, 0x48, 0xf0, 0x40, 0x06, 0x2d, 0xc1, 0x3e, 0xcd, 0xc0, 0x8a, 0x89, 0x0c, 0x26, 0xee, 0xc2,
-	0x14, 0x6d, 0xfd, 0x69, 0x86, 0xe5, 0x18, 0x76, 0x21, 0x6f, 0xe3, 0x09, 0x99, 0x65, 0xdf, 0xc5,
-	0x9f, 0x61, 0x48, 0xe3, 0xa6, 0xcc, 0x82, 0x96, 0x6d, 0xde, 0x15, 0xf6, 0x0d, 0xfb, 0x59, 0x06,
-	0x34, 0x61, 0xd8, 0x15, 0xd0, 0x95, 0x1f, 0xd4, 0x4e, 0xa0, 0x0c, 0xb7, 0x7d, 0xad, 0xd0, 0x9e,
-	0x63, 0x68, 0xc3, 0x1f, 0x41, 0x05, 0xd1, 0x3b, 0xc2, 0x54, 0x3d, 0x94, 0x12, 0xd7, 0x99, 0xe6,
-	0x04, 0xe2, 0x79, 0xb6, 0xd4, 0xef, 0xc9, 0x19, 0x54, 0x60, 0xb8, 0x64, 0xec, 0x3f, 0xa2, 0xc9,
-	0x1d, 0xd3, 0x7d, 0x63, 0xab, 0xe5, 0x7e, 0x86, 0x2f, 0x77, 0xe8, 0x43, 0xa8, 0x20, 0x76, 0x4b,
-	0xd9, 0xbf, 0x5f, 0x3b, 0x84, 0x32, 0x5e, 0x58, 0xb6, 0x5a, 0xeb, 0x67, 0xf9, 0x2e, 0x48, 0x7f,
-	0x0a, 0x15, 0xc4, 0xaf, 0x39, 0x53, 0x39, 0x76, 0x64, 0xc0, 0x2a, 0xd3, 0xec, 0x81, 0xcf, 0x71,
-	0x52, 0x87, 0x3a, 0x86, 0x0a, 0x8c, 0xf7, 0xa4, 0xfd, 0x87, 0xd5, 0x63, 0x28, 0xfd, 0x86, 0xb3,
-	0xcd, 0x12, 0x3f, 0xcf, 0x96, 0x98, 0xf2, 0x1c, 0x4a, 0xbf, 0x67, 0x9d, 0xb0, 0x9c, 0xe5, 0x82,
-	0x78, 0x55, 0xbf, 0xd7, 0xde, 0xec, 0xb4, 0x97, 0x67, 0xe3, 0xef, 0x48, 0xb2, 0x0f, 0x2e, 0x5b,
-	0x40, 0xfb, 0xd5, 0xf7, 0xc4, 0x4d, 0x0f, 0x44, 0x91, 0x3b, 0x21, 0x1f, 0x88, 0xbe, 0xe0, 0x2c,
-	0xbf, 0xe6, 0xc7, 0x6b, 0xb1, 0x65, 0x1f, 0x63, 0xcb, 0x5e, 0xed, 0xad, 0x1f, 0xdb, 0x6c, 0x77,
-	0x1b, 0xdb, 0xed, 0x7a, 0x93, 0xfd, 0xce, 0x2d, 0x1b, 0xdd, 0x39, 0xd6, 0x6c, 0x6c, 0xd4, 0xcf,
-	0x9e, 0x3f, 0x96, 0xf4, 0x93, 0xb8, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x83, 0x33, 0xd4, 0x34,
-	0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160519_a4ab9ec5/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/test.pb.go
deleted file mode 100644
index ec1eafe10bd..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/test.pb.go
+++ /dev/null
@@ -1,3590 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto2_20180125_92554152/test.proto
-
-/*
-Package proto2_20180125_92554152 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto2_20180125_92554152/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto2_20180125_92554152
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180125.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180125.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion          isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-var extRange_Message = []proto.ExtensionRange{
-	{10000, 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-type isMessage_OneofDefaultedUnion interface{ isMessage_OneofDefaultedUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum,oneof,def=0"`
-}
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()                          {}
-func (*Message_OneofInt32) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofInt64) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()                      {}
-func (*Message_OneofFloat) isMessage_OneofUnion()                         {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()                      {}
-func (*Message_OneofDouble) isMessage_OneofUnion()                        {}
-func (*Message_OneofString) isMessage_OneofUnion()                        {}
-func (*Message_OneofBytes) isMessage_OneofUnion()                         {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()                     {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()                  {}
-func (*Message_OneofNamedGroup) isMessage_OneofUnion()                    {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()                   {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion()                {}
-func (*Message_Oneofgroup) isMessage_OneofUnion()                         {}
-func (*Message_OneofString1) isMessage_OneofUnion()                       {}
-func (*Message_OneofString2) isMessage_OneofUnion()                       {}
-func (*Message_OneofString3) isMessage_OneofUnion()                       {}
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion()        {}
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion()   {}
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(700<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(701<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(702<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(703<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(704<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(705<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(706<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(707<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(708<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(709<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(710<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(711<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(712<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(713<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(714<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(715<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(716<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofNamedGroup:
-		b.EncodeVarint(717<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNamedGroup); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(718<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(719<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_Oneofgroup:
-		b.EncodeVarint(720<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Oneofgroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		b.EncodeVarint(721<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(722<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(723<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		t := uint64(0)
-		if x.OneofDefaultedBool {
-			t = 1
-		}
-		b.EncodeVarint(800<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofDefaultedInt32:
-		b.EncodeVarint(801<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		b.EncodeVarint(802<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofDefaultedSint32))
-	case *Message_OneofDefaultedUint32:
-		b.EncodeVarint(803<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		b.EncodeVarint(804<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		b.EncodeVarint(805<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofDefaultedSint64))
-	case *Message_OneofDefaultedUint64:
-		b.EncodeVarint(806<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		b.EncodeVarint(807<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedFixed32))
-	case *Message_OneofDefaultedSfixed32:
-		b.EncodeVarint(808<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedSfixed32))
-	case *Message_OneofDefaultedFloat:
-		b.EncodeVarint(809<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofDefaultedFloat)))
-	case *Message_OneofDefaultedFixed64:
-		b.EncodeVarint(810<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedFixed64))
-	case *Message_OneofDefaultedSfixed64:
-		b.EncodeVarint(811<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedSfixed64))
-	case *Message_OneofDefaultedDouble:
-		b.EncodeVarint(812<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDefaultedDouble))
-	case *Message_OneofDefaultedString:
-		b.EncodeVarint(813<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		b.EncodeVarint(814<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		b.EncodeVarint(815<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		b.EncodeVarint(816<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofDefaultedUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 700: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 701: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 702: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 703: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 704: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 705: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 706: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 707: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 708: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 709: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 710: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 711: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 712: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 713: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 714: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 715: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 716: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 717: // oneof_union.oneof_named_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_NamedGroup)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofNamedGroup{msg}
-		return true, err
-	case 718: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 719: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 720: // oneof_union.oneofgroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_OneofGroup)
-		err := b.DecodeGroup(msg)
-		m.OneofUnion = &Message_Oneofgroup{msg}
-		return true, err
-	case 721: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 722: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 723: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	case 800: // oneof_defaulted_union.oneof_defaulted_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBool{x != 0}
-		return true, err
-	case 801: // oneof_defaulted_union.oneof_defaulted_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt32{int32(x)}
-		return true, err
-	case 802: // oneof_defaulted_union.oneof_defaulted_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint32{int32(x)}
-		return true, err
-	case 803: // oneof_defaulted_union.oneof_defaulted_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint32{uint32(x)}
-		return true, err
-	case 804: // oneof_defaulted_union.oneof_defaulted_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt64{int64(x)}
-		return true, err
-	case 805: // oneof_defaulted_union.oneof_defaulted_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint64{int64(x)}
-		return true, err
-	case 806: // oneof_defaulted_union.oneof_defaulted_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint64{x}
-		return true, err
-	case 807: // oneof_defaulted_union.oneof_defaulted_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed32{uint32(x)}
-		return true, err
-	case 808: // oneof_defaulted_union.oneof_defaulted_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed32{int32(x)}
-		return true, err
-	case 809: // oneof_defaulted_union.oneof_defaulted_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 810: // oneof_defaulted_union.oneof_defaulted_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed64{x}
-		return true, err
-	case 811: // oneof_defaulted_union.oneof_defaulted_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed64{int64(x)}
-		return true, err
-	case 812: // oneof_defaulted_union.oneof_defaulted_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedDouble{math.Float64frombits(x)}
-		return true, err
-	case 813: // oneof_defaulted_union.oneof_defaulted_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedString{x}
-		return true, err
-	case 814: // oneof_defaulted_union.oneof_defaulted_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBytes{x}
-		return true, err
-	case 815: // oneof_defaulted_union.oneof_defaulted_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 816: // oneof_defaulted_union.oneof_defaulted_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSiblingEnum{SiblingEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(700<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(701<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(702<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(703<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(704<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(705<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(706<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(707<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(708<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(709<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(710<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(711<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(712<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(713<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(714<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(715<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(716<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofNamedGroup:
-		s := proto.Size(x.OneofNamedGroup)
-		n += proto.SizeVarint(717<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(718<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(719<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_Oneofgroup:
-		n += proto.SizeVarint(720<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Oneofgroup)
-		n += proto.SizeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		n += proto.SizeVarint(721<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(722<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(723<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		n += proto.SizeVarint(800<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofDefaultedInt32:
-		n += proto.SizeVarint(801<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		n += proto.SizeVarint(802<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofDefaultedSint32) << 1) ^ uint32((int32(x.OneofDefaultedSint32) >> 31))))
-	case *Message_OneofDefaultedUint32:
-		n += proto.SizeVarint(803<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		n += proto.SizeVarint(804<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		n += proto.SizeVarint(805<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofDefaultedSint64<<1) ^ uint64((int64(x.OneofDefaultedSint64) >> 63))))
-	case *Message_OneofDefaultedUint64:
-		n += proto.SizeVarint(806<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		n += proto.SizeVarint(807<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedSfixed32:
-		n += proto.SizeVarint(808<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFloat:
-		n += proto.SizeVarint(809<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofDefaultedFixed64:
-		n += proto.SizeVarint(810<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedSfixed64:
-		n += proto.SizeVarint(811<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedDouble:
-		n += proto.SizeVarint(812<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDefaultedString:
-		n += proto.SizeVarint(813<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedString)))
-		n += len(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		n += proto.SizeVarint(814<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedBytes)))
-		n += len(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		n += proto.SizeVarint(815<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		n += proto.SizeVarint(816<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool,json=extensionOptionalBool",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32,json=extensionOptionalInt32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32,json=extensionOptionalSint32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32,json=extensionOptionalUint32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64,json=extensionOptionalInt64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64,json=extensionOptionalSint64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64,json=extensionOptionalUint64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32,json=extensionOptionalFixed32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32,json=extensionOptionalSfixed32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float,json=extensionOptionalFloat",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64,json=extensionOptionalFixed64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64,json=extensionOptionalSfixed64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double,json=extensionOptionalDouble",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string,json=extensionOptionalString",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes,json=extensionOptionalBytes",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,json=extensionOptionalChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message,json=extensionOptionalChildMessage",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group,json=extensionOptionalNamedGroup",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,json=extensionOptionalSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message,json=extensionOptionalSiblingMessage",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20180125.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup,json=extensionoptionalgroup",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,json=extensionDefaultedBool,def=1",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,json=extensionDefaultedInt32,def=-12345",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,json=extensionDefaultedSint32,def=-3200",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,json=extensionDefaultedUint32,def=3200",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,json=extensionDefaultedInt64,def=-123456789",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,json=extensionDefaultedSint64,def=-6400",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,json=extensionDefaultedUint64,def=6400",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,json=extensionDefaultedFixed32,def=320000",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,json=extensionDefaultedSfixed32,def=-320000",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,json=extensionDefaultedFloat,def=3.14159",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,json=extensionDefaultedFixed64,def=640000",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,json=extensionDefaultedSfixed64,def=-640000",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,json=extensionDefaultedDouble,def=3.14159265359",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,json=extensionDefaultedString,def=hello, \"world!\"\n",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,json=extensionDefaultedBytes,def=dead\\336\\255\\276\\357beef",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,json=extensionDefaultedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum,def=0",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,json=extensionDefaultedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum,def=0",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool,json=extensionRepeatedBool",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32,json=extensionRepeatedInt32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32,json=extensionRepeatedSint32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32,json=extensionRepeatedUint32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64,json=extensionRepeatedInt64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64,json=extensionRepeatedSint64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64,json=extensionRepeatedUint64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32,json=extensionRepeatedFixed32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32,json=extensionRepeatedSfixed32",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float,json=extensionRepeatedFloat",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64,json=extensionRepeatedFixed64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64,json=extensionRepeatedSfixed64",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double,json=extensionRepeatedDouble",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string,json=extensionRepeatedString",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes,json=extensionRepeatedBytes",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,json=extensionRepeatedChildEnum,enum=google.golang.org.proto2_20180125.Message_ChildEnum",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message,json=extensionRepeatedChildMessage",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group,json=extensionRepeatedNamedGroup",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,json=extensionRepeatedSiblingEnum,enum=google.golang.org.proto2_20180125.SiblingEnum",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20180125.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message,json=extensionRepeatedSiblingMessage",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20180125.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup,json=extensionrepeatedgroup",
-	Filename:      "proto2_20180125_92554152/test.proto",
-}
-
-type Message_ChildMessage struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4               *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()                    { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()               {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()                    { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()               {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 2} }
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()                    { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()               {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 3} }
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()                    { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()               {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 4} }
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()                    { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string            { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()               {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 33} }
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 34}
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1               *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2               *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3               []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 35}
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20180125.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20180125.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20180125.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20180125.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20180125.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20180125.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20180125.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20180125.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20180125.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20180125.Message.ExtensionRepeatedGroup")
-	proto.RegisterEnum("google.golang.org.proto2_20180125.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20180125.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-}
-
-func init() { proto.RegisterFile("proto2_20180125_92554152/test.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 4468 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x67, 0x70, 0x24, 0xc7,
-	0x75, 0xc6, 0xec, 0x62, 0x17, 0x87, 0x3e, 0x2c, 0xb0, 0x98, 0xbb, 0x03, 0xe6, 0x40, 0xd2, 0x5c,
-	0x41, 0xb2, 0xbc, 0xa6, 0x79, 0x38, 0x60, 0xd0, 0xe8, 0xe3, 0xad, 0x19, 0x04, 0x90, 0x47, 0x2d,
-	0x65, 0x71, 0xa9, 0x1a, 0xd6, 0xb9, 0x5c, 0x2e, 0x96, 0x61, 0xdc, 0x61, 0x81, 0x03, 0xb9, 0x01,
-	0x04, 0x76, 0x49, 0x9e, 0x25, 0x17, 0xcf, 0x72, 0xfc, 0x49, 0xe5, 0xb4, 0x92, 0x28, 0x66, 0x89,
-	0x51, 0x39, 0x31, 0x29, 0xd8, 0xa6, 0x72, 0x72, 0x90, 0x93, 0x9c, 0x93, 0x9c, 0x73, 0x0e, 0xd5,
-	0xfd, 0xba, 0xa7, 0xbb, 0x67, 0x7a, 0x16, 0xe8, 0x59, 0x15, 0x7f, 0xb0, 0x8a, 0xd7, 0xfb, 0xfa,
-	0x7d, 0xfd, 0xbe, 0xed, 0xf7, 0xde, 0x87, 0x9e, 0xe9, 0x45, 0x2f, 0xdd, 0xde, 0x69, 0x77, 0xda,
-	0xfe, 0xaa, 0x3f, 0xbf, 0x70, 0xc5, 0xfc, 0x82, 0xbf, 0xb4, 0x7a, 0xd2, 0x5f, 0x5a, 0xc2, 0x0b,
-	0x4b, 0xfe, 0xf1, 0x4e, 0x7d, 0xb7, 0x33, 0xc7, 0x3e, 0x75, 0x5f, 0xb2, 0xd9, 0x6e, 0x6f, 0x36,
-	0xea, 0x73, 0x9b, 0xed, 0xc6, 0x5a, 0x6b, 0x73, 0xae, 0xbd, 0xb3, 0x39, 0x17, 0x99, 0x36, 0xfb,
-	0x3a, 0x34, 0x7e, 0xf3, 0xd6, 0x99, 0xc6, 0x56, 0x6b, 0xf3, 0xc6, 0xfa, 0xee, 0xee, 0xda, 0x66,
-	0xdd, 0x1d, 0x47, 0x99, 0x8d, 0x05, 0xcf, 0x29, 0x39, 0xe5, 0xd1, 0x20, 0xb3, 0xb1, 0xc0, 0xfe,
-	0xed, 0x7b, 0x99, 0x52, 0x86, 0xfd, 0xdb, 0x67, 0xff, 0x5e, 0xf4, 0xb2, 0xa5, 0x2c, 0xfb, 0xf7,
-	0xa2, 0x5b, 0x41, 0x99, 0x0d, 0xec, 0x0d, 0x97, 0x9c, 0xf2, 0x41, 0xff, 0xb2, 0xb9, 0x3d, 0x11,
-	0xe7, 0x38, 0x4e, 0x90, 0xd9, 0xc0, 0xb3, 0xdf, 0x79, 0xd4, 0x41, 0x23, 0x02, 0xf8, 0x34, 0x42,
-	0xad, 0xb5, 0x66, 0x7d, 0x7d, 0x73, 0xa7, 0xdd, 0xdd, 0x66, 0x0b, 0x40, 0xfe, 0xd2, 0xfe, 0x1d,
-	0xce, 0xd5, 0xe8, 0xe4, 0x57, 0xd2, 0xc9, 0x81, 0xe2, 0xc8, 0x7d, 0x29, 0x2a, 0xb4, 0xb7, 0x3b,
-	0x5b, 0xed, 0xd6, 0x5a, 0x63, 0xf5, 0x4c, 0xbb, 0xdd, 0xf0, 0xd6, 0x4b, 0x4e, 0xf9, 0x40, 0x30,
-	0x26, 0x06, 0x57, 0xda, 0xed, 0x86, 0xfb, 0xfd, 0x68, 0x3c, 0x34, 0xda, 0x6a, 0x75, 0x16, 0x7d,
-	0xaf, 0x5e, 0x72, 0xca, 0xb9, 0x20, 0x9c, 0x7a, 0x03, 0x1d, 0x74, 0x7f, 0x00, 0x4d, 0x84, 0x66,
-	0xbb, 0x60, 0xb7, 0x51, 0x72, 0xca, 0x93, 0x41, 0x38, 0xfb, 0xe6, 0xad, 0x98, 0x61, 0x17, 0x0c,
-	0x37, 0x4b, 0x4e, 0xb9, 0x20, 0x0d, 0x4f, 0x83, 0x61, 0x04, 0x98, 0x60, 0xef, 0x5c, 0xc9, 0x29,
-	0x67, 0x35, 0x60, 0x82, 0x63, 0xc0, 0x04, 0x7b, 0x5b, 0x25, 0xa7, 0xec, 0xea, 0xc0, 0x11, 0xc3,
-	0x2e, 0x18, 0xde, 0x5a, 0x72, 0xca, 0xc3, 0x3a, 0x30, 0xc1, 0xee, 0x0f, 0xa2, 0x62, 0x68, 0xb8,
-	0xb1, 0x75, 0x57, 0x7d, 0x7d, 0xd1, 0xf7, 0x6e, 0x2b, 0x39, 0xe5, 0x91, 0x20, 0x74, 0x70, 0x3d,
-	0x0c, 0xbb, 0x3f, 0x84, 0x26, 0x25, 0xb8, 0xb0, 0x6d, 0x94, 0x9c, 0xf2, 0x44, 0x10, 0xfa, 0xb8,
-	0x99, 0x8f, 0x6b, 0x01, 0x6d, 0x34, 0xda, 0x6b, 0x1d, 0xaf, 0x59, 0x72, 0xca, 0x19, 0x19, 0xd0,
-	0xf5, 0x74, 0x30, 0x0e, 0x4f, 0xb0, 0xd7, 0x2a, 0x39, 0xe5, 0x7c, 0x04, 0x9e, 0x60, 0x03, 0x3c,
-	0xc1, 0x5e, 0xbb, 0xe4, 0x94, 0x8b, 0x51, 0xf8, 0x48, 0xfc, 0xeb, 0xed, 0xee, 0x99, 0x46, 0xdd,
-	0xdb, 0x2e, 0x39, 0x65, 0x47, 0xc6, 0x7f, 0x1d, 0x1b, 0xd5, 0x19, 0xed, 0xec, 0x6c, 0xb5, 0x36,
-	0xbd, 0xdb, 0xd9, 0x9e, 0x97, 0x8c, 0xb2, 0x51, 0x2d, 0xa0, 0x33, 0xe7, 0x3b, 0xf5, 0x5d, 0x6f,
-	0xa7, 0xe4, 0x94, 0xc7, 0x64, 0x40, 0x2b, 0x74, 0xd0, 0x5d, 0x47, 0x87, 0x42, 0xb3, 0xb3, 0xe7,
-	0xb6, 0x1a, 0xeb, 0xab, 0xf5, 0x56, 0xb7, 0xe9, 0xed, 0x96, 0x9c, 0xf2, 0xb8, 0x8f, 0x2d, 0xb6,
-	0xf1, 0xb5, 0x74, 0xf2, 0xa9, 0x56, 0xb7, 0x19, 0x84, 0x61, 0x87, 0x43, 0x6e, 0x13, 0x4d, 0x45,
-	0x50, 0x9a, 0x30, 0xcd, 0xeb, 0xb0, 0x04, 0x3c, 0x61, 0x0b, 0x24, 0xb2, 0xf1, 0xb0, 0x86, 0x25,
-	0x52, 0x72, 0x13, 0x85, 0xe3, 0xab, 0x2c, 0xa5, 0x56, 0x21, 0x39, 0xbb, 0x0c, 0x2c, 0x65, 0x72,
-	0xba, 0xc2, 0xa5, 0x1c, 0x73, 0xcf, 0xa0, 0x23, 0xca, 0xfe, 0x66, 0xf5, 0x08, 0xf8, 0xbb, 0x83,
-	0xf1, 0x37, 0xb7, 0x0f, 0x24, 0x5e, 0xc6, 0x18, 0x73, 0x87, 0x64, 0x56, 0x84, 0x83, 0xee, 0x6d,
-	0xc8, 0x8b, 0x61, 0x08, 0xf6, 0xee, 0x64, 0x01, 0x2d, 0xec, 0x1f, 0x46, 0xf0, 0x36, 0x15, 0x41,
-	0x12, 0xcc, 0xfd, 0x84, 0xac, 0x3a, 0x40, 0xd9, 0x5d, 0xac, 0x9e, 0x5d, 0x61, 0x41, 0xd9, 0x4d,
-	0x7c, 0x3e, 0xb0, 0xa6, 0xbb, 0x73, 0x2f, 0x47, 0xe3, 0xeb, 0xf5, 0x8d, 0xb5, 0x6e, 0xa3, 0x53,
-	0x5f, 0x87, 0xb2, 0xf6, 0x02, 0xad, 0x98, 0x07, 0x2a, 0xc3, 0x9d, 0x9d, 0x6e, 0x3d, 0x28, 0x84,
-	0x1f, 0xb2, 0xf2, 0x36, 0x8f, 0x26, 0xa4, 0x35, 0x94, 0xa3, 0x2f, 0x50, 0xf3, 0x5c, 0x25, 0x7f,
-	0x6c, 0xc1, 0x5f, 0xc4, 0x4b, 0x81, 0xf4, 0x06, 0x95, 0x6e, 0x01, 0x15, 0xe5, 0x0c, 0x5e, 0xea,
-	0xbe, 0x48, 0xa7, 0x4c, 0x56, 0x72, 0xc7, 0x16, 0xfd, 0xf9, 0xf9, 0x40, 0x7a, 0xe4, 0x35, 0x6f,
-	0x5e, 0x9d, 0xc2, 0x8b, 0xde, 0x97, 0xe8, 0x94, 0x42, 0x65, 0x38, 0x32, 0x83, 0x17, 0x3f, 0x1c,
-	0x59, 0x16, 0xc1, 0xde, 0x97, 0xe9, 0x84, 0x6c, 0x05, 0xc1, 0xb2, 0xc8, 0x89, 0x2b, 0x4e, 0xea,
-	0x4b, 0x23, 0x38, 0xbe, 0x34, 0x82, 0xbd, 0xaf, 0xd0, 0x69, 0x6e, 0x25, 0x77, 0x8c, 0xe0, 0xd8,
-	0xd2, 0x08, 0x8e, 0x2f, 0x8d, 0x60, 0xef, 0xab, 0x74, 0xca, 0x70, 0x65, 0x38, 0x32, 0x83, 0x97,
-	0x47, 0x8c, 0x26, 0xe5, 0x0c, 0x51, 0xf3, 0xbe, 0x46, 0xa7, 0x8c, 0x54, 0xf2, 0x34, 0x9a, 0xf9,
-	0xf9, 0x40, 0xfa, 0x14, 0x95, 0xf2, 0x04, 0x72, 0x95, 0xa5, 0x89, 0x69, 0x5f, 0xa7, 0xd3, 0x26,
-	0x2a, 0x23, 0xc7, 0xf8, 0x3c, 0xe9, 0x39, 0xac, 0x9a, 0x0b, 0x2a, 0x13, 0x50, 0x36, 0xbf, 0x41,
-	0x67, 0x65, 0x2a, 0x23, 0x8b, 0x73, 0x0b, 0x78, 0x61, 0x49, 0xa5, 0x01, 0x2a, 0x68, 0x7c, 0x85,
-	0x04, 0x7b, 0xdf, 0xa4, 0x93, 0xf2, 0x95, 0x3c, 0x0d, 0x2a, 0xbe, 0x42, 0x82, 0x4d, 0x2b, 0x24,
-	0xd8, 0xfb, 0x16, 0x9d, 0x56, 0xac, 0x8c, 0x1c, 0xe3, 0xf3, 0xa2, 0x2b, 0x24, 0xd8, 0x3d, 0xa9,
-	0x52, 0xc8, 0x2b, 0xeb, 0xaf, 0xd1, 0x69, 0x4e, 0xa5, 0xc0, 0x97, 0xe8, 0x93, 0xa5, 0xc5, 0xa5,
-	0x93, 0x0a, 0x97, 0xbc, 0xd4, 0x5e, 0xa9, 0x7d, 0x61, 0x50, 0x6b, 0x7f, 0x9d, 0x09, 0x8c, 0x4a,
-	0xf1, 0x5c, 0xbd, 0xd1, 0x68, 0x5f, 0x5e, 0x9a, 0xbd, 0xb3, 0xbd, 0xd3, 0x58, 0x7f, 0xc9, 0x2c,
-	0x52, 0xbf, 0x3b, 0xa8, 0xbf, 0x2b, 0x2a, 0x35, 0x50, 0x80, 0x7f, 0x83, 0x4e, 0x1e, 0xab, 0x78,
-	0xeb, 0xf5, 0xb5, 0xf5, 0x5b, 0x16, 0x17, 0xc9, 0x2d, 0xfe, 0xd2, 0xd2, 0x2d, 0xfe, 0x09, 0x72,
-	0xcb, 0xe2, 0xd2, 0x89, 0x33, 0xf5, 0xfa, 0x86, 0xc2, 0x15, 0x14, 0xe7, 0x16, 0x3a, 0x2c, 0x7d,
-	0x28, 0xd5, 0xf9, 0x37, 0x9d, 0xf4, 0xe5, 0xb9, 0x92, 0x5b, 0x7e, 0xf5, 0x6b, 0xaa, 0xcb, 0x81,
-	0xe4, 0x53, 0x96, 0xe9, 0x06, 0x9a, 0x52, 0xb7, 0xa8, 0x52, 0xcf, 0xbe, 0xed, 0xa4, 0x29, 0x68,
-	0x02, 0xeb, 0xb0, 0xb2, 0xb1, 0x65, 0x61, 0x7b, 0x19, 0x2a, 0xec, 0xd4, 0x6f, 0xef, 0x6e, 0xed,
-	0x88, 0x52, 0xf0, 0x18, 0x55, 0x6b, 0x07, 0x82, 0x31, 0x31, 0xca, 0x6a, 0xc0, 0xcb, 0xd1, 0x78,
-	0x68, 0x05, 0xc9, 0xf9, 0x38, 0x35, 0xcb, 0x05, 0xe1, 0x64, 0xc8, 0xfc, 0x32, 0x9a, 0x08, 0xed,
-	0x78, 0xe2, 0x3f, 0x41, 0x0d, 0x27, 0x83, 0x70, 0x3e, 0x4f, 0x78, 0xd5, 0x92, 0xe7, 0xfb, 0x93,
-	0xd4, 0xb2, 0x20, 0x2d, 0x79, 0xa2, 0x47, 0xb0, 0x09, 0xf6, 0x9e, 0xa2, 0x86, 0x59, 0x0d, 0x9b,
-	0xe0, 0x18, 0x36, 0xc1, 0xde, 0x07, 0xa9, 0xa1, 0xab, 0x63, 0x47, 0x2c, 0x79, 0x42, 0x7f, 0x88,
-	0x5a, 0x0e, 0xeb, 0xd8, 0x04, 0xbb, 0x97, 0xa1, 0x62, 0x68, 0x29, 0x32, 0xf2, 0xc3, 0xd4, 0x74,
-	0x24, 0x08, 0x5d, 0x88, 0xfc, 0xbd, 0x1c, 0x4d, 0x4a, 0x7c, 0x61, 0xfc, 0x11, 0x6a, 0x3c, 0x11,
-	0x84, 0x5e, 0xc2, 0xa4, 0x55, 0xa3, 0x82, 0x9c, 0xfd, 0x28, 0x35, 0xcd, 0xc8, 0xa8, 0x20, 0x53,
-	0x63, 0x2b, 0x20, 0xd8, 0xfb, 0x18, 0xb5, 0xcc, 0x47, 0x56, 0x40, 0xb0, 0x61, 0x05, 0x04, 0x7b,
-	0x1f, 0xa7, 0xc6, 0xc5, 0xe8, 0x0a, 0x22, 0x2c, 0xf0, 0x9c, 0xfc, 0x04, 0xb5, 0x75, 0x24, 0x0b,
-	0x3c, 0x07, 0x35, 0x66, 0x21, 0x05, 0x3f, 0x09, 0x9a, 0x5e, 0x32, 0x0b, 0xf9, 0xa6, 0x46, 0x05,
-	0xe9, 0xf6, 0x29, 0x6a, 0x38, 0x26, 0xa3, 0x82, 0x9c, 0xaa, 0xa3, 0x43, 0xa1, 0x9d, 0x92, 0x52,
-	0x9f, 0xa6, 0xc6, 0xa9, 0x15, 0x8f, 0xf0, 0x28, 0x53, 0xa9, 0x85, 0xa6, 0x22, 0x30, 0xa2, 0x67,
-	0x3f, 0x4d, 0x91, 0x06, 0x91, 0x3c, 0x1a, 0x98, 0x68, 0xdc, 0xe7, 0x50, 0x38, 0xae, 0x49, 0x9e,
-	0x67, 0x00, 0x2d, 0xad, 0xe6, 0x11, 0x3e, 0x15, 0xcd, 0x73, 0x16, 0x1d, 0x51, 0x36, 0xbb, 0x52,
-	0x23, 0x9e, 0x05, 0x0a, 0xad, 0x45, 0x8f, 0x4c, 0x11, 0x59, 0x1b, 0x1a, 0xc8, 0x8b, 0x81, 0x08,
-	0x02, 0x9f, 0x83, 0x90, 0xd2, 0xa8, 0x9e, 0x08, 0x94, 0x20, 0x6f, 0x55, 0x56, 0x22, 0x60, 0xed,
-	0x79, 0x0a, 0x61, 0x27, 0x7b, 0x02, 0xee, 0x80, 0xcb, 0x1e, 0xcd, 0x9f, 0x7b, 0x15, 0x9a, 0x96,
-	0x1b, 0x5e, 0xd7, 0x3f, 0xf7, 0x64, 0x69, 0xd1, 0xe3, 0xfa, 0x27, 0x64, 0xf6, 0x3a, 0x4d, 0x07,
-	0x2d, 0x2b, 0x6c, 0x44, 0x05, 0xd1, 0x1b, 0xe8, 0x7c, 0x29, 0x88, 0xa6, 0x62, 0x1e, 0xa0, 0x3c,
-	0xae, 0xa0, 0xa3, 0x06, 0x17, 0xbc, 0x50, 0xbe, 0x91, 0xfa, 0x08, 0x15, 0xd2, 0x74, 0xcc, 0x05,
-	0x2f, 0x9c, 0xcb, 0x46, 0x1f, 0xbc, 0x84, 0xbe, 0x89, 0xfa, 0x10, 0x92, 0x29, 0xee, 0x82, 0x57,
-	0xd4, 0x53, 0x49, 0x91, 0x10, 0xec, 0xbd, 0x99, 0x7a, 0xd0, 0x35, 0x94, 0x31, 0x1a, 0x82, 0xfb,
-	0x44, 0x43, 0xb0, 0xf7, 0x16, 0xea, 0x27, 0x14, 0x55, 0xe6, 0x68, 0x08, 0xee, 0x13, 0x0d, 0xc1,
-	0xde, 0x5b, 0xa9, 0x0f, 0xa1, 0xb2, 0xcc, 0xd1, 0x10, 0xec, 0x9e, 0x42, 0x33, 0x06, 0x17, 0xa2,
-	0x00, 0xbf, 0x8d, 0xfa, 0x90, 0xb2, 0xcb, 0x8b, 0x79, 0x11, 0xe5, 0xbb, 0x8a, 0x2e, 0x32, 0x45,
-	0x23, 0xfc, 0xbc, 0x9d, 0xfa, 0x51, 0x74, 0xd8, 0xd1, 0x78, 0x44, 0xa2, 0xb4, 0xaf, 0x18, 0xe9,
-	0x85, 0x22, 0xff, 0x0e, 0xea, 0x46, 0x11, 0x66, 0x71, 0x6e, 0xa1, 0xec, 0xf7, 0x09, 0x8a, 0x60,
-	0xef, 0x9d, 0xd4, 0x8b, 0x54, 0x6a, 0x09, 0x41, 0x11, 0xdc, 0x37, 0x28, 0x82, 0xbd, 0x77, 0x51,
-	0x3f, 0x8a, 0x74, 0x4b, 0x0a, 0x8a, 0x60, 0xf7, 0x55, 0xc6, 0x2f, 0x8a, 0xf7, 0x8d, 0x1e, 0xf5,
-	0x13, 0xd3, 0x72, 0xf1, 0x6f, 0x8c, 0xf7, 0x93, 0x1b, 0xcd, 0x1b, 0x07, 0x3a, 0xcb, 0xbb, 0xa9,
-	0x2f, 0x93, 0xb8, 0x33, 0xec, 0x21, 0x68, 0x3a, 0x37, 0x1b, 0xf9, 0x86, 0xf6, 0xf3, 0x1e, 0xea,
-	0xad, 0x9f, 0xda, 0x8b, 0x7f, 0x01, 0xd0, 0xa1, 0xee, 0x46, 0x97, 0x18, 0x9c, 0x2a, 0xbd, 0xea,
-	0xbd, 0xd9, 0xf4, 0xbd, 0x4a, 0x48, 0xb2, 0x99, 0x18, 0xb8, 0xec, 0x5d, 0x3f, 0x8d, 0x2e, 0x35,
-	0x66, 0x97, 0x52, 0xeb, 0xef, 0xcd, 0xa6, 0xa9, 0xf5, 0x02, 0xfc, 0x62, 0x43, 0x4e, 0x46, 0x74,
-	0xe1, 0x76, 0x7d, 0x2d, 0x2c, 0x91, 0xff, 0x9c, 0x2d, 0x65, 0x41, 0x17, 0xc2, 0xa8, 0xd4, 0x85,
-	0xdc, 0x0a, 0x2a, 0xd0, 0xbf, 0x50, 0x33, 0xa6, 0x0b, 0x61, 0x58, 0xd1, 0x85, 0xdc, 0x8e, 0x97,
-	0xbb, 0x7f, 0xa5, 0x86, 0x4c, 0x17, 0xc2, 0xb8, 0xaa, 0x0b, 0xb9, 0x25, 0x2f, 0x6a, 0xff, 0x46,
-	0x2d, 0x0b, 0xd2, 0x52, 0xd5, 0x85, 0x12, 0x9b, 0x60, 0xef, 0xdf, 0xa9, 0x61, 0x56, 0xc3, 0x16,
-	0x3a, 0x47, 0xc1, 0x26, 0xd8, 0xfb, 0x0f, 0x6a, 0xe8, 0xea, 0xd8, 0x11, 0x4b, 0x5e, 0x82, 0xfe,
-	0x93, 0x5a, 0x0e, 0xeb, 0xd8, 0x42, 0x17, 0x72, 0x4b, 0x51, 0x21, 0xfe, 0x8b, 0x9a, 0x32, 0x5d,
-	0x08, 0x1f, 0x68, 0xba, 0x50, 0xe0, 0x0b, 0xe3, 0xff, 0xa6, 0xc6, 0x4c, 0x17, 0xf2, 0x15, 0x68,
-	0xba, 0x50, 0x78, 0x66, 0x25, 0xe3, 0x7f, 0xa8, 0x69, 0x46, 0x46, 0xa5, 0xe8, 0x42, 0x75, 0x05,
-	0x04, 0x7b, 0xff, 0x4b, 0x2d, 0xf3, 0x91, 0x15, 0x08, 0x5d, 0xa8, 0xad, 0x80, 0x60, 0xef, 0xff,
-	0xa8, 0x71, 0x31, 0xba, 0x82, 0x08, 0x0b, 0x3c, 0xbf, 0x2f, 0x0c, 0x97, 0xb2, 0xa0, 0x0b, 0x61,
-	0x5c, 0xd5, 0x85, 0xc2, 0x2f, 0x64, 0xef, 0xcf, 0x0c, 0xb3, 0xb3, 0x5d, 0xc9, 0xac, 0xa2, 0x0b,
-	0xc5, 0x6e, 0x62, 0x89, 0xf9, 0x7a, 0x6a, 0x38, 0x26, 0xa3, 0x52, 0x74, 0x21, 0xb7, 0x53, 0x72,
-	0xed, 0x67, 0xa9, 0xf1, 0x00, 0xba, 0x10, 0x3c, 0x46, 0x74, 0xa1, 0x06, 0x23, 0x64, 0xcd, 0xcf,
-	0x51, 0xa4, 0xc1, 0x74, 0xa1, 0x02, 0xa6, 0xe9, 0x42, 0x8e, 0xa7, 0xea, 0xc2, 0x9f, 0x07, 0xb4,
-	0xf4, 0xba, 0x10, 0x7c, 0x46, 0x75, 0x61, 0xb8, 0xd9, 0x95, 0x5a, 0xf1, 0x0b, 0x40, 0x61, 0x0a,
-	0x5d, 0x28, 0x52, 0x24, 0xa2, 0x0b, 0x23, 0x20, 0x82, 0xc0, 0x5f, 0x84, 0x90, 0xd2, 0xe9, 0x42,
-	0x0d, 0x4a, 0xd3, 0x85, 0xf0, 0x09, 0xb0, 0xf6, 0x4b, 0x14, 0xc2, 0x56, 0x17, 0x82, 0x83, 0x50,
-	0x17, 0x2a, 0xfe, 0xdc, 0x9f, 0x44, 0x85, 0xe6, 0xda, 0x36, 0xab, 0x72, 0x50, 0xea, 0xbe, 0x0d,
-	0x31, 0xfc, 0xb0, 0x05, 0xc0, 0x8d, 0x6b, 0xdb, 0xb4, 0x20, 0xd2, 0xff, 0x4e, 0xb5, 0x3a, 0x3b,
-	0xe7, 0x83, 0x83, 0x4d, 0x39, 0xe2, 0x9e, 0x45, 0xe3, 0x21, 0x02, 0xd4, 0xb4, 0xdf, 0x02, 0x88,
-	0x2b, 0xed, 0x21, 0x58, 0x41, 0x05, 0x8c, 0xb1, 0xa6, 0x32, 0xe4, 0x6e, 0xa0, 0x89, 0x10, 0x84,
-	0xd7, 0xd8, 0xdf, 0x06, 0x94, 0xab, 0xec, 0x51, 0xa0, 0x1a, 0x03, 0x4c, 0xa1, 0xa9, 0x8e, 0x69,
-	0x38, 0xbc, 0x42, 0xff, 0x4e, 0x6a, 0x9c, 0xd3, 0x06, 0x1c, 0x5e, 0xdf, 0x23, 0xa4, 0x11, 0xec,
-	0xfd, 0xee, 0x20, 0xa4, 0x11, 0x1c, 0x23, 0x8d, 0xe0, 0x18, 0x69, 0x04, 0x7b, 0xbf, 0x37, 0x10,
-	0x69, 0x02, 0x46, 0x25, 0x2d, 0x82, 0xc3, 0x5b, 0xcb, 0x77, 0x06, 0x22, 0x2d, 0x8a, 0xc3, 0x1b,
-	0xd3, 0x16, 0x2a, 0x86, 0x38, 0xa2, 0xd7, 0xfc, 0x3e, 0x00, 0x5d, 0x6d, 0x0f, 0xc4, 0x5b, 0x18,
-	0x20, 0x8d, 0x37, 0xb5, 0x41, 0xb7, 0x81, 0x26, 0x25, 0x75, 0x02, 0xeb, 0x0f, 0x00, 0xeb, 0x9a,
-	0x14, 0xe4, 0x6d, 0xa8, 0x60, 0x13, 0x4d, 0x7d, 0x54, 0xdb, 0x0d, 0xd0, 0x17, 0xff, 0x30, 0xf5,
-	0x6e, 0x60, 0x1d, 0x54, 0xdf, 0x0d, 0xd0, 0x54, 0x63, 0xec, 0x11, 0xec, 0xfd, 0xd1, 0x60, 0xec,
-	0x89, 0xef, 0x49, 0x63, 0x8f, 0x60, 0x03, 0x7b, 0x04, 0x7b, 0x7f, 0x3c, 0x20, 0x7b, 0x02, 0x4c,
-	0x67, 0x2f, 0xb2, 0xfd, 0x78, 0x4f, 0xff, 0x93, 0xd4, 0xdb, 0x0f, 0xba, 0xbf, 0xbe, 0xfd, 0xb8,
-	0x22, 0xd0, 0xd2, 0x09, 0x14, 0xc1, 0x9f, 0xa6, 0x4f, 0x27, 0xe6, 0x20, 0x92, 0x4e, 0xa0, 0x27,
-	0xd4, 0xdd, 0x00, 0x7a, 0xe2, 0xcf, 0x52, 0xef, 0x06, 0xa6, 0x3c, 0xf4, 0xdd, 0x00, 0x62, 0x64,
-	0x1b, 0x1d, 0x0a, 0x41, 0x14, 0x31, 0xf2, 0xe7, 0x80, 0xf4, 0x0a, 0x7b, 0xa4, 0x50, 0x80, 0x00,
-	0x5a, 0xb1, 0x19, 0x19, 0x76, 0xcf, 0xa3, 0xa9, 0x08, 0xa2, 0x68, 0xab, 0x7f, 0x01, 0xa0, 0xd7,
-	0xa6, 0x04, 0xe5, 0x63, 0x80, 0x7b, 0xa8, 0x19, 0xff, 0xc4, 0xdd, 0x45, 0x87, 0x43, 0x68, 0x55,
-	0xa2, 0xfc, 0x25, 0x00, 0x2f, 0xdb, 0x03, 0x4b, 0x55, 0x02, 0xb0, 0x93, 0xcd, 0xe8, 0xb8, 0x7b,
-	0x07, 0x3a, 0xa2, 0x54, 0x5f, 0x45, 0xad, 0x7c, 0x17, 0x50, 0x57, 0xd2, 0xd4, 0xe0, 0x50, 0xa7,
-	0x00, 0xac, 0xdb, 0x8c, 0x7d, 0xe0, 0xde, 0x8d, 0xbc, 0x18, 0xae, 0x60, 0xfa, 0xaf, 0x00, 0xfa,
-	0x54, 0x6a, 0x68, 0x8d, 0xeb, 0x23, 0x4d, 0xd3, 0x67, 0x62, 0xff, 0xb2, 0x46, 0x07, 0x9a, 0xe3,
-	0xaf, 0x53, 0xed, 0x5f, 0xd6, 0xf9, 0xa5, 0xe8, 0xa0, 0xfb, 0x37, 0x1c, 0x12, 0xc9, 0xb8, 0xab,
-	0xa0, 0xfc, 0x4d, 0xaa, 0x64, 0x84, 0xc6, 0x2f, 0x61, 0x68, 0x32, 0xca, 0x31, 0x81, 0xd3, 0x55,
-	0x70, 0xfe, 0x36, 0x15, 0xce, 0x69, 0x03, 0x8e, 0x1c, 0x53, 0x48, 0x23, 0x18, 0x60, 0xfe, 0x2e,
-	0x2d, 0x69, 0x04, 0xc7, 0x48, 0x83, 0x21, 0x95, 0x34, 0x81, 0xf2, 0xf7, 0xa9, 0x49, 0x53, 0x61,
-	0x04, 0x69, 0x3a, 0x4e, 0x57, 0xc1, 0xf9, 0x87, 0xd4, 0xa4, 0x45, 0x71, 0xe4, 0x98, 0x68, 0x69,
-	0xbc, 0x8d, 0x02, 0xd0, 0x3f, 0xa6, 0x6a, 0x69, 0xbc, 0xef, 0x4b, 0x24, 0xfa, 0x6d, 0x28, 0x83,
-	0x21, 0x75, 0xac, 0x44, 0x03, 0xd2, 0x3f, 0xa5, 0xa3, 0x8e, 0x79, 0x88, 0x50, 0x17, 0x8e, 0xb9,
-	0x25, 0x84, 0xda, 0xad, 0x7a, 0x7b, 0x03, 0x20, 0x9e, 0xce, 0x95, 0x9c, 0xf2, 0x81, 0xea, 0x50,
-	0x30, 0xca, 0x06, 0x99, 0xc5, 0x2c, 0x3a, 0x08, 0x16, 0x20, 0x4f, 0x9f, 0xa1, 0x26, 0xb9, 0xea,
-	0x50, 0x00, 0xf3, 0x40, 0x2e, 0xbf, 0x0c, 0x8d, 0x81, 0x0d, 0xd7, 0xca, 0xcf, 0x52, 0xa3, 0xc9,
-	0xea, 0x50, 0x00, 0x53, 0xb9, 0xd8, 0x0d, 0xad, 0xb8, 0xd2, 0x7d, 0x8e, 0x5a, 0x15, 0x42, 0x2b,
-	0x2e, 0x55, 0x55, 0x3c, 0x82, 0xbd, 0xe7, 0xa9, 0x51, 0x56, 0xc5, 0x23, 0x58, 0xc7, 0x23, 0xd8,
-	0xfb, 0x0c, 0x35, 0x72, 0x35, 0x3c, 0xd5, 0x8a, 0x8b, 0xc4, 0xcf, 0x52, 0xab, 0x61, 0x0d, 0x8f,
-	0x60, 0xf7, 0xe5, 0xa8, 0x00, 0x56, 0x42, 0x76, 0x7d, 0x8e, 0x9a, 0x8d, 0x54, 0x87, 0x02, 0x98,
-	0x2d, 0x24, 0x5a, 0x19, 0x8d, 0x73, 0x4c, 0x61, 0xf8, 0x79, 0x6a, 0x38, 0x51, 0x1d, 0x0a, 0xc0,
-	0x41, 0x28, 0xaf, 0xc2, 0x08, 0x40, 0x5b, 0xfd, 0x32, 0x35, 0xcb, 0x84, 0x11, 0x80, 0x3a, 0xd2,
-	0x51, 0x09, 0xf6, 0x7e, 0x85, 0x5a, 0xe5, 0x75, 0x54, 0x76, 0x80, 0xa0, 0xa1, 0x12, 0xec, 0xfd,
-	0x2a, 0x35, 0x2c, 0x46, 0x50, 0xd5, 0x68, 0xb9, 0x26, 0x79, 0x81, 0xda, 0x39, 0x61, 0xb4, 0x5c,
-	0x54, 0x48, 0xe6, 0x40, 0x51, 0x7c, 0x81, 0x5a, 0x8d, 0x4a, 0xe6, 0x40, 0x12, 0x84, 0x11, 0x80,
-	0x1e, 0xf8, 0x22, 0x35, 0x1a, 0x0b, 0x23, 0x80, 0x8e, 0xbe, 0x86, 0x8a, 0x60, 0xa3, 0xb4, 0xf3,
-	0x2f, 0xe5, 0xd2, 0x3f, 0xc6, 0xad, 0x0e, 0x05, 0x10, 0xaa, 0x6c, 0xe1, 0xb7, 0xa2, 0x43, 0x2a,
-	0x84, 0xe8, 0x2a, 0x5f, 0xce, 0x0d, 0xf4, 0x8a, 0x4d, 0x75, 0x28, 0x98, 0x94, 0x40, 0xa2, 0x8b,
-	0xac, 0x23, 0x18, 0xd4, 0x1a, 0xf6, 0x57, 0x72, 0x03, 0xbc, 0x5f, 0x53, 0x1d, 0x0a, 0x26, 0x98,
-	0x4b, 0xa5, 0x49, 0xaf, 0x22, 0x57, 0x6c, 0x5c, 0xa5, 0x43, 0x7f, 0x35, 0x97, 0xe6, 0x59, 0x74,
-	0x75, 0x28, 0x28, 0xf2, 0xed, 0x2e, 0xbb, 0xf1, 0x39, 0x74, 0x44, 0x07, 0x10, 0xa4, 0x7d, 0x2d,
-	0x97, 0xf2, 0xcd, 0x9a, 0xea, 0x50, 0x70, 0x48, 0x85, 0x11, 0x84, 0xfd, 0x18, 0xaf, 0x1c, 0xc0,
-	0xd4, 0xd7, 0x73, 0xd6, 0xaf, 0x09, 0xde, 0x44, 0x67, 0x0b, 0xa6, 0x14, 0x5f, 0x32, 0x37, 0x60,
-	0x8f, 0x2e, 0x78, 0xdf, 0x10, 0x9b, 0x74, 0x4c, 0xd9, 0xa4, 0x0b, 0x51, 0x3b, 0xdf, 0xfb, 0xa6,
-	0xc9, 0xce, 0x8f, 0xda, 0x2d, 0x7a, 0xdf, 0x32, 0xd9, 0x2d, 0xba, 0x27, 0xd1, 0x61, 0x9e, 0x41,
-	0xfa, 0x03, 0xad, 0x7b, 0xf3, 0xf2, 0x85, 0x9e, 0xaa, 0x13, 0xc0, 0x37, 0xa8, 0x3f, 0xcf, 0xba,
-	0x4a, 0xd0, 0x1e, 0x7d, 0x98, 0xf5, 0xbe, 0xbc, 0xfa, 0x76, 0x4f, 0xd5, 0xe1, 0x5c, 0x46, 0x9e,
-	0x65, 0x5d, 0x8d, 0xa6, 0xa2, 0xd3, 0x79, 0x25, 0xbd, 0x2f, 0xaf, 0xbc, 0xea, 0x53, 0x75, 0x82,
-	0xc3, 0xfa, 0x74, 0x5e, 0x59, 0xaf, 0x8a, 0xcf, 0xe7, 0x35, 0xf6, 0xfe, 0xbc, 0x7c, 0xef, 0x27,
-	0x3e, 0xfd, 0xb4, 0x78, 0x0c, 0x66, 0x5a, 0x3d, 0xc1, 0xde, 0x03, 0xf9, 0xe8, 0x4b, 0x40, 0xc6,
-	0x08, 0x08, 0x4e, 0x8a, 0x80, 0x60, 0xef, 0xc1, 0xbc, 0xf2, 0x46, 0x90, 0x39, 0x02, 0x82, 0x93,
-	0x22, 0x20, 0xd8, 0x7b, 0x28, 0x2f, 0x5f, 0x0f, 0x32, 0x47, 0xc0, 0x1e, 0x7d, 0x4d, 0x47, 0xa7,
-	0x8b, 0x2a, 0xfd, 0x70, 0x5e, 0x7d, 0x57, 0xa8, 0xea, 0x04, 0x47, 0x74, 0x0f, 0xa2, 0xbe, 0x5f,
-	0x87, 0xbc, 0x58, 0x04, 0xc2, 0xc7, 0x23, 0x79, 0xed, 0xc5, 0xa1, 0xaa, 0x13, 0x4c, 0x45, 0xa2,
-	0x10, 0xb5, 0xff, 0xea, 0x38, 0x95, 0xd0, 0x05, 0xde, 0x9f, 0xd7, 0xde, 0x22, 0x8a, 0xf3, 0x08,
-	0x7d, 0x21, 0x29, 0x10, 0x82, 0xbd, 0x0f, 0xe4, 0xd5, 0x57, 0x8a, 0x12, 0x02, 0x21, 0x38, 0x39,
-	0x10, 0x82, 0xbd, 0x47, 0xf3, 0xda, 0xfb, 0x45, 0x49, 0x81, 0x10, 0xec, 0x5e, 0x1f, 0xff, 0x42,
-	0x78, 0x63, 0x79, 0x2c, 0x6f, 0x78, 0xd9, 0x28, 0xfe, 0xcd, 0xf0, 0x86, 0x73, 0x83, 0x61, 0x63,
-	0x40, 0xeb, 0x79, 0x3c, 0x6f, 0x7e, 0xf3, 0xc8, 0xb0, 0x47, 0xa0, 0x2b, 0xdd, 0x14, 0xe7, 0x16,
-	0xfa, 0xd3, 0x13, 0xf9, 0xfe, 0xaf, 0x21, 0xc5, 0xc9, 0x86, 0x16, 0xf6, 0x5a, 0x34, 0x13, 0x75,
-	0xa8, 0x34, 0xb3, 0x27, 0xf3, 0x03, 0xbf, 0x93, 0x54, 0x75, 0x82, 0x69, 0x1d, 0x58, 0xfd, 0xfb,
-	0xf4, 0xe2, 0x78, 0xc6, 0x28, 0x4d, 0xe1, 0xa9, 0xfc, 0x00, 0x2f, 0x28, 0x55, 0x9d, 0xe0, 0x68,
-	0x34, 0xcf, 0x42, 0x9b, 0x99, 0x9f, 0x42, 0x63, 0x5a, 0xef, 0x7b, 0x11, 0xdf, 0x34, 0x9f, 0xb9,
-	0x0b, 0x21, 0xa5, 0x1f, 0xbe, 0x98, 0xc8, 0xd7, 0xa0, 0x82, 0xf6, 0x26, 0xa7, 0x2d, 0x38, 0x75,
-	0xa0, 0xbd, 0x13, 0x91, 0xce, 0x81, 0x72, 0x78, 0x6e, 0xed, 0xe0, 0x6a, 0x54, 0x8c, 0x1e, 0x8e,
-	0xbb, 0x45, 0x94, 0xbd, 0xad, 0x7e, 0x9e, 0x39, 0x39, 0x10, 0xd0, 0xff, 0x75, 0x0f, 0xa3, 0xdc,
-	0x1d, 0x6b, 0x8d, 0x6e, 0xdd, 0xcb, 0xb0, 0x31, 0xf8, 0x47, 0x25, 0x73, 0x85, 0x33, 0x73, 0x0d,
-	0x9a, 0x8c, 0x9d, 0x7c, 0xef, 0xe5, 0x20, 0xa7, 0x3a, 0x78, 0x05, 0x72, 0xe3, 0x87, 0xda, 0x7b,
-	0x79, 0x98, 0x34, 0x7b, 0x38, 0xbd, 0x7f, 0x0f, 0x85, 0xc4, 0x20, 0xf8, 0x29, 0xdd, 0x5e, 0x0e,
-	0xb2, 0xc9, 0x41, 0xec, 0xd3, 0x83, 0x9b, 0x1c, 0xc4, 0x3e, 0x3d, 0x0c, 0xab, 0x1e, 0x96, 0xd1,
-	0x21, 0xc3, 0xb9, 0xf0, 0x5e, 0x2e, 0x46, 0x54, 0x17, 0x2b, 0xe8, 0xb0, 0xe9, 0xb8, 0x77, 0x2f,
-	0x1f, 0x13, 0x66, 0x2e, 0xe5, 0x39, 0xee, 0x5e, 0x0e, 0x32, 0x7d, 0xe2, 0xd8, 0x27, 0x15, 0xf9,
-	0x7e, 0x71, 0xec, 0xd3, 0x47, 0xd1, 0xfc, 0x85, 0x28, 0x07, 0xaa, 0x7b, 0x79, 0x70, 0x12, 0x36,
-	0x85, 0x3c, 0x2a, 0xdd, 0xcb, 0xc3, 0xa8, 0x99, 0x4b, 0x79, 0x0a, 0xba, 0x97, 0x83, 0x31, 0xd5,
-	0xc1, 0x79, 0x74, 0xc4, 0x78, 0xb8, 0x69, 0x70, 0xf2, 0x2a, 0xd5, 0x49, 0xda, 0x87, 0xb9, 0x0a,
-	0xf4, 0xdd, 0xc8, 0x4b, 0x3a, 0xe2, 0x34, 0xa0, 0xdf, 0xa8, 0xa2, 0x0f, 0xf0, 0x80, 0x57, 0x59,
-	0xc0, 0x6b, 0xd1, 0x94, 0xf9, 0xa8, 0xd3, 0x00, 0xff, 0x23, 0x3a, 0x7c, 0xca, 0x27, 0xbe, 0x0a,
-	0x78, 0x17, 0x4d, 0x27, 0x9c, 0x78, 0x1a, 0xd0, 0xaf, 0xd3, 0xa9, 0xb7, 0x7d, 0x08, 0xac, 0xc5,
-	0x3c, 0x93, 0x7c, 0xda, 0x69, 0x40, 0x7e, 0xa5, 0x1e, 0x77, 0x8a, 0xc7, 0xc2, 0xb1, 0xdd, 0xaa,
-	0x9f, 0x79, 0xaa, 0x98, 0xb9, 0xbd, 0x7a, 0x09, 0x24, 0x4c, 0xe4, 0x38, 0x53, 0xf5, 0x30, 0xb9,
-	0x3f, 0x0f, 0xa7, 0x93, 0x3d, 0x14, 0xf6, 0xd7, 0xcf, 0xf4, 0x33, 0x48, 0xd5, 0x41, 0x76, 0xff,
-	0x41, 0x24, 0x78, 0x70, 0xf7, 0x1f, 0x44, 0x82, 0x87, 0xe1, 0xbd, 0x3c, 0x40, 0x09, 0x8d, 0x9e,
-	0x08, 0xaa, 0x2e, 0x46, 0xf6, 0x19, 0x86, 0x7e, 0xd4, 0xa7, 0x7a, 0x18, 0xdd, 0xcb, 0xc3, 0x95,
-	0x08, 0xc9, 0xbf, 0xc7, 0xad, 0x75, 0x49, 0x15, 0x4d, 0x9d, 0xba, 0xab, 0x53, 0x6f, 0xed, 0x6e,
-	0xb5, 0x5b, 0x83, 0x69, 0x2c, 0xd5, 0xd3, 0x40, 0x5a, 0x69, 0x76, 0x0e, 0x8d, 0x4a, 0xb1, 0x3d,
-	0x8a, 0x40, 0x17, 0x17, 0x87, 0xe8, 0xff, 0xae, 0x04, 0xcb, 0x3f, 0x7a, 0x53, 0xd1, 0x71, 0x0f,
-	0xa2, 0x91, 0x6b, 0xab, 0xcb, 0xc1, 0xab, 0x6f, 0x38, 0x55, 0xcc, 0x5c, 0x36, 0x7a, 0xe0, 0x9e,
-	0x5a, 0xf1, 0xc2, 0x85, 0x0b, 0x17, 0x32, 0xfe, 0x59, 0x34, 0x5d, 0x17, 0x8b, 0x58, 0xd5, 0xee,
-	0x2c, 0xba, 0x16, 0xa2, 0xd3, 0xbb, 0xa7, 0xc6, 0x58, 0x3e, 0x52, 0x8f, 0x52, 0x43, 0xbf, 0x22,
-	0xbf, 0x8e, 0x3c, 0x03, 0x08, 0xfc, 0x41, 0x6e, 0x83, 0xf2, 0x86, 0x1a, 0xcb, 0xd6, 0xa9, 0x18,
-	0x0a, 0xcb, 0x6d, 0x7f, 0x13, 0x1d, 0x35, 0xc0, 0xec, 0xda, 0xe3, 0xbc, 0xb1, 0xc6, 0x72, 0x7a,
-	0x3a, 0x86, 0x03, 0x25, 0x20, 0x01, 0xa8, 0x6b, 0x0f, 0xf4, 0xa6, 0x1a, 0x4b, 0xfd, 0x38, 0x10,
-	0x54, 0x8a, 0x64, 0xe2, 0x08, 0xb6, 0xc2, 0x79, 0x73, 0x8d, 0x55, 0x08, 0x23, 0x71, 0x04, 0xf7,
-	0x21, 0xce, 0x12, 0xe7, 0x2d, 0x35, 0x56, 0x47, 0xcc, 0xc4, 0x25, 0x02, 0x75, 0xed, 0x81, 0xde,
-	0x5a, 0x63, 0xe5, 0xc6, 0x4c, 0x1c, 0xc1, 0xfe, 0x16, 0x9a, 0x31, 0x00, 0x89, 0x93, 0x0b, 0x1b,
-	0xa4, 0xb7, 0xd5, 0x58, 0x55, 0xf2, 0x62, 0x48, 0xbc, 0x8a, 0xf9, 0xb7, 0xa1, 0x8b, 0x4c, 0xe4,
-	0xa5, 0xc1, 0x7a, 0x7b, 0x8d, 0x89, 0xd6, 0xa3, 0x71, 0xfa, 0xb8, 0xb7, 0x84, 0x0d, 0xb1, 0x01,
-	0xaf, 0xf6, 0x59, 0x20, 0xbd, 0xa3, 0xc6, 0xd4, 0x6d, 0x7c, 0x43, 0x30, 0x6d, 0xdc, 0x8f, 0x3e,
-	0xcb, 0x2f, 0xea, 0x9d, 0x35, 0xa6, 0x81, 0x13, 0xe8, 0x23, 0xb8, 0x2f, 0x7d, 0x96, 0x58, 0xef,
-	0xaa, 0x31, 0xad, 0x9c, 0x44, 0x5f, 0xe2, 0xfe, 0x83, 0xc3, 0x1e, 0x2b, 0xa8, 0x5e, 0x8d, 0x89,
-	0xea, 0xf8, 0xfe, 0x03, 0x4d, 0x9e, 0x94, 0x51, 0x70, 0xb8, 0x63, 0x03, 0xf4, 0xee, 0x1a, 0xeb,
-	0x02, 0x86, 0x8c, 0x82, 0x13, 0x5f, 0xf3, 0x86, 0x60, 0x67, 0x45, 0x56, 0x38, 0xef, 0xa9, 0x31,
-	0x89, 0x1e, 0xdf, 0x10, 0x4c, 0xe0, 0xfb, 0x0f, 0x38, 0xe8, 0x12, 0x03, 0x8e, 0x3c, 0x42, 0xb2,
-	0x02, 0x7b, 0x6f, 0x6d, 0x00, 0x29, 0x3f, 0x13, 0x5b, 0x62, 0xf8, 0x99, 0xff, 0xb8, 0x83, 0x4a,
-	0x89, 0xcb, 0xe4, 0x8f, 0x07, 0xac, 0x56, 0x7a, 0x6f, 0x6d, 0x30, 0xd9, 0x7f, 0x89, 0x79, 0xb1,
-	0xfc, 0x63, 0xff, 0x61, 0x07, 0x7d, 0x9f, 0x61, 0xbd, 0xca, 0x73, 0x19, 0xab, 0xd5, 0xbe, 0xaf,
-	0x36, 0xc8, 0x5f, 0x09, 0x17, 0xc5, 0xd6, 0x2a, 0x3f, 0xf4, 0xef, 0x73, 0xd0, 0xa5, 0xc6, 0x1e,
-	0x21, 0x8f, 0xf1, 0xac, 0x96, 0x7a, 0x5f, 0x2d, 0xd5, 0x9f, 0x14, 0x17, 0x1b, 0x3a, 0x4b, 0xf8,
-	0xa9, 0xff, 0xa8, 0x83, 0x66, 0xfb, 0x2c, 0x32, 0xcd, 0x06, 0xb8, 0xbf, 0x96, 0xf6, 0x0f, 0x90,
-	0x4b, 0x93, 0x96, 0x2a, 0xbe, 0xfc, 0x87, 0x1c, 0x24, 0xd3, 0x4d, 0xbf, 0x69, 0x6d, 0xb3, 0xc2,
-	0x07, 0x6a, 0xec, 0x71, 0x94, 0xcd, 0x9b, 0x36, 0x66, 0x01, 0x1b, 0x24, 0xac, 0xc6, 0x6f, 0xa8,
-	0x35, 0x46, 0x7f, 0x60, 0x64, 0x97, 0x4c, 0x3d, 0xf5, 0xba, 0xb8, 0x44, 0xd3, 0x9e, 0x2f, 0xf9,
-	0xdb, 0x6a, 0xe9, 0x8c, 0x3c, 0x63, 0xb2, 0xcb, 0x86, 0x9e, 0x7e, 0xdd, 0x7c, 0x3a, 0x0e, 0x08,
-	0xba, 0xf1, 0x76, 0xb5, 0xdb, 0x45, 0x1f, 0x4b, 0xd9, 0xed, 0xea, 0x9e, 0x76, 0x5d, 0xdd, 0x8b,
-	0x23, 0x72, 0x05, 0xb9, 0x6d, 0x86, 0x4c, 0x21, 0x21, 0xef, 0xef, 0xa9, 0xd7, 0xdd, 0x0d, 0x88,
-	0x5c, 0x4a, 0x76, 0x12, 0x69, 0xb5, 0xec, 0xb2, 0x0f, 0xf4, 0xe2, 0xd7, 0xe5, 0xcd, 0xd4, 0x12,
-	0xdc, 0x8f, 0x5a, 0x4b, 0xd8, 0x07, 0x7b, 0xda, 0x75, 0xfb, 0x04, 0x6a, 0x09, 0xee, 0x47, 0xad,
-	0x25, 0xe4, 0x43, 0x3d, 0xf5, 0xba, 0x7e, 0x02, 0xb5, 0x04, 0xfb, 0x1d, 0x55, 0xc2, 0xc4, 0x9e,
-	0xca, 0x59, 0x41, 0x3e, 0xdc, 0xd3, 0xaf, 0xfb, 0x1f, 0x8d, 0x83, 0x0a, 0xdd, 0x79, 0x27, 0xba,
-	0xd8, 0x48, 0x6d, 0x1a, 0xd8, 0x47, 0x7a, 0x91, 0x9f, 0x0b, 0x98, 0x31, 0xd0, 0x2b, 0x34, 0xe8,
-	0xed, 0xe6, 0x9d, 0x64, 0x2f, 0x42, 0xdf, 0xdf, 0x8b, 0xfc, 0xdc, 0x80, 0x61, 0x1b, 0x81, 0x1e,
-	0xed, 0xc7, 0xb0, 0xe5, 0x97, 0xfa, 0x81, 0x9e, 0xfe, 0x73, 0x05, 0x49, 0x0c, 0x13, 0xdc, 0x9f,
-	0x61, 0x4b, 0xd8, 0x47, 0x7b, 0x91, 0x9f, 0x3b, 0x48, 0x64, 0x98, 0x60, 0xff, 0xbc, 0x79, 0x0b,
-	0xa7, 0xd0, 0xa9, 0x8f, 0xf5, 0x8c, 0x3f, 0x97, 0x60, 0xd8, 0xcb, 0x5c, 0xb8, 0xbe, 0x2e, 0x21,
-	0x61, 0xed, 0x95, 0xeb, 0xe3, 0xbd, 0xa4, 0x9f, 0x5b, 0x30, 0xe5, 0x2e, 0xa8, 0xd9, 0xd7, 0x3b,
-	0xe6, 0xbd, 0x65, 0xaf, 0x67, 0x9f, 0xe8, 0xed, 0xf5, 0x7b, 0x0d, 0x86, 0xcd, 0x06, 0x5a, 0xf7,
-	0x09, 0x4d, 0x94, 0x99, 0x9e, 0x97, 0x5a, 0xad, 0xe4, 0xc9, 0xde, 0xf7, 0xe0, 0x07, 0x1f, 0x2e,
-	0x8a, 0x2f, 0x56, 0xaa, 0xde, 0xc7, 0x34, 0xd5, 0x6b, 0x7e, 0xc6, 0x6a, 0xb5, 0xe4, 0xa7, 0x7a,
-	0x03, 0xfd, 0x62, 0xc4, 0x25, 0xa6, 0xda, 0x2c, 0x55, 0xda, 0xba, 0x7a, 0xe4, 0xa4, 0x5d, 0x16,
-	0xb4, 0x5b, 0xe4, 0x77, 0x1d, 0x76, 0xb3, 0x50, 0x9e, 0x39, 0x05, 0xca, 0x15, 0x43, 0x7f, 0x43,
-	0x15, 0x2d, 0xfa, 0x65, 0x43, 0x2b, 0x98, 0x0f, 0x32, 0x18, 0xf5, 0xd0, 0x29, 0x50, 0xaf, 0x28,
-	0xfa, 0xe7, 0xd4, 0x1d, 0x1b, 0xb9, 0xac, 0x68, 0x05, 0xf4, 0x21, 0x06, 0xa4, 0x9e, 0x3a, 0x05,
-	0xda, 0x15, 0xc7, 0x04, 0xa4, 0x14, 0x92, 0xe1, 0xc3, 0x0c, 0xa9, 0x60, 0x40, 0xe2, 0x5a, 0x21,
-	0x91, 0x3b, 0xcb, 0xa2, 0xf7, 0x11, 0x06, 0x94, 0x35, 0x73, 0x47, 0x70, 0x1f, 0xee, 0x2c, 0x81,
-	0x3e, 0xca, 0x80, 0xdc, 0x04, 0xee, 0x12, 0x91, 0x52, 0x68, 0x82, 0x8f, 0x31, 0xa4, 0xe1, 0x04,
-	0xee, 0x08, 0xf6, 0x6f, 0x55, 0x0b, 0x68, 0xf4, 0xb2, 0xa7, 0x15, 0xd4, 0xc7, 0x19, 0x94, 0x7a,
-	0xf4, 0x14, 0xe8, 0x57, 0x44, 0xfd, 0x86, 0xda, 0x16, 0x63, 0x97, 0x45, 0xad, 0xc0, 0x3e, 0xc1,
-	0xc0, 0xd4, 0xb3, 0xa7, 0x20, 0x72, 0xc5, 0x34, 0x61, 0x57, 0xd8, 0xb7, 0xfd, 0x4f, 0x32, 0xa8,
-	0x8c, 0x61, 0x57, 0x40, 0xb3, 0xef, 0xc3, 0xa0, 0xe5, 0x97, 0xf5, 0x29, 0x86, 0x94, 0x4f, 0x62,
-	0x90, 0xe0, 0xbe, 0x0c, 0x5a, 0x82, 0x7d, 0x9a, 0x81, 0x15, 0x13, 0x19, 0x4c, 0xdc, 0x85, 0x29,
-	0xda, 0xfa, 0xd3, 0x0c, 0xcb, 0x31, 0xec, 0x42, 0xde, 0xc6, 0x13, 0x32, 0xcb, 0xbe, 0x8b, 0x3f,
-	0xc3, 0x90, 0x46, 0x4d, 0x99, 0x05, 0x2d, 0xdb, 0xbc, 0x2b, 0xec, 0x1b, 0xf6, 0xb3, 0x0c, 0x68,
-	0xcc, 0xb0, 0x2b, 0xa0, 0x2b, 0x3f, 0xa8, 0x9d, 0x40, 0x19, 0x6e, 0xfb, 0x5a, 0xa1, 0x3d, 0xc7,
-	0xd0, 0x06, 0x3f, 0x82, 0x0a, 0xa2, 0x77, 0x84, 0xa9, 0x7a, 0x28, 0x25, 0xae, 0x33, 0xcd, 0x09,
-	0xc4, 0xf3, 0x6c, 0xa9, 0xdf, 0x93, 0x33, 0xa8, 0xc0, 0x70, 0xc9, 0xd8, 0x7f, 0x44, 0x93, 0x3b,
-	0xa6, 0xfb, 0xc6, 0x56, 0xcb, 0xfd, 0x0c, 0x5f, 0xee, 0xc0, 0x87, 0x50, 0x41, 0xec, 0x96, 0xb2,
-	0x7f, 0xbf, 0x76, 0x08, 0x65, 0xbc, 0xb0, 0x6c, 0xb5, 0xd6, 0xcf, 0xf2, 0x5d, 0x90, 0xfe, 0x14,
-	0x2a, 0x88, 0x5f, 0x73, 0xa6, 0x72, 0x6c, 0xb6, 0xcf, 0x2a, 0xd3, 0xec, 0x81, 0xcf, 0x71, 0x52,
-	0x07, 0x3a, 0x86, 0x0a, 0x8c, 0xf7, 0xa4, 0xfd, 0x87, 0xd5, 0x63, 0x28, 0xfd, 0x86, 0xb3, 0xcd,
-	0x12, 0x3f, 0xcf, 0x96, 0x98, 0xf2, 0x1c, 0x4a, 0xbf, 0x67, 0x9d, 0xb0, 0x9c, 0x95, 0x82, 0x78,
-	0x55, 0xbf, 0xdb, 0xda, 0x6a, 0xb7, 0x56, 0xa6, 0xe3, 0xef, 0x48, 0xb2, 0x0f, 0x2e, 0x5b, 0x40,
-	0x07, 0xd5, 0xf7, 0xc4, 0x4d, 0x0f, 0x44, 0x91, 0x3b, 0x26, 0x1f, 0x88, 0xbe, 0xe0, 0xac, 0xbc,
-	0xe6, 0xc7, 0x6b, 0xb1, 0x65, 0x1f, 0x67, 0xcb, 0x3e, 0xd3, 0xdd, 0x38, 0xbe, 0xd5, 0xea, 0xd4,
-	0x77, 0x5a, 0x6b, 0x0d, 0xf6, 0x3b, 0xb7, 0x6c, 0x74, 0xf7, 0x78, 0xa3, 0xbe, 0xb9, 0x76, 0xf6,
-	0xfc, 0xf1, 0xa4, 0x9f, 0xc4, 0xfd, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x85, 0x2d, 0x80,
-	0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180125_92554152/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/test.pb.go
deleted file mode 100644
index b6e4899d166..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/test.pb.go
+++ /dev/null
@@ -1,3822 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto2_20180430_b4deda09/test.proto
-
-package proto2_20180430_b4deda09 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09"
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{0}
-}
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (dst *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(dst, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180430.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180430.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion          isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	XXX_NoUnkeyedLiteral         struct{}                      `json:"-"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-	XXX_sizecache                int32  `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1}
-}
-
-var extRange_Message = []proto.ExtensionRange{
-	{Start: 10000, End: 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (dst *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(dst, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-type isMessage_OneofDefaultedUnion interface {
-	isMessage_OneofDefaultedUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum,oneof,def=0"`
-}
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()                          {}
-func (*Message_OneofInt32) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint32) isMessage_OneofUnion()                        {}
-func (*Message_OneofInt64) isMessage_OneofUnion()                         {}
-func (*Message_OneofSint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofUint64) isMessage_OneofUnion()                        {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()                      {}
-func (*Message_OneofFloat) isMessage_OneofUnion()                         {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()                       {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()                      {}
-func (*Message_OneofDouble) isMessage_OneofUnion()                        {}
-func (*Message_OneofString) isMessage_OneofUnion()                        {}
-func (*Message_OneofBytes) isMessage_OneofUnion()                         {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()                     {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()                  {}
-func (*Message_OneofNamedGroup) isMessage_OneofUnion()                    {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()                   {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion()                {}
-func (*Message_Oneofgroup) isMessage_OneofUnion()                         {}
-func (*Message_OneofString1) isMessage_OneofUnion()                       {}
-func (*Message_OneofString2) isMessage_OneofUnion()                       {}
-func (*Message_OneofString3) isMessage_OneofUnion()                       {}
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion()        {}
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion()     {}
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion()    {}
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion()      {}
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion()       {}
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion()   {}
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(700<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(701<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(702<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(703<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(704<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(705<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(706<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(707<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(708<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(709<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(710<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(711<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(712<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(713<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(714<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(715<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(716<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofNamedGroup:
-		b.EncodeVarint(717<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNamedGroup); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(718<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(719<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_Oneofgroup:
-		b.EncodeVarint(720<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Oneofgroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		b.EncodeVarint(721<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(722<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(723<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		t := uint64(0)
-		if x.OneofDefaultedBool {
-			t = 1
-		}
-		b.EncodeVarint(800<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofDefaultedInt32:
-		b.EncodeVarint(801<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		b.EncodeVarint(802<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofDefaultedSint32))
-	case *Message_OneofDefaultedUint32:
-		b.EncodeVarint(803<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		b.EncodeVarint(804<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		b.EncodeVarint(805<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofDefaultedSint64))
-	case *Message_OneofDefaultedUint64:
-		b.EncodeVarint(806<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		b.EncodeVarint(807<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedFixed32))
-	case *Message_OneofDefaultedSfixed32:
-		b.EncodeVarint(808<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedSfixed32))
-	case *Message_OneofDefaultedFloat:
-		b.EncodeVarint(809<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofDefaultedFloat)))
-	case *Message_OneofDefaultedFixed64:
-		b.EncodeVarint(810<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedFixed64))
-	case *Message_OneofDefaultedSfixed64:
-		b.EncodeVarint(811<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedSfixed64))
-	case *Message_OneofDefaultedDouble:
-		b.EncodeVarint(812<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDefaultedDouble))
-	case *Message_OneofDefaultedString:
-		b.EncodeVarint(813<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		b.EncodeVarint(814<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		b.EncodeVarint(815<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		b.EncodeVarint(816<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofDefaultedUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 700: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 701: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 702: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 703: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 704: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 705: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 706: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 707: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 708: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 709: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 710: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 711: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 712: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 713: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 714: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 715: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 716: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 717: // oneof_union.oneof_named_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_NamedGroup)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofNamedGroup{msg}
-		return true, err
-	case 718: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 719: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 720: // oneof_union.oneofgroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_OneofGroup)
-		err := b.DecodeGroup(msg)
-		m.OneofUnion = &Message_Oneofgroup{msg}
-		return true, err
-	case 721: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 722: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 723: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	case 800: // oneof_defaulted_union.oneof_defaulted_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBool{x != 0}
-		return true, err
-	case 801: // oneof_defaulted_union.oneof_defaulted_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt32{int32(x)}
-		return true, err
-	case 802: // oneof_defaulted_union.oneof_defaulted_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint32{int32(x)}
-		return true, err
-	case 803: // oneof_defaulted_union.oneof_defaulted_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint32{uint32(x)}
-		return true, err
-	case 804: // oneof_defaulted_union.oneof_defaulted_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt64{int64(x)}
-		return true, err
-	case 805: // oneof_defaulted_union.oneof_defaulted_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint64{int64(x)}
-		return true, err
-	case 806: // oneof_defaulted_union.oneof_defaulted_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint64{x}
-		return true, err
-	case 807: // oneof_defaulted_union.oneof_defaulted_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed32{uint32(x)}
-		return true, err
-	case 808: // oneof_defaulted_union.oneof_defaulted_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed32{int32(x)}
-		return true, err
-	case 809: // oneof_defaulted_union.oneof_defaulted_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 810: // oneof_defaulted_union.oneof_defaulted_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed64{x}
-		return true, err
-	case 811: // oneof_defaulted_union.oneof_defaulted_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed64{int64(x)}
-		return true, err
-	case 812: // oneof_defaulted_union.oneof_defaulted_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedDouble{math.Float64frombits(x)}
-		return true, err
-	case 813: // oneof_defaulted_union.oneof_defaulted_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedString{x}
-		return true, err
-	case 814: // oneof_defaulted_union.oneof_defaulted_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBytes{x}
-		return true, err
-	case 815: // oneof_defaulted_union.oneof_defaulted_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 816: // oneof_defaulted_union.oneof_defaulted_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSiblingEnum{SiblingEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofNamedGroup:
-		s := proto.Size(x.OneofNamedGroup)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_Oneofgroup:
-		n += 2 // tag and wire
-		n += proto.Size(x.Oneofgroup)
-		n += 2 // tag and wire
-	case *Message_OneofString1:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofDefaultedInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofDefaultedSint32) << 1) ^ uint32((int32(x.OneofDefaultedSint32) >> 31))))
-	case *Message_OneofDefaultedUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofDefaultedSint64<<1) ^ uint64((int64(x.OneofDefaultedSint64) >> 63))))
-	case *Message_OneofDefaultedUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedString)))
-		n += len(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedBytes)))
-		n += len(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool,json=extensionOptionalBool",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32,json=extensionOptionalInt32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32,json=extensionOptionalSint32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32,json=extensionOptionalUint32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64,json=extensionOptionalInt64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64,json=extensionOptionalSint64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64,json=extensionOptionalUint64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32,json=extensionOptionalFixed32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32,json=extensionOptionalSfixed32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float,json=extensionOptionalFloat",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64,json=extensionOptionalFixed64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64,json=extensionOptionalSfixed64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double,json=extensionOptionalDouble",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string,json=extensionOptionalString",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes,json=extensionOptionalBytes",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,json=extensionOptionalChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message,json=extensionOptionalChildMessage",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group,json=extensionOptionalNamedGroup",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,json=extensionOptionalSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message,json=extensionOptionalSiblingMessage",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20180430.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup,json=extensionoptionalgroup",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,json=extensionDefaultedBool,def=1",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,json=extensionDefaultedInt32,def=-12345",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,json=extensionDefaultedSint32,def=-3200",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,json=extensionDefaultedUint32,def=3200",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,json=extensionDefaultedInt64,def=-123456789",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,json=extensionDefaultedSint64,def=-6400",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,json=extensionDefaultedUint64,def=6400",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,json=extensionDefaultedFixed32,def=320000",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,json=extensionDefaultedSfixed32,def=-320000",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,json=extensionDefaultedFloat,def=3.14159",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,json=extensionDefaultedFixed64,def=640000",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,json=extensionDefaultedSfixed64,def=-640000",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,json=extensionDefaultedDouble,def=3.14159265359",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,json=extensionDefaultedString,def=hello, \"world!\"\n",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,json=extensionDefaultedBytes,def=dead\\336\\255\\276\\357beef",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,json=extensionDefaultedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum,def=0",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,json=extensionDefaultedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum,def=0",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool,json=extensionRepeatedBool",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32,json=extensionRepeatedInt32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32,json=extensionRepeatedSint32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32,json=extensionRepeatedUint32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64,json=extensionRepeatedInt64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64,json=extensionRepeatedSint64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64,json=extensionRepeatedUint64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32,json=extensionRepeatedFixed32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32,json=extensionRepeatedSfixed32",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float,json=extensionRepeatedFloat",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64,json=extensionRepeatedFixed64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64,json=extensionRepeatedSfixed64",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double,json=extensionRepeatedDouble",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string,json=extensionRepeatedString",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes,json=extensionRepeatedBytes",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,json=extensionRepeatedChildEnum,enum=google.golang.org.proto2_20180430.Message_ChildEnum",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message,json=extensionRepeatedChildMessage",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group,json=extensionRepeatedNamedGroup",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,json=extensionRepeatedSiblingEnum,enum=google.golang.org.proto2_20180430.SiblingEnum",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20180430.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message,json=extensionRepeatedSiblingMessage",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20180430.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup,json=extensionrepeatedgroup",
-	Filename:      "proto2_20180430_b4deda09/test.proto",
-}
-
-type Message_ChildMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 0}
-}
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (dst *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(dst, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()         { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()    {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 1}
-}
-func (m *Message_NamedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_NamedGroup.Unmarshal(m, b)
-}
-func (m *Message_NamedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_NamedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_NamedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_NamedGroup.Merge(dst, src)
-}
-func (m *Message_NamedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_NamedGroup.Size(m)
-}
-func (m *Message_NamedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_NamedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_NamedGroup proto.InternalMessageInfo
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()         { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()    {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 2}
-}
-func (m *Message_OptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_OptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OptionalGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_OptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OptionalGroup.Merge(dst, src)
-}
-func (m *Message_OptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OptionalGroup.Size(m)
-}
-func (m *Message_OptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OptionalGroup proto.InternalMessageInfo
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()         { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()    {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 3}
-}
-func (m *Message_RequiredGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RequiredGroup.Unmarshal(m, b)
-}
-func (m *Message_RequiredGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RequiredGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_RequiredGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RequiredGroup.Merge(dst, src)
-}
-func (m *Message_RequiredGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RequiredGroup.Size(m)
-}
-func (m *Message_RequiredGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RequiredGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RequiredGroup proto.InternalMessageInfo
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()         { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()    {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 4}
-}
-func (m *Message_RepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_RepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RepeatedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_RepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RepeatedGroup.Merge(dst, src)
-}
-func (m *Message_RepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RepeatedGroup.Size(m)
-}
-func (m *Message_RepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()         { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()    {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 33}
-}
-func (m *Message_OneofGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OneofGroup.Unmarshal(m, b)
-}
-func (m *Message_OneofGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OneofGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_OneofGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OneofGroup.Merge(dst, src)
-}
-func (m *Message_OneofGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OneofGroup.Size(m)
-}
-func (m *Message_OneofGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OneofGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OneofGroup proto.InternalMessageInfo
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 34}
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_ExtensionOptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.Merge(dst, src)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Size(m)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionOptionalGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_a365478be18be824, []int{1, 35}
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_ExtensionRepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.Merge(dst, src)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Size(m)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionRepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20180430.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20180430.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto2_20180430.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto2_20180430.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto2_20180430.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto2_20180430.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]*Message_NamedGroup)(nil), "google.golang.org.proto2_20180430.Message.MapBoolNamedGroupEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto2_20180430.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20180430.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20180430.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20180430.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20180430.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20180430.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20180430.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20180430.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto2_20180430.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20180430.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto2_20180430.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20180430.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20180430.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20180430.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20180430.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20180430.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20180430.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20180430.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20180430.Message.ExtensionRepeatedGroup")
-	proto.RegisterEnum("google.golang.org.proto2_20180430.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20180430.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-}
-
-func init() {
-	proto.RegisterFile("proto2_20180430_b4deda09/test.proto", fileDescriptor_test_a365478be18be824)
-}
-
-var fileDescriptor_test_a365478be18be824 = []byte{
-	// 4468 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x67, 0x70, 0x24, 0xc7,
-	0x75, 0xc6, 0xec, 0x62, 0x17, 0x87, 0x3e, 0x2c, 0xb0, 0x98, 0xbb, 0x03, 0xe6, 0x40, 0xd2, 0x5c,
-	0x9d, 0x64, 0x79, 0x4d, 0xf3, 0x70, 0xc0, 0xa0, 0xd1, 0xc7, 0x5b, 0x33, 0x08, 0x20, 0x8f, 0x5a,
-	0xca, 0xe2, 0x52, 0x35, 0xac, 0x73, 0xb9, 0x5c, 0x2c, 0xc3, 0xc0, 0x61, 0x81, 0x03, 0xb9, 0x01,
-	0x04, 0x76, 0x49, 0x9e, 0x25, 0x17, 0xcf, 0x72, 0xfc, 0x49, 0xe5, 0xb4, 0x92, 0x28, 0x66, 0x89,
-	0x51, 0x39, 0x31, 0x29, 0xd8, 0xa6, 0x72, 0x72, 0x90, 0x93, 0x9c, 0x93, 0x9c, 0x73, 0x0e, 0xd5,
-	0xfd, 0xba, 0xa7, 0xbb, 0x67, 0x7a, 0x16, 0xe8, 0x59, 0x15, 0x7f, 0xb0, 0x8a, 0xd7, 0xfb, 0xfa,
-	0x7d, 0xfd, 0xbe, 0xed, 0xf7, 0xde, 0x87, 0x9e, 0xe9, 0x45, 0x2f, 0xdd, 0xde, 0x69, 0x77, 0xda,
-	0xfe, 0x8a, 0x3f, 0x37, 0x7f, 0xc5, 0x1c, 0x5e, 0x98, 0x5b, 0x59, 0xc3, 0xeb, 0xf5, 0xf5, 0xd5,
-	0xb9, 0x53, 0x27, 0x3a, 0xf5, 0xdd, 0xce, 0x2c, 0xfb, 0xd4, 0x7d, 0xc9, 0x66, 0xbb, 0xbd, 0xd9,
-	0xa8, 0xcf, 0x6e, 0xb6, 0x1b, 0xab, 0xad, 0xcd, 0xd9, 0xf6, 0xce, 0xe6, 0x6c, 0x64, 0xda, 0xb1,
-	0xd7, 0xa1, 0xf1, 0x9b, 0xb7, 0xd6, 0x1a, 0x5b, 0xad, 0xcd, 0x1b, 0xeb, 0xbb, 0xbb, 0xab, 0x9b,
-	0x75, 0x77, 0x1c, 0x65, 0x36, 0xe6, 0x3d, 0xa7, 0xe4, 0x94, 0x47, 0x83, 0xcc, 0xc6, 0x3c, 0xfb,
-	0xb7, 0xef, 0x65, 0x4a, 0x19, 0xf6, 0x6f, 0x9f, 0xfd, 0x7b, 0xc1, 0xcb, 0x96, 0xb2, 0xec, 0xdf,
-	0x0b, 0x6e, 0x05, 0x65, 0x36, 0xb0, 0x37, 0x5c, 0x72, 0xca, 0x07, 0xfd, 0xcb, 0x66, 0xf7, 0x44,
-	0x9c, 0xe5, 0x38, 0x41, 0x66, 0x03, 0x1f, 0xfb, 0xce, 0xa3, 0x0e, 0x1a, 0x11, 0xc0, 0x67, 0x10,
-	0x6a, 0xad, 0x36, 0xeb, 0xeb, 0x9b, 0x3b, 0xed, 0xee, 0x36, 0x5b, 0x00, 0xf2, 0x17, 0xf7, 0xef,
-	0x70, 0xb6, 0x46, 0x27, 0xbf, 0x92, 0x4e, 0x0e, 0x14, 0x47, 0xee, 0x4b, 0x51, 0xa1, 0xbd, 0xdd,
-	0xd9, 0x6a, 0xb7, 0x56, 0x1b, 0x2b, 0x6b, 0xed, 0x76, 0xc3, 0x5b, 0x2f, 0x39, 0xe5, 0x03, 0xc1,
-	0x98, 0x18, 0x5c, 0x6e, 0xb7, 0x1b, 0xee, 0xf7, 0xa3, 0xf1, 0xd0, 0x68, 0xab, 0xd5, 0x59, 0xf0,
-	0xbd, 0x7a, 0xc9, 0x29, 0xe7, 0x82, 0x70, 0xea, 0x0d, 0x74, 0xd0, 0xfd, 0x01, 0x34, 0x11, 0x9a,
-	0xed, 0x82, 0xdd, 0x46, 0xc9, 0x29, 0x4f, 0x06, 0xe1, 0xec, 0x9b, 0xb7, 0x62, 0x86, 0x5d, 0x30,
-	0xdc, 0x2c, 0x39, 0xe5, 0x82, 0x34, 0x3c, 0x03, 0x86, 0x11, 0x60, 0x82, 0xbd, 0x73, 0x25, 0xa7,
-	0x9c, 0xd5, 0x80, 0x09, 0x8e, 0x01, 0x13, 0xec, 0x6d, 0x95, 0x9c, 0xb2, 0xab, 0x03, 0x47, 0x0c,
-	0xbb, 0x60, 0x78, 0x6b, 0xc9, 0x29, 0x0f, 0xeb, 0xc0, 0x04, 0xbb, 0x3f, 0x88, 0x8a, 0xa1, 0xe1,
-	0xc6, 0xd6, 0x5d, 0xf5, 0xf5, 0x05, 0xdf, 0xbb, 0xad, 0xe4, 0x94, 0x47, 0x82, 0xd0, 0xc1, 0xf5,
-	0x30, 0xec, 0xfe, 0x10, 0x9a, 0x94, 0xe0, 0xc2, 0xb6, 0x51, 0x72, 0xca, 0x13, 0x41, 0xe8, 0xe3,
-	0x66, 0x3e, 0xae, 0x05, 0xb4, 0xd1, 0x68, 0xaf, 0x76, 0xbc, 0x66, 0xc9, 0x29, 0x67, 0x64, 0x40,
-	0xd7, 0xd3, 0xc1, 0x38, 0x3c, 0xc1, 0x5e, 0xab, 0xe4, 0x94, 0xf3, 0x11, 0x78, 0x82, 0x0d, 0xf0,
-	0x04, 0x7b, 0xed, 0x92, 0x53, 0x2e, 0x46, 0xe1, 0x23, 0xf1, 0xaf, 0xb7, 0xbb, 0x6b, 0x8d, 0xba,
-	0xb7, 0x5d, 0x72, 0xca, 0x8e, 0x8c, 0xff, 0x3a, 0x36, 0xaa, 0x33, 0xda, 0xd9, 0xd9, 0x6a, 0x6d,
-	0x7a, 0xb7, 0xb3, 0x3d, 0x2f, 0x19, 0x65, 0xa3, 0x5a, 0x40, 0x6b, 0xe7, 0x3b, 0xf5, 0x5d, 0x6f,
-	0xa7, 0xe4, 0x94, 0xc7, 0x64, 0x40, 0xcb, 0x74, 0xd0, 0x5d, 0x47, 0x87, 0x42, 0xb3, 0xb3, 0xe7,
-	0xb6, 0x1a, 0xeb, 0x2b, 0xf5, 0x56, 0xb7, 0xe9, 0xed, 0x96, 0x9c, 0xf2, 0xb8, 0x8f, 0x2d, 0xb6,
-	0xf1, 0xb5, 0x74, 0xf2, 0xe9, 0x56, 0xb7, 0x19, 0x84, 0x61, 0x87, 0x43, 0x6e, 0x13, 0x4d, 0x45,
-	0x50, 0x9a, 0x30, 0xcd, 0xeb, 0xb0, 0x04, 0x3c, 0x69, 0x0b, 0x24, 0xb2, 0xf1, 0xb0, 0x86, 0x25,
-	0x52, 0x72, 0x13, 0x85, 0xe3, 0x2b, 0x2c, 0xa5, 0x56, 0x20, 0x39, 0xbb, 0x0c, 0x2c, 0x65, 0x72,
-	0xba, 0xc2, 0xa5, 0x1c, 0x73, 0xd7, 0xd0, 0x11, 0x65, 0x7f, 0xb3, 0x7a, 0x04, 0xfc, 0xdd, 0xc1,
-	0xf8, 0x9b, 0xdd, 0x07, 0x12, 0x2f, 0x63, 0x8c, 0xb9, 0x43, 0x32, 0x2b, 0xc2, 0x41, 0xf7, 0x36,
-	0xe4, 0xc5, 0x30, 0x04, 0x7b, 0x77, 0xb2, 0x80, 0xe6, 0xf7, 0x0f, 0x23, 0x78, 0x9b, 0x8a, 0x20,
-	0x09, 0xe6, 0x7e, 0x42, 0x56, 0x1d, 0xa0, 0xec, 0x2e, 0x56, 0xcf, 0xae, 0xb0, 0xa0, 0xec, 0x26,
-	0x3e, 0x1f, 0x58, 0xd3, 0xdd, 0xb9, 0x97, 0xa3, 0xf1, 0xf5, 0xfa, 0xc6, 0x6a, 0xb7, 0xd1, 0xa9,
-	0xaf, 0x43, 0x59, 0x7b, 0x81, 0x56, 0xcc, 0x03, 0x95, 0xe1, 0xce, 0x4e, 0xb7, 0x1e, 0x14, 0xc2,
-	0x0f, 0x59, 0x79, 0x9b, 0x43, 0x13, 0xd2, 0x1a, 0xca, 0xd1, 0x17, 0xa8, 0x79, 0xae, 0x92, 0x3f,
-	0x3e, 0xef, 0x2f, 0xe0, 0xc5, 0x40, 0x7a, 0x83, 0x4a, 0x37, 0x8f, 0x8a, 0x72, 0x06, 0x2f, 0x75,
-	0x5f, 0xa4, 0x53, 0x26, 0x2b, 0xb9, 0xe3, 0x0b, 0xfe, 0xdc, 0x5c, 0x20, 0x3d, 0xf2, 0x9a, 0x37,
-	0xa7, 0x4e, 0xe1, 0x45, 0xef, 0x4b, 0x74, 0x4a, 0xa1, 0x32, 0x1c, 0x99, 0xc1, 0x8b, 0x1f, 0x8e,
-	0x2c, 0x8b, 0x60, 0xef, 0xcb, 0x74, 0x42, 0xb6, 0x82, 0x60, 0x59, 0xe4, 0xe4, 0x15, 0xa7, 0xf4,
-	0xa5, 0x11, 0x1c, 0x5f, 0x1a, 0xc1, 0xde, 0x57, 0xe8, 0x34, 0xb7, 0x92, 0x3b, 0x4e, 0x70, 0x6c,
-	0x69, 0x04, 0xc7, 0x97, 0x46, 0xb0, 0xf7, 0x55, 0x3a, 0x65, 0xb8, 0x32, 0x1c, 0x99, 0xc1, 0xcb,
-	0x23, 0x46, 0x93, 0x72, 0x86, 0xa8, 0x79, 0x5f, 0xa3, 0x53, 0x46, 0x2a, 0x79, 0x1a, 0xcd, 0xdc,
-	0x5c, 0x20, 0x7d, 0x8a, 0x4a, 0x79, 0x12, 0xb9, 0xca, 0xd2, 0xc4, 0xb4, 0xaf, 0xd3, 0x69, 0x13,
-	0x95, 0x91, 0xe3, 0x7c, 0x9e, 0xf4, 0x1c, 0x56, 0xcd, 0x79, 0x95, 0x09, 0x28, 0x9b, 0xdf, 0xa0,
-	0xb3, 0x32, 0x95, 0x91, 0x85, 0xd9, 0x79, 0x3c, 0xbf, 0xa8, 0xd2, 0x00, 0x15, 0x34, 0xbe, 0x42,
-	0x82, 0xbd, 0x6f, 0xd2, 0x49, 0xf9, 0x4a, 0x9e, 0x06, 0x15, 0x5f, 0x21, 0xc1, 0xa6, 0x15, 0x12,
-	0xec, 0x7d, 0x8b, 0x4e, 0x2b, 0x56, 0x46, 0x8e, 0xf3, 0x79, 0xd1, 0x15, 0x12, 0xec, 0x9e, 0x52,
-	0x29, 0xe4, 0x95, 0xf5, 0xd7, 0xe8, 0x34, 0xa7, 0x52, 0xe0, 0x4b, 0xf4, 0xc9, 0xe2, 0xc2, 0xe2,
-	0x29, 0x85, 0x4b, 0x5e, 0x6a, 0xaf, 0xd4, 0xbe, 0x30, 0xa8, 0xb5, 0xbf, 0xce, 0x04, 0x46, 0xa5,
-	0x78, 0xae, 0xde, 0x68, 0xb4, 0x2f, 0x2f, 0x1d, 0xbb, 0xb3, 0xbd, 0xd3, 0x58, 0x7f, 0xc9, 0x31,
-	0xa4, 0x7e, 0x77, 0x50, 0x7f, 0x97, 0x55, 0x6a, 0xa0, 0x00, 0xff, 0x06, 0x9d, 0x3c, 0x56, 0xf1,
-	0xd6, 0xeb, 0xab, 0xeb, 0xb7, 0x2c, 0x2c, 0x90, 0x5b, 0xfc, 0xc5, 0xc5, 0x5b, 0xfc, 0x93, 0xe4,
-	0x96, 0x85, 0xc5, 0x93, 0x6b, 0xf5, 0xfa, 0x86, 0xc2, 0x15, 0x14, 0xe7, 0x16, 0x3a, 0x2c, 0x7d,
-	0x28, 0xd5, 0xf9, 0x37, 0x9d, 0xf4, 0xe5, 0xb9, 0x92, 0x5b, 0x7a, 0xf5, 0x6b, 0xaa, 0x4b, 0x81,
-	0xe4, 0x53, 0x96, 0xe9, 0x06, 0x9a, 0x52, 0xb7, 0xa8, 0x52, 0xcf, 0xbe, 0xed, 0xa4, 0x29, 0x68,
-	0x02, 0xeb, 0xb0, 0xb2, 0xb1, 0x65, 0x61, 0x7b, 0x19, 0x2a, 0xec, 0xd4, 0x6f, 0xef, 0x6e, 0xed,
-	0x88, 0x52, 0xf0, 0x18, 0x55, 0x6b, 0x07, 0x82, 0x31, 0x31, 0xca, 0x6a, 0xc0, 0xcb, 0xd1, 0x78,
-	0x68, 0x05, 0xc9, 0xf9, 0x38, 0x35, 0xcb, 0x05, 0xe1, 0x64, 0xc8, 0xfc, 0x32, 0x9a, 0x08, 0xed,
-	0x78, 0xe2, 0x3f, 0x41, 0x0d, 0x27, 0x83, 0x70, 0x3e, 0x4f, 0x78, 0xd5, 0x92, 0xe7, 0xfb, 0x93,
-	0xd4, 0xb2, 0x20, 0x2d, 0x79, 0xa2, 0x47, 0xb0, 0x09, 0xf6, 0x9e, 0xa2, 0x86, 0x59, 0x0d, 0x9b,
-	0xe0, 0x18, 0x36, 0xc1, 0xde, 0x07, 0xa9, 0xa1, 0xab, 0x63, 0x47, 0x2c, 0x79, 0x42, 0x7f, 0x88,
-	0x5a, 0x0e, 0xeb, 0xd8, 0x04, 0xbb, 0x97, 0xa1, 0x62, 0x68, 0x29, 0x32, 0xf2, 0xc3, 0xd4, 0x74,
-	0x24, 0x08, 0x5d, 0x88, 0xfc, 0xbd, 0x1c, 0x4d, 0x4a, 0x7c, 0x61, 0xfc, 0x11, 0x6a, 0x3c, 0x11,
-	0x84, 0x5e, 0xc2, 0xa4, 0x55, 0xa3, 0x82, 0x9c, 0xfd, 0x28, 0x35, 0xcd, 0xc8, 0xa8, 0x20, 0x53,
-	0x63, 0x2b, 0x20, 0xd8, 0xfb, 0x18, 0xb5, 0xcc, 0x47, 0x56, 0x40, 0xb0, 0x61, 0x05, 0x04, 0x7b,
-	0x1f, 0xa7, 0xc6, 0xc5, 0xe8, 0x0a, 0x22, 0x2c, 0xf0, 0x9c, 0xfc, 0x04, 0xb5, 0x75, 0x24, 0x0b,
-	0x3c, 0x07, 0x35, 0x66, 0x21, 0x05, 0x3f, 0x09, 0x9a, 0x5e, 0x32, 0x0b, 0xf9, 0xa6, 0x46, 0x05,
-	0xe9, 0xf6, 0x29, 0x6a, 0x38, 0x26, 0xa3, 0x82, 0x9c, 0xaa, 0xa3, 0x43, 0xa1, 0x9d, 0x92, 0x52,
-	0x9f, 0xa6, 0xc6, 0xa9, 0x15, 0x8f, 0xf0, 0x28, 0x53, 0xa9, 0x85, 0xa6, 0x22, 0x30, 0xa2, 0x67,
-	0x3f, 0x4d, 0x91, 0x06, 0x91, 0x3c, 0x1a, 0x98, 0x68, 0xdc, 0xe7, 0x50, 0x38, 0xae, 0x49, 0x9e,
-	0x67, 0x00, 0x2d, 0xad, 0xe6, 0x11, 0x3e, 0x15, 0xcd, 0x73, 0x16, 0x1d, 0x51, 0x36, 0xbb, 0x52,
-	0x23, 0x9e, 0x05, 0x0a, 0xad, 0x45, 0x8f, 0x4c, 0x11, 0x59, 0x1b, 0x1a, 0xc8, 0x8b, 0x81, 0x08,
-	0x02, 0x9f, 0x83, 0x90, 0xd2, 0xa8, 0x9e, 0x08, 0x94, 0x20, 0x6f, 0x45, 0x56, 0x22, 0x60, 0xed,
-	0x79, 0x0a, 0x61, 0x27, 0x7b, 0x02, 0xee, 0x80, 0xcb, 0x1e, 0xcd, 0x9f, 0x7b, 0x15, 0x9a, 0x96,
-	0x1b, 0x5e, 0xd7, 0x3f, 0xf7, 0x64, 0x69, 0xd1, 0xe3, 0xfa, 0x27, 0x64, 0xf6, 0x3a, 0x4d, 0x07,
-	0x2d, 0x29, 0x6c, 0x44, 0x05, 0xd1, 0x1b, 0xe8, 0x7c, 0x29, 0x88, 0xa6, 0x62, 0x1e, 0xa0, 0x3c,
-	0x2e, 0xa3, 0xa3, 0x06, 0x17, 0xbc, 0x50, 0xbe, 0x91, 0xfa, 0x08, 0x15, 0xd2, 0x74, 0xcc, 0x05,
-	0x2f, 0x9c, 0x4b, 0x46, 0x1f, 0xbc, 0x84, 0xbe, 0x89, 0xfa, 0x10, 0x92, 0x29, 0xee, 0x82, 0x57,
-	0xd4, 0xd3, 0x49, 0x91, 0x10, 0xec, 0xbd, 0x99, 0x7a, 0xd0, 0x35, 0x94, 0x31, 0x1a, 0x82, 0xfb,
-	0x44, 0x43, 0xb0, 0xf7, 0x16, 0xea, 0x27, 0x14, 0x55, 0xe6, 0x68, 0x08, 0xee, 0x13, 0x0d, 0xc1,
-	0xde, 0x5b, 0xa9, 0x0f, 0xa1, 0xb2, 0xcc, 0xd1, 0x10, 0xec, 0x9e, 0x46, 0x33, 0x06, 0x17, 0xa2,
-	0x00, 0xbf, 0x8d, 0xfa, 0x90, 0xb2, 0xcb, 0x8b, 0x79, 0x11, 0xe5, 0xbb, 0x8a, 0x2e, 0x32, 0x45,
-	0x23, 0xfc, 0xbc, 0x9d, 0xfa, 0x51, 0x74, 0xd8, 0xd1, 0x78, 0x44, 0xa2, 0xb4, 0x2f, 0x1b, 0xe9,
-	0x85, 0x22, 0xff, 0x0e, 0xea, 0x46, 0x11, 0x66, 0x71, 0x6e, 0xa1, 0xec, 0xf7, 0x09, 0x8a, 0x60,
-	0xef, 0x9d, 0xd4, 0x8b, 0x54, 0x6a, 0x09, 0x41, 0x11, 0xdc, 0x37, 0x28, 0x82, 0xbd, 0x77, 0x51,
-	0x3f, 0x8a, 0x74, 0x4b, 0x0a, 0x8a, 0x60, 0xf7, 0x55, 0xc6, 0x2f, 0x8a, 0xf7, 0x8d, 0x1e, 0xf5,
-	0x13, 0xd3, 0x72, 0xf1, 0x6f, 0x8c, 0xf7, 0x93, 0x1b, 0xcd, 0x1b, 0x07, 0x3a, 0xcb, 0xbb, 0xa9,
-	0x2f, 0x93, 0xb8, 0x33, 0xec, 0x21, 0x68, 0x3a, 0x37, 0x1b, 0xf9, 0x86, 0xf6, 0xf3, 0x1e, 0xea,
-	0xad, 0x9f, 0xda, 0x8b, 0x7f, 0x01, 0xd0, 0xa1, 0xee, 0x46, 0x97, 0x18, 0x9c, 0x2a, 0xbd, 0xea,
-	0xbd, 0xd9, 0xf4, 0xbd, 0x4a, 0x48, 0xb2, 0x99, 0x18, 0xb8, 0xec, 0x5d, 0x3f, 0x8d, 0x2e, 0x35,
-	0x66, 0x97, 0x52, 0xeb, 0xef, 0xcd, 0xa6, 0xa9, 0xf5, 0x02, 0xfc, 0x62, 0x43, 0x4e, 0x46, 0x74,
-	0xe1, 0x76, 0x7d, 0x35, 0x2c, 0x91, 0xff, 0x9c, 0x2d, 0x65, 0x41, 0x17, 0xc2, 0xa8, 0xd4, 0x85,
-	0xdc, 0x0a, 0x2a, 0xd0, 0xbf, 0x50, 0x33, 0xa6, 0x0b, 0x61, 0x58, 0xd1, 0x85, 0xdc, 0x8e, 0x97,
-	0xbb, 0x7f, 0xa5, 0x86, 0x4c, 0x17, 0xc2, 0xb8, 0xaa, 0x0b, 0xb9, 0x25, 0x2f, 0x6a, 0xff, 0x46,
-	0x2d, 0x0b, 0xd2, 0x52, 0xd5, 0x85, 0x12, 0x9b, 0x60, 0xef, 0xdf, 0xa9, 0x61, 0x56, 0xc3, 0x16,
-	0x3a, 0x47, 0xc1, 0x26, 0xd8, 0xfb, 0x0f, 0x6a, 0xe8, 0xea, 0xd8, 0x11, 0x4b, 0x5e, 0x82, 0xfe,
-	0x93, 0x5a, 0x0e, 0xeb, 0xd8, 0x42, 0x17, 0x72, 0x4b, 0x51, 0x21, 0xfe, 0x8b, 0x9a, 0x32, 0x5d,
-	0x08, 0x1f, 0x68, 0xba, 0x50, 0xe0, 0x0b, 0xe3, 0xff, 0xa6, 0xc6, 0x4c, 0x17, 0xf2, 0x15, 0x68,
-	0xba, 0x50, 0x78, 0x66, 0x25, 0xe3, 0x7f, 0xa8, 0x69, 0x46, 0x46, 0xa5, 0xe8, 0x42, 0x75, 0x05,
-	0x04, 0x7b, 0xff, 0x4b, 0x2d, 0xf3, 0x91, 0x15, 0x08, 0x5d, 0xa8, 0xad, 0x80, 0x60, 0xef, 0xff,
-	0xa8, 0x71, 0x31, 0xba, 0x82, 0x08, 0x0b, 0x3c, 0xbf, 0x2f, 0x0c, 0x97, 0xb2, 0xa0, 0x0b, 0x61,
-	0x5c, 0xd5, 0x85, 0xc2, 0x2f, 0x64, 0xef, 0xcf, 0x0c, 0xb3, 0xb3, 0x5d, 0xc9, 0xac, 0xa2, 0x0b,
-	0xc5, 0x6e, 0x62, 0x89, 0xf9, 0x7a, 0x6a, 0x38, 0x26, 0xa3, 0x52, 0x74, 0x21, 0xb7, 0x53, 0x72,
-	0xed, 0x67, 0xa9, 0xf1, 0x00, 0xba, 0x10, 0x3c, 0x46, 0x74, 0xa1, 0x06, 0x23, 0x64, 0xcd, 0xcf,
-	0x51, 0xa4, 0xc1, 0x74, 0xa1, 0x02, 0xa6, 0xe9, 0x42, 0x8e, 0xa7, 0xea, 0xc2, 0x9f, 0x07, 0xb4,
-	0xf4, 0xba, 0x10, 0x7c, 0x46, 0x75, 0x61, 0xb8, 0xd9, 0x95, 0x5a, 0xf1, 0x0b, 0x40, 0x61, 0x0a,
-	0x5d, 0x28, 0x52, 0x24, 0xa2, 0x0b, 0x23, 0x20, 0x82, 0xc0, 0x5f, 0x84, 0x90, 0xd2, 0xe9, 0x42,
-	0x0d, 0x4a, 0xd3, 0x85, 0xf0, 0x09, 0xb0, 0xf6, 0x4b, 0x14, 0xc2, 0x56, 0x17, 0x82, 0x83, 0x50,
-	0x17, 0x2a, 0xfe, 0xdc, 0x9f, 0x44, 0x85, 0xe6, 0xea, 0x36, 0xab, 0x72, 0x50, 0xea, 0xbe, 0x0d,
-	0x31, 0xfc, 0xb0, 0x05, 0xc0, 0x8d, 0xab, 0xdb, 0xb4, 0x20, 0xd2, 0xff, 0x4e, 0xb7, 0x3a, 0x3b,
-	0xe7, 0x83, 0x83, 0x4d, 0x39, 0xe2, 0x9e, 0x45, 0xe3, 0x21, 0x02, 0xd4, 0xb4, 0xdf, 0x02, 0x88,
-	0x2b, 0xed, 0x21, 0x58, 0x41, 0x05, 0x8c, 0xb1, 0xa6, 0x32, 0xe4, 0x6e, 0xa0, 0x89, 0x10, 0x84,
-	0xd7, 0xd8, 0xdf, 0x06, 0x94, 0xab, 0xec, 0x51, 0xa0, 0x1a, 0x03, 0x4c, 0xa1, 0xa9, 0x8e, 0x69,
-	0x38, 0xbc, 0x42, 0xff, 0x4e, 0x6a, 0x9c, 0x33, 0x06, 0x1c, 0x5e, 0xdf, 0x23, 0xa4, 0x11, 0xec,
-	0xfd, 0xee, 0x20, 0xa4, 0x11, 0x1c, 0x23, 0x8d, 0xe0, 0x18, 0x69, 0x04, 0x7b, 0xbf, 0x37, 0x10,
-	0x69, 0x02, 0x46, 0x25, 0x2d, 0x82, 0xc3, 0x5b, 0xcb, 0x77, 0x06, 0x22, 0x2d, 0x8a, 0xc3, 0x1b,
-	0xd3, 0x16, 0x2a, 0x86, 0x38, 0xa2, 0xd7, 0xfc, 0x3e, 0x00, 0x5d, 0x6d, 0x0f, 0xc4, 0x5b, 0x18,
-	0x20, 0x8d, 0x37, 0xb5, 0x41, 0xb7, 0x81, 0x26, 0x25, 0x75, 0x02, 0xeb, 0x0f, 0x00, 0xeb, 0x9a,
-	0x14, 0xe4, 0x6d, 0xa8, 0x60, 0x13, 0x4d, 0x7d, 0x54, 0xdb, 0x0d, 0xd0, 0x17, 0xff, 0x30, 0xf5,
-	0x6e, 0x60, 0x1d, 0x54, 0xdf, 0x0d, 0xd0, 0x54, 0x63, 0xec, 0x11, 0xec, 0xfd, 0xd1, 0x60, 0xec,
-	0x89, 0xef, 0x49, 0x63, 0x8f, 0x60, 0x03, 0x7b, 0x04, 0x7b, 0x7f, 0x3c, 0x20, 0x7b, 0x02, 0x4c,
-	0x67, 0x2f, 0xb2, 0xfd, 0x78, 0x4f, 0xff, 0x93, 0xd4, 0xdb, 0x0f, 0xba, 0xbf, 0xbe, 0xfd, 0xb8,
-	0x22, 0xd0, 0xd2, 0x09, 0x14, 0xc1, 0x9f, 0xa6, 0x4f, 0x27, 0xe6, 0x20, 0x92, 0x4e, 0xa0, 0x27,
-	0xd4, 0xdd, 0x00, 0x7a, 0xe2, 0xcf, 0x52, 0xef, 0x06, 0xa6, 0x3c, 0xf4, 0xdd, 0x00, 0x62, 0x64,
-	0x1b, 0x1d, 0x0a, 0x41, 0x14, 0x31, 0xf2, 0xe7, 0x80, 0xf4, 0x0a, 0x7b, 0xa4, 0x50, 0x80, 0x00,
-	0x5a, 0xb1, 0x19, 0x19, 0x76, 0xcf, 0xa3, 0xa9, 0x08, 0xa2, 0x68, 0xab, 0x7f, 0x01, 0xa0, 0xd7,
-	0xa6, 0x04, 0xe5, 0x63, 0x80, 0x7b, 0xa8, 0x19, 0xff, 0xc4, 0xdd, 0x45, 0x87, 0x43, 0x68, 0x55,
-	0xa2, 0xfc, 0x25, 0x00, 0x2f, 0xd9, 0x03, 0x4b, 0x55, 0x02, 0xb0, 0x93, 0xcd, 0xe8, 0xb8, 0x7b,
-	0x07, 0x3a, 0xa2, 0x54, 0x5f, 0x45, 0xad, 0x7c, 0x17, 0x50, 0x97, 0xd3, 0xd4, 0xe0, 0x50, 0xa7,
-	0x00, 0xac, 0xdb, 0x8c, 0x7d, 0xe0, 0xde, 0x8d, 0xbc, 0x18, 0xae, 0x60, 0xfa, 0xaf, 0x00, 0xfa,
-	0x74, 0x6a, 0x68, 0x8d, 0xeb, 0x23, 0x4d, 0xd3, 0x67, 0x62, 0xff, 0xb2, 0x46, 0x07, 0x9a, 0xe3,
-	0xaf, 0x53, 0xed, 0x5f, 0xd6, 0xf9, 0xa5, 0xe8, 0xa0, 0xfb, 0x37, 0x1c, 0x12, 0xc9, 0xb8, 0xab,
-	0xa0, 0xfc, 0x4d, 0xaa, 0x64, 0x84, 0xc6, 0x2f, 0x61, 0x68, 0x32, 0xca, 0x31, 0x81, 0xd3, 0x55,
-	0x70, 0xfe, 0x36, 0x15, 0xce, 0x19, 0x03, 0x8e, 0x1c, 0x53, 0x48, 0x23, 0x18, 0x60, 0xfe, 0x2e,
-	0x2d, 0x69, 0x04, 0xc7, 0x48, 0x83, 0x21, 0x95, 0x34, 0x81, 0xf2, 0xf7, 0xa9, 0x49, 0x53, 0x61,
-	0x04, 0x69, 0x3a, 0x4e, 0x57, 0xc1, 0xf9, 0x87, 0xd4, 0xa4, 0x45, 0x71, 0xe4, 0x98, 0x68, 0x69,
-	0xbc, 0x8d, 0x02, 0xd0, 0x3f, 0xa6, 0x6a, 0x69, 0xbc, 0xef, 0x4b, 0x24, 0xfa, 0x6d, 0x28, 0x83,
-	0x21, 0x75, 0xac, 0x44, 0x03, 0xd2, 0x3f, 0xa5, 0xa3, 0x8e, 0x79, 0x88, 0x50, 0x17, 0x8e, 0xb9,
-	0x25, 0x84, 0xda, 0xad, 0x7a, 0x7b, 0x03, 0x20, 0x9e, 0xce, 0x95, 0x9c, 0xf2, 0x81, 0xea, 0x50,
-	0x30, 0xca, 0x06, 0x99, 0xc5, 0x31, 0x74, 0x10, 0x2c, 0x40, 0x9e, 0x3e, 0x43, 0x4d, 0x72, 0xd5,
-	0xa1, 0x00, 0xe6, 0x81, 0x5c, 0x7e, 0x19, 0x1a, 0x03, 0x1b, 0xae, 0x95, 0x9f, 0xa5, 0x46, 0x93,
-	0xd5, 0xa1, 0x00, 0xa6, 0x72, 0xb1, 0x1b, 0x5a, 0x71, 0xa5, 0xfb, 0x1c, 0xb5, 0x2a, 0x84, 0x56,
-	0x5c, 0xaa, 0xaa, 0x78, 0x04, 0x7b, 0xcf, 0x53, 0xa3, 0xac, 0x8a, 0x47, 0xb0, 0x8e, 0x47, 0xb0,
-	0xf7, 0x19, 0x6a, 0xe4, 0x6a, 0x78, 0xaa, 0x15, 0x17, 0x89, 0x9f, 0xa5, 0x56, 0xc3, 0x1a, 0x1e,
-	0xc1, 0xee, 0xcb, 0x51, 0x01, 0xac, 0x84, 0xec, 0xfa, 0x1c, 0x35, 0x1b, 0xa9, 0x0e, 0x05, 0x30,
-	0x5b, 0x48, 0xb4, 0x32, 0x1a, 0xe7, 0x98, 0xc2, 0xf0, 0xf3, 0xd4, 0x70, 0xa2, 0x3a, 0x14, 0x80,
-	0x83, 0x50, 0x5e, 0x85, 0x11, 0x80, 0xb6, 0xfa, 0x65, 0x6a, 0x96, 0x09, 0x23, 0x00, 0x75, 0xa4,
-	0xa3, 0x12, 0xec, 0xfd, 0x0a, 0xb5, 0xca, 0xeb, 0xa8, 0xec, 0x00, 0x41, 0x43, 0x25, 0xd8, 0xfb,
-	0x55, 0x6a, 0x58, 0x8c, 0xa0, 0xaa, 0xd1, 0x72, 0x4d, 0xf2, 0x02, 0xb5, 0x73, 0xc2, 0x68, 0xb9,
-	0xa8, 0x90, 0xcc, 0x81, 0xa2, 0xf8, 0x02, 0xb5, 0x1a, 0x95, 0xcc, 0x81, 0x24, 0x08, 0x23, 0x00,
-	0x3d, 0xf0, 0x45, 0x6a, 0x34, 0x16, 0x46, 0x00, 0x1d, 0x7d, 0x15, 0x15, 0xc1, 0x46, 0x69, 0xe7,
-	0x5f, 0xca, 0xa5, 0x7f, 0x8c, 0x5b, 0x1d, 0x0a, 0x20, 0x54, 0xd9, 0xc2, 0x6f, 0x45, 0x87, 0x54,
-	0x08, 0xd1, 0x55, 0xbe, 0x9c, 0x1b, 0xe8, 0x15, 0x9b, 0xea, 0x50, 0x30, 0x29, 0x81, 0x44, 0x17,
-	0x59, 0x47, 0x30, 0xa8, 0x35, 0xec, 0xaf, 0xe4, 0x06, 0x78, 0xbf, 0xa6, 0x3a, 0x14, 0x4c, 0x30,
-	0x97, 0x4a, 0x93, 0x5e, 0x41, 0xae, 0xd8, 0xb8, 0x4a, 0x87, 0xfe, 0x6a, 0x2e, 0xcd, 0xb3, 0xe8,
-	0xea, 0x50, 0x50, 0xe4, 0xdb, 0x5d, 0x76, 0xe3, 0x73, 0xe8, 0x88, 0x0e, 0x20, 0x48, 0xfb, 0x5a,
-	0x2e, 0xe5, 0x9b, 0x35, 0xd5, 0xa1, 0xe0, 0x90, 0x0a, 0x23, 0x08, 0xfb, 0x31, 0x5e, 0x39, 0x80,
-	0xa9, 0xaf, 0xe7, 0xac, 0x5f, 0x13, 0xbc, 0x89, 0xce, 0x16, 0x4c, 0x29, 0xbe, 0x64, 0x6e, 0xc0,
-	0x1e, 0x9d, 0xf7, 0xbe, 0x21, 0x36, 0xe9, 0x98, 0xb2, 0x49, 0xe7, 0xa3, 0x76, 0xbe, 0xf7, 0x4d,
-	0x93, 0x9d, 0x1f, 0xb5, 0x5b, 0xf0, 0xbe, 0x65, 0xb2, 0x5b, 0x70, 0x4f, 0xa1, 0xc3, 0x3c, 0x83,
-	0xf4, 0x07, 0x5a, 0xf7, 0xe6, 0xe5, 0x0b, 0x3d, 0x55, 0x27, 0x80, 0x6f, 0x50, 0x7f, 0x9e, 0x75,
-	0x95, 0xa0, 0x3d, 0xfa, 0x30, 0xeb, 0x7d, 0x79, 0xf5, 0xed, 0x9e, 0xaa, 0xc3, 0xb9, 0x8c, 0x3c,
-	0xcb, 0xba, 0x1a, 0x4d, 0x45, 0xa7, 0xf3, 0x4a, 0x7a, 0x5f, 0x5e, 0x79, 0xd5, 0xa7, 0xea, 0x04,
-	0x87, 0xf5, 0xe9, 0xbc, 0xb2, 0x5e, 0x15, 0x9f, 0xcf, 0x6b, 0xec, 0xfd, 0x79, 0xf9, 0xde, 0x4f,
-	0x7c, 0xfa, 0x19, 0xf1, 0x18, 0xcc, 0xb4, 0x7a, 0x82, 0xbd, 0x07, 0xf2, 0xd1, 0x97, 0x80, 0x8c,
-	0x11, 0x10, 0x9c, 0x14, 0x01, 0xc1, 0xde, 0x83, 0x79, 0xe5, 0x8d, 0x20, 0x73, 0x04, 0x04, 0x27,
-	0x45, 0x40, 0xb0, 0xf7, 0x50, 0x5e, 0xbe, 0x1e, 0x64, 0x8e, 0x80, 0x3d, 0xfa, 0x9a, 0x8e, 0x4e,
-	0x17, 0x55, 0xfa, 0xe1, 0xbc, 0xfa, 0xae, 0x50, 0xd5, 0x09, 0x8e, 0xe8, 0x1e, 0x44, 0x7d, 0xbf,
-	0x0e, 0x79, 0xb1, 0x08, 0x84, 0x8f, 0x47, 0xf2, 0xda, 0x8b, 0x43, 0x55, 0x27, 0x98, 0x8a, 0x44,
-	0x21, 0x6a, 0xff, 0xd5, 0x71, 0x2a, 0xa1, 0x0b, 0xbc, 0x3f, 0xaf, 0xbd, 0x45, 0x14, 0xe7, 0x11,
-	0xfa, 0x42, 0x52, 0x20, 0x04, 0x7b, 0x1f, 0xc8, 0xab, 0xaf, 0x14, 0x25, 0x04, 0x42, 0x70, 0x72,
-	0x20, 0x04, 0x7b, 0x8f, 0xe6, 0xb5, 0xf7, 0x8b, 0x92, 0x02, 0x21, 0xd8, 0xbd, 0x3e, 0xfe, 0x85,
-	0xf0, 0xc6, 0xf2, 0x58, 0xde, 0xf0, 0xb2, 0x51, 0xfc, 0x9b, 0xe1, 0x0d, 0xe7, 0x06, 0xc3, 0xc6,
-	0x80, 0xd6, 0xf3, 0x78, 0xde, 0xfc, 0xe6, 0x91, 0x61, 0x8f, 0x40, 0x57, 0xba, 0x29, 0xce, 0x2d,
-	0xf4, 0xa7, 0x27, 0xf2, 0xfd, 0x5f, 0x43, 0x8a, 0x93, 0x0d, 0x2d, 0xec, 0xb5, 0x68, 0x26, 0xea,
-	0x50, 0x69, 0x66, 0x4f, 0xe6, 0x07, 0x7e, 0x27, 0xa9, 0xea, 0x04, 0xd3, 0x3a, 0xb0, 0xfa, 0xf7,
-	0xe9, 0xc5, 0xf1, 0x8c, 0x51, 0x9a, 0xc2, 0x53, 0xf9, 0x01, 0x5e, 0x50, 0xaa, 0x3a, 0xc1, 0xd1,
-	0x68, 0x9e, 0x85, 0x36, 0x33, 0x3f, 0x85, 0xc6, 0xb4, 0xde, 0xf7, 0x22, 0xbe, 0x69, 0x3e, 0x73,
-	0x17, 0x42, 0x4a, 0x3f, 0x7c, 0x31, 0x91, 0xaf, 0x41, 0x05, 0xed, 0x4d, 0x4e, 0x5b, 0x70, 0xea,
-	0x40, 0x7b, 0x27, 0x22, 0x9d, 0x03, 0xe5, 0xf0, 0xdc, 0xda, 0xc1, 0xd5, 0xa8, 0x18, 0x3d, 0x1c,
-	0x77, 0x8b, 0x28, 0x7b, 0x5b, 0xfd, 0x3c, 0x73, 0x72, 0x20, 0xa0, 0xff, 0xeb, 0x1e, 0x46, 0xb9,
-	0x3b, 0x56, 0x1b, 0xdd, 0xba, 0x97, 0x61, 0x63, 0xf0, 0x8f, 0x4a, 0xe6, 0x0a, 0x67, 0xe6, 0x1a,
-	0x34, 0x19, 0x3b, 0xf9, 0xde, 0xcb, 0x41, 0x4e, 0x75, 0xf0, 0x0a, 0xe4, 0xc6, 0x0f, 0xb5, 0xf7,
-	0xf2, 0x30, 0x69, 0xf6, 0x70, 0x66, 0xff, 0x1e, 0x0a, 0x89, 0x41, 0xf0, 0x53, 0xba, 0xbd, 0x1c,
-	0x64, 0x93, 0x83, 0xd8, 0xa7, 0x07, 0x37, 0x39, 0x88, 0x7d, 0x7a, 0x18, 0x56, 0x3d, 0x2c, 0xa1,
-	0x43, 0x86, 0x73, 0xe1, 0xbd, 0x5c, 0x8c, 0xa8, 0x2e, 0x96, 0xd1, 0x61, 0xd3, 0x71, 0xef, 0x5e,
-	0x3e, 0x26, 0xcc, 0x5c, 0xca, 0x73, 0xdc, 0xbd, 0x1c, 0x64, 0xfa, 0xc4, 0xb1, 0x4f, 0x2a, 0xf2,
-	0xfd, 0xe2, 0xd8, 0xa7, 0x8f, 0xa2, 0xf9, 0x0b, 0x51, 0x0e, 0x54, 0xf7, 0xf2, 0xe0, 0x24, 0x6c,
-	0x0a, 0x79, 0x54, 0xba, 0x97, 0x87, 0x51, 0x33, 0x97, 0xf2, 0x14, 0x74, 0x2f, 0x07, 0x63, 0xaa,
-	0x83, 0xf3, 0xe8, 0x88, 0xf1, 0x70, 0xd3, 0xe0, 0xe4, 0x55, 0xaa, 0x93, 0xb4, 0x0f, 0x73, 0x15,
-	0xe8, 0xbb, 0x91, 0x97, 0x74, 0xc4, 0x69, 0x40, 0xbf, 0x51, 0x45, 0x1f, 0xe0, 0x01, 0xaf, 0xb2,
-	0x80, 0xd7, 0xa2, 0x29, 0xf3, 0x51, 0xa7, 0x01, 0xfe, 0x47, 0x74, 0xf8, 0x94, 0x4f, 0x7c, 0x15,
-	0xf0, 0x2e, 0x9a, 0x4e, 0x38, 0xf1, 0x34, 0xa0, 0x5f, 0xa7, 0x53, 0x6f, 0xfb, 0x10, 0x58, 0x8b,
-	0x79, 0x26, 0xf9, 0xb4, 0xd3, 0x80, 0xfc, 0x4a, 0x3d, 0xee, 0x14, 0x8f, 0x85, 0x63, 0xbb, 0x55,
-	0x3f, 0xf3, 0x54, 0x31, 0x73, 0x7b, 0xf5, 0x12, 0x48, 0x98, 0xc8, 0x71, 0xa6, 0xea, 0x61, 0x72,
-	0x7f, 0x1e, 0xce, 0x24, 0x7b, 0x28, 0xec, 0xaf, 0x9f, 0xe9, 0x67, 0x90, 0xaa, 0x83, 0xec, 0xfe,
-	0x83, 0x48, 0xf0, 0xe0, 0xee, 0x3f, 0x88, 0x04, 0x0f, 0xc3, 0x7b, 0x79, 0x80, 0x12, 0x1a, 0x3d,
-	0x11, 0x54, 0x5d, 0x8c, 0xec, 0x33, 0x0c, 0xfd, 0xa8, 0x4f, 0xf5, 0x30, 0xba, 0x97, 0x87, 0x2b,
-	0x11, 0x92, 0x7f, 0x8f, 0x5b, 0xeb, 0x92, 0x2a, 0x9a, 0x3a, 0x7d, 0x57, 0xa7, 0xde, 0xda, 0xdd,
-	0x6a, 0xb7, 0x06, 0xd3, 0x58, 0xaa, 0xa7, 0x81, 0xb4, 0xd2, 0xb1, 0x59, 0x34, 0x2a, 0xc5, 0xf6,
-	0x28, 0x02, 0x5d, 0x5c, 0x1c, 0xa2, 0xff, 0xbb, 0x1c, 0x2c, 0xfd, 0xe8, 0x4d, 0x45, 0xc7, 0x3d,
-	0x88, 0x46, 0xae, 0xad, 0x2e, 0x05, 0xaf, 0xbe, 0xe1, 0x74, 0x31, 0x73, 0xd9, 0xe8, 0x81, 0x7b,
-	0x6a, 0xc5, 0x0b, 0x17, 0x2e, 0x5c, 0xc8, 0xf8, 0x67, 0xd1, 0x74, 0x5d, 0x2c, 0x62, 0x45, 0xbb,
-	0xb3, 0xe8, 0x5a, 0x88, 0x4e, 0xef, 0x9e, 0x1a, 0x63, 0xf9, 0x48, 0x3d, 0x4a, 0x0d, 0xfd, 0x8a,
-	0xfc, 0x3a, 0xf2, 0x0c, 0x20, 0xf0, 0x07, 0xb9, 0x0d, 0xca, 0x1b, 0x6a, 0x2c, 0x5b, 0xa7, 0x62,
-	0x28, 0x2c, 0xb7, 0xfd, 0x4d, 0x74, 0xd4, 0x00, 0xb3, 0x6b, 0x8f, 0xf3, 0xc6, 0x1a, 0xcb, 0xe9,
-	0xe9, 0x18, 0x0e, 0x94, 0x80, 0x04, 0xa0, 0xae, 0x3d, 0xd0, 0x9b, 0x6a, 0x2c, 0xf5, 0xe3, 0x40,
-	0x50, 0x29, 0x92, 0x89, 0x23, 0xd8, 0x0a, 0xe7, 0xcd, 0x35, 0x56, 0x21, 0x8c, 0xc4, 0x11, 0xdc,
-	0x87, 0x38, 0x4b, 0x9c, 0xb7, 0xd4, 0x58, 0x1d, 0x31, 0x13, 0x97, 0x08, 0xd4, 0xb5, 0x07, 0x7a,
-	0x6b, 0x8d, 0x95, 0x1b, 0x33, 0x71, 0x04, 0xfb, 0x5b, 0x68, 0xc6, 0x00, 0x24, 0x4e, 0x2e, 0x6c,
-	0x90, 0xde, 0x56, 0x63, 0x55, 0xc9, 0x8b, 0x21, 0xf1, 0x2a, 0xe6, 0xdf, 0x86, 0x2e, 0x32, 0x91,
-	0x97, 0x06, 0xeb, 0xed, 0x35, 0x26, 0x5a, 0x8f, 0xc6, 0xe9, 0xe3, 0xde, 0x12, 0x36, 0xc4, 0x06,
-	0xbc, 0xda, 0x67, 0x81, 0xf4, 0x8e, 0x1a, 0x53, 0xb7, 0xf1, 0x0d, 0xc1, 0xb4, 0x71, 0x3f, 0xfa,
-	0x2c, 0xbf, 0xa8, 0x77, 0xd6, 0x98, 0x06, 0x4e, 0xa0, 0x8f, 0xe0, 0xbe, 0xf4, 0x59, 0x62, 0xbd,
-	0xab, 0xc6, 0xb4, 0x72, 0x12, 0x7d, 0x89, 0xfb, 0x0f, 0x0e, 0x7b, 0xac, 0xa0, 0x7a, 0x35, 0x26,
-	0xaa, 0xe3, 0xfb, 0x0f, 0x34, 0x79, 0x52, 0x46, 0xc1, 0xe1, 0x8e, 0x0d, 0xd0, 0xbb, 0x6b, 0xac,
-	0x0b, 0x18, 0x32, 0x0a, 0x4e, 0x7c, 0xcd, 0x1b, 0x82, 0x9d, 0x15, 0x59, 0xe1, 0xbc, 0xa7, 0xc6,
-	0x24, 0x7a, 0x7c, 0x43, 0x30, 0x81, 0xef, 0x3f, 0xe0, 0xa0, 0x4b, 0x0c, 0x38, 0xf2, 0x08, 0xc9,
-	0x0a, 0xec, 0xbd, 0xb5, 0x01, 0xa4, 0xfc, 0x4c, 0x6c, 0x89, 0xe1, 0x67, 0xfe, 0xe3, 0x0e, 0x2a,
-	0x25, 0x2e, 0x93, 0x3f, 0x1e, 0xb0, 0x5a, 0xe9, 0xbd, 0xb5, 0xc1, 0x64, 0xff, 0x25, 0xe6, 0xc5,
-	0xf2, 0x8f, 0xfd, 0x87, 0x1d, 0xf4, 0x7d, 0x86, 0xf5, 0x2a, 0xcf, 0x65, 0xac, 0x56, 0xfb, 0xbe,
-	0xda, 0x20, 0x7f, 0x25, 0x5c, 0x14, 0x5b, 0xab, 0xfc, 0xd0, 0xbf, 0xcf, 0x41, 0x97, 0x1a, 0x7b,
-	0x84, 0x3c, 0xc6, 0xb3, 0x5a, 0xea, 0x7d, 0xb5, 0x54, 0x7f, 0x52, 0x5c, 0x6c, 0xe8, 0x2c, 0xe1,
-	0xa7, 0xfe, 0xa3, 0x0e, 0x3a, 0xd6, 0x67, 0x91, 0x69, 0x36, 0xc0, 0xfd, 0xb5, 0xb4, 0x7f, 0x80,
-	0x5c, 0x9a, 0xb4, 0x54, 0xf1, 0xe5, 0x3f, 0xe4, 0x20, 0x99, 0x6e, 0xfa, 0x4d, 0x6b, 0x9b, 0x15,
-	0x3e, 0x50, 0x63, 0x8f, 0xa3, 0x6c, 0xde, 0xb4, 0x31, 0x0b, 0xd8, 0x20, 0x61, 0x35, 0x7e, 0x43,
-	0xad, 0x31, 0xfa, 0x03, 0x23, 0xbb, 0x64, 0xea, 0xa9, 0xd7, 0xc5, 0x25, 0x9a, 0xf6, 0x7c, 0xc9,
-	0xdf, 0x56, 0x4b, 0x67, 0xe4, 0x19, 0x93, 0x5d, 0x36, 0xf4, 0xf4, 0xeb, 0xe6, 0xd3, 0x71, 0x40,
-	0xd0, 0x8d, 0xb7, 0xab, 0xdd, 0x2e, 0xfa, 0x58, 0xca, 0x6e, 0x57, 0xf7, 0xb4, 0xeb, 0xea, 0x5e,
-	0x1c, 0x91, 0x2b, 0xc8, 0x6d, 0x33, 0x64, 0x0a, 0x09, 0x79, 0x7f, 0x4f, 0xbd, 0xee, 0x6e, 0x40,
-	0xe4, 0x52, 0xb2, 0x93, 0x48, 0xab, 0x65, 0x97, 0x7d, 0xa0, 0x17, 0xbf, 0x2e, 0x6f, 0xa6, 0x96,
-	0xe0, 0x7e, 0xd4, 0x5a, 0xc2, 0x3e, 0xd8, 0xd3, 0xae, 0xdb, 0x27, 0x50, 0x4b, 0x70, 0x3f, 0x6a,
-	0x2d, 0x21, 0x1f, 0xea, 0xa9, 0xd7, 0xf5, 0x13, 0xa8, 0x25, 0xd8, 0xef, 0xa8, 0x12, 0x26, 0xf6,
-	0x54, 0xce, 0x0a, 0xf2, 0xe1, 0x9e, 0x7e, 0xdd, 0xff, 0x68, 0x1c, 0x54, 0xe8, 0xce, 0x3b, 0xd1,
-	0xc5, 0x46, 0x6a, 0xd3, 0xc0, 0x3e, 0xd2, 0x8b, 0xfc, 0x5c, 0xc0, 0x8c, 0x81, 0x5e, 0xa1, 0x41,
-	0x6f, 0x37, 0xef, 0x24, 0x7b, 0x11, 0xfa, 0xfe, 0x5e, 0xe4, 0xe7, 0x06, 0x0c, 0xdb, 0x08, 0xf4,
-	0x68, 0x3f, 0x86, 0x2d, 0xbf, 0xd4, 0x0f, 0xf4, 0xf4, 0x9f, 0x2b, 0x48, 0x62, 0x98, 0xe0, 0xfe,
-	0x0c, 0x5b, 0xc2, 0x3e, 0xda, 0x8b, 0xfc, 0xdc, 0x41, 0x22, 0xc3, 0x04, 0xfb, 0xe7, 0xcd, 0x5b,
-	0x38, 0x85, 0x4e, 0x7d, 0xac, 0x67, 0xfc, 0xb9, 0x04, 0xc3, 0x5e, 0xe6, 0xc2, 0xf5, 0x75, 0x09,
-	0x09, 0x6b, 0xaf, 0x5c, 0x1f, 0xef, 0x25, 0xfd, 0xdc, 0x82, 0x29, 0x77, 0x41, 0xcd, 0xbe, 0xde,
-	0x31, 0xef, 0x2d, 0x7b, 0x3d, 0xfb, 0x44, 0x6f, 0xaf, 0xdf, 0x6b, 0x30, 0x6c, 0x36, 0xd0, 0xba,
-	0x4f, 0x68, 0xa2, 0xcc, 0xf4, 0xbc, 0xd4, 0x6a, 0x25, 0x4f, 0xf6, 0xbe, 0x07, 0x3f, 0xf8, 0x70,
-	0x51, 0x7c, 0xb1, 0x52, 0xf5, 0x3e, 0xa6, 0xa9, 0x5e, 0xf3, 0x33, 0x56, 0xab, 0x25, 0x3f, 0xd5,
-	0x1b, 0xe8, 0x17, 0x23, 0x2e, 0x31, 0xd5, 0x66, 0xa9, 0xd2, 0xd6, 0xd5, 0x23, 0x27, 0xed, 0xb2,
-	0xa0, 0xdd, 0x22, 0xbf, 0xeb, 0xb0, 0x9b, 0x85, 0xf2, 0xcc, 0x29, 0x50, 0xae, 0x18, 0xfa, 0x1b,
-	0xaa, 0x68, 0xd1, 0x2f, 0x1b, 0x5a, 0xc1, 0x7c, 0x90, 0xc1, 0xa8, 0x87, 0x4e, 0x81, 0x7a, 0x45,
-	0xd1, 0x3f, 0xa7, 0xee, 0xd8, 0xc8, 0x65, 0x45, 0x2b, 0xa0, 0x0f, 0x31, 0x20, 0xf5, 0xd4, 0x29,
-	0xd0, 0xae, 0x38, 0x26, 0x20, 0xa5, 0x90, 0x0c, 0x1f, 0x66, 0x48, 0x05, 0x03, 0x12, 0xd7, 0x0a,
-	0x89, 0xdc, 0x59, 0x16, 0xbd, 0x8f, 0x30, 0xa0, 0xac, 0x99, 0x3b, 0x82, 0xfb, 0x70, 0x67, 0x09,
-	0xf4, 0x51, 0x06, 0xe4, 0x26, 0x70, 0x97, 0x88, 0x94, 0x42, 0x13, 0x7c, 0x8c, 0x21, 0x0d, 0x27,
-	0x70, 0x47, 0xb0, 0x7f, 0xab, 0x5a, 0x40, 0xa3, 0x97, 0x3d, 0xad, 0xa0, 0x3e, 0xce, 0xa0, 0xd4,
-	0xa3, 0xa7, 0x40, 0xbf, 0x22, 0xea, 0x37, 0xd4, 0xb6, 0x18, 0xbb, 0x2c, 0x6a, 0x05, 0xf6, 0x09,
-	0x06, 0xa6, 0x9e, 0x3d, 0x05, 0x91, 0x2b, 0xa6, 0x09, 0xbb, 0xc2, 0xbe, 0xed, 0x7f, 0x92, 0x41,
-	0x65, 0x0c, 0xbb, 0x02, 0x9a, 0x7d, 0x1f, 0x06, 0x2d, 0xbf, 0xac, 0x4f, 0x31, 0xa4, 0x7c, 0x12,
-	0x83, 0x04, 0xf7, 0x65, 0xd0, 0x12, 0xec, 0xd3, 0x0c, 0xac, 0x98, 0xc8, 0x60, 0xe2, 0x2e, 0x4c,
-	0xd1, 0xd6, 0x9f, 0x66, 0x58, 0x8e, 0x61, 0x17, 0xf2, 0x36, 0x9e, 0x90, 0x59, 0xf6, 0x5d, 0xfc,
-	0x19, 0x86, 0x34, 0x6a, 0xca, 0x2c, 0x68, 0xd9, 0xe6, 0x5d, 0x61, 0xdf, 0xb0, 0x9f, 0x65, 0x40,
-	0x63, 0x86, 0x5d, 0x01, 0x5d, 0xf9, 0x41, 0xed, 0x04, 0xca, 0x70, 0xdb, 0xd7, 0x0a, 0xed, 0x39,
-	0x86, 0x36, 0xf8, 0x11, 0x54, 0x10, 0xbd, 0x23, 0x4c, 0xd5, 0x43, 0x29, 0x71, 0x9d, 0x69, 0x4e,
-	0x20, 0x9e, 0x67, 0x4b, 0xfd, 0x9e, 0x9c, 0x41, 0x05, 0x86, 0x4b, 0xc6, 0xfe, 0x23, 0x9a, 0xdc,
-	0x31, 0xdd, 0x37, 0xb6, 0x5a, 0xee, 0x67, 0xf8, 0x72, 0x07, 0x3e, 0x84, 0x0a, 0x62, 0xb7, 0x94,
-	0xfd, 0xfb, 0xb5, 0x43, 0x28, 0xe3, 0x85, 0x65, 0xab, 0xb5, 0x7e, 0x96, 0xef, 0x82, 0xf4, 0xa7,
-	0x50, 0x41, 0xfc, 0x9a, 0x33, 0x95, 0x63, 0xc7, 0xfa, 0xac, 0x32, 0xcd, 0x1e, 0xf8, 0x1c, 0x27,
-	0x75, 0xa0, 0x63, 0xa8, 0xc0, 0x78, 0x4f, 0xda, 0x7f, 0x58, 0x3d, 0x86, 0xd2, 0x6f, 0x38, 0xdb,
-	0x2c, 0xf1, 0xf3, 0x6c, 0x89, 0x29, 0xcf, 0xa1, 0xf4, 0x7b, 0xd6, 0x09, 0xcb, 0x59, 0x2e, 0x88,
-	0x57, 0xf5, 0xbb, 0xad, 0xad, 0x76, 0x6b, 0x79, 0x3a, 0xfe, 0x8e, 0x24, 0xfb, 0xe0, 0xb2, 0x79,
-	0x74, 0x50, 0x7d, 0x4f, 0xdc, 0xf4, 0x40, 0x14, 0xb9, 0x63, 0xf2, 0x81, 0xe8, 0x0b, 0xce, 0xf2,
-	0x6b, 0x7e, 0xbc, 0x16, 0x5b, 0xf6, 0x09, 0xb6, 0xec, 0xb5, 0xee, 0xc6, 0x89, 0xad, 0x56, 0xa7,
-	0xbe, 0xd3, 0x5a, 0x6d, 0xb0, 0xdf, 0xb9, 0x65, 0xa3, 0xbb, 0x27, 0x1a, 0xf5, 0xcd, 0xd5, 0xb3,
-	0xe7, 0x4f, 0x24, 0xfd, 0x24, 0xee, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x50, 0x42, 0x96,
-	0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180430_b4deda09/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/test.pb.go
deleted file mode 100644
index 47e825a1922..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/test.pb.go
+++ /dev/null
@@ -1,3904 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto2_20180814_aa810b61/test.proto
-
-package proto2_20180814_aa810b61 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61"
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{0}
-}
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (dst *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(dst, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180814.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20180814.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion          isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	XXX_NoUnkeyedLiteral         struct{}                      `json:"-"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-	XXX_sizecache                int32  `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1}
-}
-
-var extRange_Message = []proto.ExtensionRange{
-	{Start: 10000, End: 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (dst *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(dst, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum,oneof"`
-}
-
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum,oneof"`
-}
-
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofFloat) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofDouble) isMessage_OneofUnion() {}
-
-func (*Message_OneofString) isMessage_OneofUnion() {}
-
-func (*Message_OneofBytes) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofNamedGroup) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-
-func (*Message_Oneofgroup) isMessage_OneofUnion() {}
-
-func (*Message_OneofString1) isMessage_OneofUnion() {}
-
-func (*Message_OneofString2) isMessage_OneofUnion() {}
-
-func (*Message_OneofString3) isMessage_OneofUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-type isMessage_OneofDefaultedUnion interface {
-	isMessage_OneofDefaultedUnion()
-}
-
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum,oneof,def=0"`
-}
-
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(700<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(701<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(702<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(703<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(704<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(705<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(706<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(707<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(708<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(709<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(710<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(711<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(712<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(713<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(714<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(715<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(716<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofNamedGroup:
-		b.EncodeVarint(717<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNamedGroup); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(718<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(719<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_Oneofgroup:
-		b.EncodeVarint(720<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Oneofgroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(720<<3 | proto.WireEndGroup)
-	case *Message_OneofString1:
-		b.EncodeVarint(721<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(722<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(723<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		t := uint64(0)
-		if x.OneofDefaultedBool {
-			t = 1
-		}
-		b.EncodeVarint(800<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofDefaultedInt32:
-		b.EncodeVarint(801<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		b.EncodeVarint(802<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofDefaultedSint32))
-	case *Message_OneofDefaultedUint32:
-		b.EncodeVarint(803<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		b.EncodeVarint(804<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		b.EncodeVarint(805<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofDefaultedSint64))
-	case *Message_OneofDefaultedUint64:
-		b.EncodeVarint(806<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		b.EncodeVarint(807<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedFixed32))
-	case *Message_OneofDefaultedSfixed32:
-		b.EncodeVarint(808<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofDefaultedSfixed32))
-	case *Message_OneofDefaultedFloat:
-		b.EncodeVarint(809<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofDefaultedFloat)))
-	case *Message_OneofDefaultedFixed64:
-		b.EncodeVarint(810<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedFixed64))
-	case *Message_OneofDefaultedSfixed64:
-		b.EncodeVarint(811<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofDefaultedSfixed64))
-	case *Message_OneofDefaultedDouble:
-		b.EncodeVarint(812<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDefaultedDouble))
-	case *Message_OneofDefaultedString:
-		b.EncodeVarint(813<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		b.EncodeVarint(814<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		b.EncodeVarint(815<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		b.EncodeVarint(816<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofDefaultedUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 700: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 701: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 702: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 703: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 704: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 705: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 706: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 707: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 708: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 709: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 710: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 711: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 712: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 713: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 714: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 715: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 716: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 717: // oneof_union.oneof_named_group
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_NamedGroup)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofNamedGroup{msg}
-		return true, err
-	case 718: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 719: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 720: // oneof_union.oneofgroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_OneofGroup)
-		err := b.DecodeGroup(msg)
-		m.OneofUnion = &Message_Oneofgroup{msg}
-		return true, err
-	case 721: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 722: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 723: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	case 800: // oneof_defaulted_union.oneof_defaulted_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBool{x != 0}
-		return true, err
-	case 801: // oneof_defaulted_union.oneof_defaulted_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt32{int32(x)}
-		return true, err
-	case 802: // oneof_defaulted_union.oneof_defaulted_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint32{int32(x)}
-		return true, err
-	case 803: // oneof_defaulted_union.oneof_defaulted_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint32{uint32(x)}
-		return true, err
-	case 804: // oneof_defaulted_union.oneof_defaulted_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedInt64{int64(x)}
-		return true, err
-	case 805: // oneof_defaulted_union.oneof_defaulted_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSint64{int64(x)}
-		return true, err
-	case 806: // oneof_defaulted_union.oneof_defaulted_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedUint64{x}
-		return true, err
-	case 807: // oneof_defaulted_union.oneof_defaulted_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed32{uint32(x)}
-		return true, err
-	case 808: // oneof_defaulted_union.oneof_defaulted_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed32{int32(x)}
-		return true, err
-	case 809: // oneof_defaulted_union.oneof_defaulted_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 810: // oneof_defaulted_union.oneof_defaulted_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedFixed64{x}
-		return true, err
-	case 811: // oneof_defaulted_union.oneof_defaulted_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSfixed64{int64(x)}
-		return true, err
-	case 812: // oneof_defaulted_union.oneof_defaulted_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedDouble{math.Float64frombits(x)}
-		return true, err
-	case 813: // oneof_defaulted_union.oneof_defaulted_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedString{x}
-		return true, err
-	case 814: // oneof_defaulted_union.oneof_defaulted_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofDefaultedUnion = &Message_OneofDefaultedBytes{x}
-		return true, err
-	case 815: // oneof_defaulted_union.oneof_defaulted_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 816: // oneof_defaulted_union.oneof_defaulted_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofDefaultedUnion = &Message_OneofDefaultedSiblingEnum{SiblingEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofNamedGroup:
-		s := proto.Size(x.OneofNamedGroup)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_Oneofgroup:
-		n += 2 // tag and wire
-		n += proto.Size(x.Oneofgroup)
-		n += 2 // tag and wire
-	case *Message_OneofString1:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// oneof_defaulted_union
-	switch x := m.OneofDefaultedUnion.(type) {
-	case *Message_OneofDefaultedBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofDefaultedInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt32))
-	case *Message_OneofDefaultedSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofDefaultedSint32) << 1) ^ uint32((int32(x.OneofDefaultedSint32) >> 31))))
-	case *Message_OneofDefaultedUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint32))
-	case *Message_OneofDefaultedInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedInt64))
-	case *Message_OneofDefaultedSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofDefaultedSint64<<1) ^ uint64((int64(x.OneofDefaultedSint64) >> 63))))
-	case *Message_OneofDefaultedUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedUint64))
-	case *Message_OneofDefaultedFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofDefaultedFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDefaultedString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedString)))
-		n += len(x.OneofDefaultedString)
-	case *Message_OneofDefaultedBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofDefaultedBytes)))
-		n += len(x.OneofDefaultedBytes)
-	case *Message_OneofDefaultedChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedChildEnum))
-	case *Message_OneofDefaultedSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofDefaultedSiblingEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool,json=extensionOptionalBool",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32,json=extensionOptionalInt32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32,json=extensionOptionalSint32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32,json=extensionOptionalUint32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64,json=extensionOptionalInt64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64,json=extensionOptionalSint64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64,json=extensionOptionalUint64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32,json=extensionOptionalFixed32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32,json=extensionOptionalSfixed32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float,json=extensionOptionalFloat",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64,json=extensionOptionalFixed64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64,json=extensionOptionalSfixed64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double,json=extensionOptionalDouble",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string,json=extensionOptionalString",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes,json=extensionOptionalBytes",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,json=extensionOptionalChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message,json=extensionOptionalChildMessage",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group,json=extensionOptionalNamedGroup",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,json=extensionOptionalSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message,json=extensionOptionalSiblingMessage",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20180814.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup,json=extensionoptionalgroup",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,json=extensionDefaultedBool,def=1",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,json=extensionDefaultedInt32,def=-12345",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,json=extensionDefaultedSint32,def=-3200",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,json=extensionDefaultedUint32,def=3200",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,json=extensionDefaultedInt64,def=-123456789",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,json=extensionDefaultedSint64,def=-6400",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,json=extensionDefaultedUint64,def=6400",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,json=extensionDefaultedFixed32,def=320000",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,json=extensionDefaultedSfixed32,def=-320000",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,json=extensionDefaultedFloat,def=3.14159",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,json=extensionDefaultedFixed64,def=640000",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,json=extensionDefaultedSfixed64,def=-640000",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,json=extensionDefaultedDouble,def=3.14159265359",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,json=extensionDefaultedString,def=hello, \"world!\"\n",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,json=extensionDefaultedBytes,def=dead\\336\\255\\276\\357beef",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,json=extensionDefaultedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum,def=0",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,json=extensionDefaultedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum,def=0",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool,json=extensionRepeatedBool",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32,json=extensionRepeatedInt32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32,json=extensionRepeatedSint32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32,json=extensionRepeatedUint32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64,json=extensionRepeatedInt64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64,json=extensionRepeatedSint64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64,json=extensionRepeatedUint64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32,json=extensionRepeatedFixed32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32,json=extensionRepeatedSfixed32",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float,json=extensionRepeatedFloat",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64,json=extensionRepeatedFixed64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64,json=extensionRepeatedSfixed64",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double,json=extensionRepeatedDouble",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string,json=extensionRepeatedString",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes,json=extensionRepeatedBytes",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,json=extensionRepeatedChildEnum,enum=google.golang.org.proto2_20180814.Message_ChildEnum",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message,json=extensionRepeatedChildMessage",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group,json=extensionRepeatedNamedGroup",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,json=extensionRepeatedSiblingEnum,enum=google.golang.org.proto2_20180814.SiblingEnum",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20180814.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message,json=extensionRepeatedSiblingMessage",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20180814.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup,json=extensionrepeatedgroup",
-	Filename:      "proto2_20180814_aa810b61/test.proto",
-}
-
-type Message_ChildMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 0}
-}
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (dst *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(dst, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()         { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()    {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 1}
-}
-func (m *Message_NamedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_NamedGroup.Unmarshal(m, b)
-}
-func (m *Message_NamedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_NamedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_NamedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_NamedGroup.Merge(dst, src)
-}
-func (m *Message_NamedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_NamedGroup.Size(m)
-}
-func (m *Message_NamedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_NamedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_NamedGroup proto.InternalMessageInfo
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()         { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()    {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 2}
-}
-func (m *Message_OptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_OptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OptionalGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_OptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OptionalGroup.Merge(dst, src)
-}
-func (m *Message_OptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OptionalGroup.Size(m)
-}
-func (m *Message_OptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OptionalGroup proto.InternalMessageInfo
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()         { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()    {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 3}
-}
-func (m *Message_RequiredGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RequiredGroup.Unmarshal(m, b)
-}
-func (m *Message_RequiredGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RequiredGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_RequiredGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RequiredGroup.Merge(dst, src)
-}
-func (m *Message_RequiredGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RequiredGroup.Size(m)
-}
-func (m *Message_RequiredGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RequiredGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RequiredGroup proto.InternalMessageInfo
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()         { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()    {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 4}
-}
-func (m *Message_RepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_RepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RepeatedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_RepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RepeatedGroup.Merge(dst, src)
-}
-func (m *Message_RepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RepeatedGroup.Size(m)
-}
-func (m *Message_RepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()         { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()    {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 33}
-}
-func (m *Message_OneofGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OneofGroup.Unmarshal(m, b)
-}
-func (m *Message_OneofGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OneofGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_OneofGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OneofGroup.Merge(dst, src)
-}
-func (m *Message_OneofGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OneofGroup.Size(m)
-}
-func (m *Message_OneofGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OneofGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OneofGroup proto.InternalMessageInfo
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 34}
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_ExtensionOptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.Merge(dst, src)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Size(m)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionOptionalGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_98b5676fa5dea40d, []int{1, 35}
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Marshal(b, m, deterministic)
-}
-func (dst *Message_ExtensionRepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.Merge(dst, src)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Size(m)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionRepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20180814.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20180814.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto2_20180814.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto2_20180814.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto2_20180814.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto2_20180814.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]*Message_NamedGroup)(nil), "google.golang.org.proto2_20180814.Message.MapBoolNamedGroupEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto2_20180814.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20180814.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20180814.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20180814.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20180814.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20180814.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20180814.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20180814.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto2_20180814.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20180814.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto2_20180814.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20180814.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20180814.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20180814.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20180814.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20180814.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20180814.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20180814.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20180814.Message.ExtensionRepeatedGroup")
-	proto.RegisterEnum("google.golang.org.proto2_20180814.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20180814.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-}
-
-func init() {
-	proto.RegisterFile("proto2_20180814_aa810b61/test.proto", fileDescriptor_test_98b5676fa5dea40d)
-}
-
-var fileDescriptor_test_98b5676fa5dea40d = []byte{
-	// 4469 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x69, 0x70, 0x23, 0xc7,
-	0x75, 0xe6, 0x00, 0x04, 0xb8, 0xec, 0x25, 0x48, 0x70, 0x76, 0x97, 0x9c, 0xa5, 0xa4, 0x08, 0x5e,
-	0x3b, 0x0e, 0xa2, 0x68, 0xb9, 0xe4, 0xb0, 0xb7, 0x77, 0x85, 0xe8, 0xf0, 0x52, 0x5a, 0x19, 0x72,
-	0x2c, 0xc8, 0x35, 0xaa, 0x4d, 0xa5, 0x52, 0xaa, 0x30, 0xe0, 0x12, 0xe4, 0x52, 0xc2, 0x41, 0x91,
-	0x80, 0xa4, 0x8d, 0x9d, 0xd2, 0xc6, 0x39, 0x7f, 0xca, 0xf7, 0x05, 0xdb, 0xb2, 0x6e, 0x5b, 0xa7,
-	0xef, 0x4b, 0x97, 0x8f, 0x24, 0xf2, 0x7d, 0xe5, 0x70, 0x2e, 0xe7, 0xbe, 0x9c, 0xfb, 0xbe, 0x8f,
-	0xea, 0x7e, 0xdd, 0xd3, 0xdd, 0x33, 0x3d, 0x20, 0x7b, 0xe0, 0xd2, 0x0f, 0x55, 0x69, 0x1b, 0xaf,
-	0xdf, 0xd7, 0xef, 0x43, 0xbf, 0xf7, 0x3e, 0xf6, 0x4c, 0x03, 0xbd, 0x74, 0x6b, 0xbb, 0xd3, 0xed,
-	0xf8, 0x2b, 0xfe, 0xc2, 0xe2, 0xc9, 0x85, 0x93, 0x8b, 0x78, 0xa5, 0x5e, 0x3f, 0xb9, 0xb8, 0xb0,
-	0x4a, 0x16, 0x8f, 0x75, 0x1b, 0x3b, 0xdd, 0x79, 0xf6, 0xa9, 0xfb, 0x92, 0x8d, 0x4e, 0x67, 0xa3,
-	0xd9, 0x98, 0xdf, 0xe8, 0x34, 0xeb, 0xed, 0x8d, 0xf9, 0xce, 0xf6, 0xc6, 0x7c, 0x64, 0xda, 0x91,
-	0xd7, 0xa1, 0xc9, 0x9b, 0x37, 0x57, 0x9b, 0x9b, 0xed, 0x8d, 0x1b, 0x1b, 0x3b, 0x3b, 0xf5, 0x8d,
-	0x86, 0x3b, 0x89, 0x32, 0xeb, 0x8b, 0x9e, 0x53, 0x72, 0xca, 0xe3, 0x41, 0x66, 0x7d, 0x91, 0xfd,
-	0xdb, 0xf7, 0x32, 0xa5, 0x0c, 0xfb, 0xb7, 0xcf, 0xfe, 0xbd, 0xe4, 0x65, 0x4b, 0x59, 0xf6, 0xef,
-	0x25, 0xb7, 0x82, 0x32, 0xeb, 0xd8, 0x1b, 0x2d, 0x39, 0xe5, 0xfd, 0xfe, 0x65, 0xf3, 0xbb, 0x22,
-	0xce, 0x73, 0x9c, 0x20, 0xb3, 0x8e, 0x8f, 0x7c, 0xe7, 0x51, 0x07, 0x8d, 0x09, 0xe0, 0x33, 0x08,
-	0xb5, 0xeb, 0xad, 0xc6, 0xda, 0xc6, 0x76, 0xa7, 0xb7, 0xc5, 0x16, 0x80, 0xfc, 0xe3, 0x7b, 0x77,
-	0x38, 0x5f, 0xa3, 0x93, 0x5f, 0x49, 0x27, 0x07, 0x8a, 0x23, 0xf7, 0xa5, 0xa8, 0xd0, 0xd9, 0xea,
-	0x6e, 0x76, 0xda, 0xf5, 0xe6, 0xca, 0x6a, 0xa7, 0xd3, 0xf4, 0xd6, 0x4a, 0x4e, 0x79, 0x5f, 0x30,
-	0x21, 0x06, 0x97, 0x3b, 0x9d, 0xa6, 0xfb, 0xfd, 0x68, 0x32, 0x34, 0xda, 0x6c, 0x77, 0x97, 0x7c,
-	0xaf, 0x51, 0x72, 0xca, 0xb9, 0x20, 0x9c, 0x7a, 0x03, 0x1d, 0x74, 0x7f, 0x00, 0x4d, 0x85, 0x66,
-	0x3b, 0x60, 0xb7, 0x5e, 0x72, 0xca, 0xd3, 0x41, 0x38, 0xfb, 0xe6, 0xcd, 0x98, 0x61, 0x0f, 0x0c,
-	0x37, 0x4a, 0x4e, 0xb9, 0x20, 0x0d, 0xcf, 0x80, 0x61, 0x04, 0x98, 0x60, 0xef, 0x5c, 0xc9, 0x29,
-	0x67, 0x35, 0x60, 0x82, 0x63, 0xc0, 0x04, 0x7b, 0x9b, 0x25, 0xa7, 0xec, 0xea, 0xc0, 0x11, 0xc3,
-	0x1e, 0x18, 0xde, 0x5a, 0x72, 0xca, 0xa3, 0x3a, 0x30, 0xc1, 0xee, 0x0f, 0xa2, 0x62, 0x68, 0xb8,
-	0xbe, 0x79, 0x57, 0x63, 0x6d, 0xc9, 0xf7, 0x6e, 0x2b, 0x39, 0xe5, 0xb1, 0x20, 0x74, 0x70, 0x3d,
-	0x0c, 0xbb, 0x3f, 0x84, 0xa6, 0x25, 0xb8, 0xb0, 0x6d, 0x96, 0x9c, 0xf2, 0x54, 0x10, 0xfa, 0xb8,
-	0x99, 0x8f, 0x6b, 0x01, 0xad, 0x37, 0x3b, 0xf5, 0xae, 0xd7, 0x2a, 0x39, 0xe5, 0x8c, 0x0c, 0xe8,
-	0x7a, 0x3a, 0x18, 0x87, 0x27, 0xd8, 0x6b, 0x97, 0x9c, 0x72, 0x3e, 0x02, 0x4f, 0xb0, 0x01, 0x9e,
-	0x60, 0xaf, 0x53, 0x72, 0xca, 0xc5, 0x28, 0x7c, 0x24, 0xfe, 0xb5, 0x4e, 0x6f, 0xb5, 0xd9, 0xf0,
-	0xb6, 0x4a, 0x4e, 0xd9, 0x91, 0xf1, 0x5f, 0xc7, 0x46, 0x75, 0x46, 0xbb, 0xdb, 0x9b, 0xed, 0x0d,
-	0xef, 0x76, 0xb6, 0xe7, 0x25, 0xa3, 0x6c, 0x54, 0x0b, 0x68, 0xf5, 0x7c, 0xb7, 0xb1, 0xe3, 0x6d,
-	0x97, 0x9c, 0xf2, 0x84, 0x0c, 0x68, 0x99, 0x0e, 0xba, 0x6b, 0xe8, 0x40, 0x68, 0x76, 0xf6, 0xdc,
-	0x66, 0x73, 0x6d, 0xa5, 0xd1, 0xee, 0xb5, 0xbc, 0x9d, 0x92, 0x53, 0x9e, 0xf4, 0xb1, 0xc5, 0x36,
-	0xbe, 0x96, 0x4e, 0x3e, 0xdd, 0xee, 0xb5, 0x82, 0x30, 0xec, 0x70, 0xc8, 0x6d, 0xa1, 0x99, 0x08,
-	0x4a, 0x0b, 0xa6, 0x79, 0x5d, 0x96, 0x80, 0x27, 0x6c, 0x81, 0x44, 0x36, 0x1e, 0xd4, 0xb0, 0x44,
-	0x4a, 0x6e, 0xa0, 0x70, 0x7c, 0x85, 0xa5, 0xd4, 0x0a, 0x24, 0x67, 0x8f, 0x81, 0xa5, 0x4c, 0x4e,
-	0x57, 0xb8, 0x94, 0x63, 0xee, 0x2a, 0x3a, 0xa4, 0xec, 0x6f, 0x56, 0x8f, 0x80, 0xbf, 0x3b, 0x18,
-	0x7f, 0xf3, 0x7b, 0x40, 0xe2, 0x65, 0x8c, 0x31, 0x77, 0x40, 0x66, 0x45, 0x38, 0xe8, 0xde, 0x86,
-	0xbc, 0x18, 0x86, 0x60, 0xef, 0x4e, 0x16, 0xd0, 0xe2, 0xde, 0x61, 0x04, 0x6f, 0x33, 0x11, 0x24,
-	0xc1, 0xdc, 0x4f, 0xc8, 0xaa, 0x03, 0x94, 0xdd, 0xc5, 0xea, 0xd9, 0x49, 0x0b, 0xca, 0x6e, 0xe2,
-	0xf3, 0x81, 0x35, 0xdd, 0x9d, 0x7b, 0x39, 0x9a, 0x5c, 0x6b, 0xac, 0xd7, 0x7b, 0xcd, 0x6e, 0x63,
-	0x0d, 0xca, 0xda, 0x0b, 0xb4, 0x62, 0xee, 0xab, 0x8c, 0x76, 0xb7, 0x7b, 0x8d, 0xa0, 0x10, 0x7e,
-	0xc8, 0xca, 0xdb, 0x02, 0x9a, 0x92, 0xd6, 0x50, 0x8e, 0xbe, 0x40, 0xcd, 0x73, 0x95, 0xfc, 0xd1,
-	0x45, 0x7f, 0x09, 0x1f, 0x0f, 0xa4, 0x37, 0xa8, 0x74, 0x8b, 0xa8, 0x28, 0x67, 0xf0, 0x52, 0xf7,
-	0x45, 0x3a, 0x65, 0xba, 0x92, 0x3b, 0xba, 0xe4, 0x2f, 0x2c, 0x04, 0xd2, 0x23, 0xaf, 0x79, 0x0b,
-	0xea, 0x14, 0x5e, 0xf4, 0xbe, 0x44, 0xa7, 0x14, 0x2a, 0xa3, 0x91, 0x19, 0xbc, 0xf8, 0xe1, 0xc8,
-	0xb2, 0x08, 0xf6, 0xbe, 0x4c, 0x27, 0x64, 0x2b, 0x08, 0x96, 0x45, 0x4e, 0x9c, 0xbc, 0x42, 0x5f,
-	0x1a, 0xc1, 0xf1, 0xa5, 0x11, 0xec, 0x7d, 0x85, 0x4e, 0x73, 0x2b, 0xb9, 0xa3, 0x04, 0xc7, 0x96,
-	0x46, 0x70, 0x7c, 0x69, 0x04, 0x7b, 0x5f, 0xa5, 0x53, 0x46, 0x2b, 0xa3, 0x91, 0x19, 0xbc, 0x3c,
-	0x62, 0x34, 0x2d, 0x67, 0x88, 0x9a, 0xf7, 0x35, 0x3a, 0x65, 0xac, 0x92, 0xa7, 0xd1, 0x2c, 0x2c,
-	0x04, 0xd2, 0xa7, 0xa8, 0x94, 0x27, 0x90, 0xab, 0x2c, 0x4d, 0x4c, 0xfb, 0x3a, 0x9d, 0x36, 0x55,
-	0x19, 0x3b, 0xca, 0xe7, 0x49, 0xcf, 0x61, 0xd5, 0x5c, 0x54, 0x99, 0x80, 0xb2, 0xf9, 0x0d, 0x3a,
-	0x2b, 0x53, 0x19, 0x5b, 0x9a, 0x5f, 0xc4, 0x8b, 0xc7, 0x55, 0x1a, 0xa0, 0x82, 0xc6, 0x57, 0x48,
-	0xb0, 0xf7, 0x4d, 0x3a, 0x29, 0x5f, 0xc9, 0xd3, 0xa0, 0xe2, 0x2b, 0x24, 0xd8, 0xb4, 0x42, 0x82,
-	0xbd, 0x6f, 0xd1, 0x69, 0xc5, 0xca, 0xd8, 0x51, 0x3e, 0x2f, 0xba, 0x42, 0x82, 0xdd, 0x2b, 0x54,
-	0x0a, 0x79, 0x65, 0xfd, 0x35, 0x3a, 0xcd, 0xa9, 0x14, 0xf8, 0x12, 0x7d, 0x72, 0x7c, 0xe9, 0xf8,
-	0x15, 0x0a, 0x97, 0xbc, 0xd4, 0x5e, 0xa9, 0x7d, 0x61, 0x50, 0x6b, 0x7f, 0x9d, 0x09, 0x8c, 0x4a,
-	0xf1, 0x5c, 0xa3, 0xd9, 0xec, 0x5c, 0x5e, 0x3a, 0x72, 0x67, 0x67, 0xbb, 0xb9, 0xf6, 0x92, 0x23,
-	0x48, 0xfd, 0xee, 0xa0, 0xfe, 0x2e, 0xab, 0xd4, 0x40, 0x01, 0xfe, 0x0d, 0x3a, 0x79, 0xa2, 0xe2,
-	0xad, 0x35, 0xea, 0x6b, 0xb7, 0x2c, 0x2d, 0x91, 0x5b, 0xfc, 0xe3, 0xc7, 0x6f, 0xf1, 0x4f, 0x90,
-	0x5b, 0x96, 0x8e, 0x9f, 0x58, 0x6d, 0x34, 0xd6, 0x15, 0xae, 0xa0, 0x38, 0xb7, 0xd1, 0x41, 0xe9,
-	0x43, 0xa9, 0xce, 0xbf, 0xe9, 0xa4, 0x2f, 0xcf, 0x95, 0xdc, 0xa9, 0x57, 0xbf, 0xa6, 0x7a, 0x2a,
-	0x90, 0x7c, 0xca, 0x32, 0xdd, 0x44, 0x33, 0xea, 0x16, 0x55, 0xea, 0xd9, 0xb7, 0x9d, 0x34, 0x05,
-	0x4d, 0x60, 0x1d, 0x54, 0x36, 0xb6, 0x2c, 0x6c, 0x2f, 0x43, 0x85, 0xed, 0xc6, 0xed, 0xbd, 0xcd,
-	0x6d, 0x51, 0x0a, 0x1e, 0xa3, 0x6a, 0x6d, 0x5f, 0x30, 0x21, 0x46, 0x59, 0x0d, 0x78, 0x39, 0x9a,
-	0x0c, 0xad, 0x20, 0x39, 0x1f, 0xa7, 0x66, 0xb9, 0x20, 0x9c, 0x0c, 0x99, 0x5f, 0x46, 0x53, 0xa1,
-	0x1d, 0x4f, 0xfc, 0x27, 0xa8, 0xe1, 0x74, 0x10, 0xce, 0xe7, 0x09, 0xaf, 0x5a, 0xf2, 0x7c, 0x7f,
-	0x92, 0x5a, 0x16, 0xa4, 0x25, 0x4f, 0xf4, 0x08, 0x36, 0xc1, 0xde, 0x53, 0xd4, 0x30, 0xab, 0x61,
-	0x13, 0x1c, 0xc3, 0x26, 0xd8, 0xfb, 0x20, 0x35, 0x74, 0x75, 0xec, 0x88, 0x25, 0x4f, 0xe8, 0x0f,
-	0x51, 0xcb, 0x51, 0x1d, 0x9b, 0x60, 0xf7, 0x32, 0x54, 0x0c, 0x2d, 0x45, 0x46, 0x7e, 0x98, 0x9a,
-	0x8e, 0x05, 0xa1, 0x0b, 0x91, 0xbf, 0x97, 0xa3, 0x69, 0x89, 0x2f, 0x8c, 0x3f, 0x42, 0x8d, 0xa7,
-	0x82, 0xd0, 0x4b, 0x98, 0xb4, 0x6a, 0x54, 0x90, 0xb3, 0x1f, 0xa5, 0xa6, 0x19, 0x19, 0x15, 0x64,
-	0x6a, 0x6c, 0x05, 0x04, 0x7b, 0x1f, 0xa3, 0x96, 0xf9, 0xc8, 0x0a, 0x08, 0x36, 0xac, 0x80, 0x60,
-	0xef, 0xe3, 0xd4, 0xb8, 0x18, 0x5d, 0x41, 0x84, 0x05, 0x9e, 0x93, 0x9f, 0xa0, 0xb6, 0x8e, 0x64,
-	0x81, 0xe7, 0xa0, 0xc6, 0x2c, 0xa4, 0xe0, 0x27, 0x41, 0xd3, 0x4b, 0x66, 0x21, 0xdf, 0xd4, 0xa8,
-	0x20, 0xdd, 0x3e, 0x45, 0x0d, 0x27, 0x64, 0x54, 0x90, 0x53, 0x0d, 0x74, 0x20, 0xb4, 0x53, 0x52,
-	0xea, 0xd3, 0xd4, 0x38, 0xb5, 0xe2, 0x11, 0x1e, 0x65, 0x2a, 0xb5, 0xd1, 0x4c, 0x04, 0x46, 0xf4,
-	0xec, 0xa7, 0x29, 0xd2, 0x30, 0x92, 0x47, 0x03, 0x13, 0x8d, 0xfb, 0x1c, 0x0a, 0xc7, 0x35, 0xc9,
-	0xf3, 0x0c, 0xa0, 0xa5, 0xd5, 0x3c, 0xc2, 0xa7, 0xa2, 0x79, 0xce, 0xa2, 0x43, 0xca, 0x66, 0x57,
-	0x6a, 0xc4, 0xb3, 0x40, 0xa1, 0xb5, 0xe8, 0x91, 0x29, 0x22, 0x6b, 0x43, 0x13, 0x79, 0x31, 0x10,
-	0x41, 0xe0, 0x73, 0x10, 0x52, 0x1a, 0xd5, 0x13, 0x81, 0x12, 0xe4, 0xad, 0xc8, 0x4a, 0x04, 0xac,
-	0x3d, 0x4f, 0x21, 0xec, 0x64, 0x4f, 0xc0, 0x1d, 0x70, 0xd9, 0xa3, 0xf9, 0x73, 0xaf, 0x42, 0xb3,
-	0x72, 0xc3, 0xeb, 0xfa, 0xe7, 0x9e, 0x2c, 0x2d, 0x7a, 0x5c, 0xff, 0x84, 0xcc, 0x5e, 0xa7, 0xe9,
-	0xa0, 0x53, 0x0a, 0x1b, 0x51, 0x41, 0xf4, 0x06, 0x3a, 0x5f, 0x0a, 0xa2, 0x99, 0x98, 0x07, 0x28,
-	0x8f, 0xcb, 0xe8, 0xb0, 0xc1, 0x05, 0x2f, 0x94, 0x6f, 0xa4, 0x3e, 0x42, 0x85, 0x34, 0x1b, 0x73,
-	0xc1, 0x0b, 0xe7, 0x29, 0xa3, 0x0f, 0x5e, 0x42, 0xdf, 0x44, 0x7d, 0x08, 0xc9, 0x14, 0x77, 0xc1,
-	0x2b, 0xea, 0xe9, 0xa4, 0x48, 0x08, 0xf6, 0xde, 0x4c, 0x3d, 0xe8, 0x1a, 0xca, 0x18, 0x0d, 0xc1,
-	0x03, 0xa2, 0x21, 0xd8, 0x7b, 0x0b, 0xf5, 0x13, 0x8a, 0x2a, 0x73, 0x34, 0x04, 0x0f, 0x88, 0x86,
-	0x60, 0xef, 0xad, 0xd4, 0x87, 0x50, 0x59, 0xe6, 0x68, 0x08, 0x76, 0x4f, 0xa3, 0x39, 0x83, 0x0b,
-	0x51, 0x80, 0xdf, 0x46, 0x7d, 0x48, 0xd9, 0xe5, 0xc5, 0xbc, 0x88, 0xf2, 0x5d, 0x45, 0x17, 0x99,
-	0xa2, 0x11, 0x7e, 0xde, 0x4e, 0xfd, 0x28, 0x3a, 0xec, 0x70, 0x3c, 0x22, 0x51, 0xda, 0x97, 0x8d,
-	0xf4, 0x42, 0x91, 0x7f, 0x07, 0x75, 0xa3, 0x08, 0xb3, 0x38, 0xb7, 0x50, 0xf6, 0x07, 0x04, 0x45,
-	0xb0, 0xf7, 0x4e, 0xea, 0x45, 0x2a, 0xb5, 0x84, 0xa0, 0x08, 0x1e, 0x18, 0x14, 0xc1, 0xde, 0xbb,
-	0xa8, 0x1f, 0x45, 0xba, 0x25, 0x05, 0x45, 0xb0, 0xfb, 0x2a, 0xe3, 0x17, 0xc5, 0xfb, 0x46, 0x9f,
-	0xfa, 0x89, 0x69, 0xb9, 0xf8, 0x37, 0xc6, 0xfb, 0xc9, 0x8d, 0xe6, 0x8d, 0x03, 0x9d, 0xe5, 0xdd,
-	0xd4, 0x97, 0x49, 0xdc, 0x19, 0xf6, 0x10, 0x34, 0x9d, 0x9b, 0x8d, 0x7c, 0x43, 0xfb, 0x79, 0x0f,
-	0xf5, 0x36, 0x48, 0xed, 0xc5, 0xbf, 0x00, 0xe8, 0x50, 0x77, 0xa3, 0x4b, 0x0c, 0x4e, 0x95, 0x5e,
-	0xf5, 0xde, 0x6c, 0xfa, 0x5e, 0x25, 0x24, 0xd9, 0x5c, 0x0c, 0x5c, 0xf6, 0xae, 0x9f, 0x46, 0x97,
-	0x1a, 0xb3, 0x4b, 0xa9, 0xf5, 0xf7, 0x66, 0xd3, 0xd4, 0x7a, 0x01, 0x7e, 0xb1, 0x21, 0x27, 0x23,
-	0xba, 0x70, 0xab, 0x51, 0x0f, 0x4b, 0xe4, 0x3f, 0x67, 0x4b, 0x59, 0xd0, 0x85, 0x30, 0x2a, 0x75,
-	0x21, 0xb7, 0x82, 0x0a, 0xf4, 0x2f, 0xd4, 0x8c, 0xe9, 0x42, 0x18, 0x56, 0x74, 0x21, 0xb7, 0xe3,
-	0xe5, 0xee, 0x5f, 0xa9, 0x21, 0xd3, 0x85, 0x30, 0xae, 0xea, 0x42, 0x6e, 0xc9, 0x8b, 0xda, 0xbf,
-	0x51, 0xcb, 0x82, 0xb4, 0x54, 0x75, 0xa1, 0xc4, 0x26, 0xd8, 0xfb, 0x77, 0x6a, 0x98, 0xd5, 0xb0,
-	0x85, 0xce, 0x51, 0xb0, 0x09, 0xf6, 0xfe, 0x83, 0x1a, 0xba, 0x3a, 0x76, 0xc4, 0x92, 0x97, 0xa0,
-	0xff, 0xa4, 0x96, 0xa3, 0x3a, 0xb6, 0xd0, 0x85, 0xdc, 0x52, 0x54, 0x88, 0xff, 0xa2, 0xa6, 0x4c,
-	0x17, 0xc2, 0x07, 0x9a, 0x2e, 0x14, 0xf8, 0xc2, 0xf8, 0xbf, 0xa9, 0x31, 0xd3, 0x85, 0x7c, 0x05,
-	0x9a, 0x2e, 0x14, 0x9e, 0x59, 0xc9, 0xf8, 0x1f, 0x6a, 0x9a, 0x91, 0x51, 0x29, 0xba, 0x50, 0x5d,
-	0x01, 0xc1, 0xde, 0xff, 0x52, 0xcb, 0x7c, 0x64, 0x05, 0x42, 0x17, 0x6a, 0x2b, 0x20, 0xd8, 0xfb,
-	0x3f, 0x6a, 0x5c, 0x8c, 0xae, 0x20, 0xc2, 0x02, 0xcf, 0xef, 0x0b, 0xa3, 0xa5, 0x2c, 0xe8, 0x42,
-	0x18, 0x57, 0x75, 0xa1, 0xf0, 0x0b, 0xd9, 0xfb, 0x33, 0xa3, 0xec, 0x6c, 0x57, 0x32, 0xab, 0xe8,
-	0x42, 0xb1, 0x9b, 0x58, 0x62, 0xbe, 0x9e, 0x1a, 0x4e, 0xc8, 0xa8, 0x14, 0x5d, 0xc8, 0xed, 0x94,
-	0x5c, 0xfb, 0x59, 0x6a, 0x3c, 0x84, 0x2e, 0x04, 0x8f, 0x11, 0x5d, 0xa8, 0xc1, 0x08, 0x59, 0xf3,
-	0x73, 0x14, 0x69, 0x38, 0x5d, 0xa8, 0x80, 0x69, 0xba, 0x90, 0xe3, 0xa9, 0xba, 0xf0, 0xe7, 0x01,
-	0x2d, 0xbd, 0x2e, 0x04, 0x9f, 0x51, 0x5d, 0x18, 0x6e, 0x76, 0xa5, 0x56, 0xfc, 0x02, 0x50, 0x98,
-	0x42, 0x17, 0x8a, 0x14, 0x89, 0xe8, 0xc2, 0x08, 0x88, 0x20, 0xf0, 0x17, 0x21, 0xa4, 0x74, 0xba,
-	0x50, 0x83, 0xd2, 0x74, 0x21, 0x7c, 0x02, 0xac, 0xfd, 0x12, 0x85, 0xb0, 0xd5, 0x85, 0xe0, 0x20,
-	0xd4, 0x85, 0x8a, 0x3f, 0xf7, 0x27, 0x51, 0xa1, 0x55, 0xdf, 0x62, 0x55, 0x0e, 0x4a, 0xdd, 0xb7,
-	0x21, 0x86, 0x1f, 0xb6, 0x00, 0xb8, 0xb1, 0xbe, 0x45, 0x0b, 0x22, 0xfd, 0xef, 0x74, 0xbb, 0xbb,
-	0x7d, 0x3e, 0xd8, 0xdf, 0x92, 0x23, 0xee, 0x59, 0x34, 0x19, 0x22, 0x40, 0x4d, 0xfb, 0x2d, 0x80,
-	0xb8, 0xd2, 0x1e, 0x82, 0x15, 0x54, 0xc0, 0x98, 0x68, 0x29, 0x43, 0xee, 0x3a, 0x9a, 0x0a, 0x41,
-	0x78, 0x8d, 0xfd, 0x6d, 0x40, 0xb9, 0xca, 0x1e, 0x05, 0xaa, 0x31, 0xc0, 0x14, 0x5a, 0xea, 0x98,
-	0x86, 0xc3, 0x2b, 0xf4, 0xef, 0xa4, 0xc6, 0x39, 0x63, 0xc0, 0xe1, 0xf5, 0x3d, 0x42, 0x1a, 0xc1,
-	0xde, 0xef, 0x0e, 0x43, 0x1a, 0xc1, 0x31, 0xd2, 0x08, 0x8e, 0x91, 0x46, 0xb0, 0xf7, 0x7b, 0x43,
-	0x91, 0x26, 0x60, 0x54, 0xd2, 0x22, 0x38, 0xbc, 0xb5, 0x7c, 0x67, 0x28, 0xd2, 0xa2, 0x38, 0xbc,
-	0x31, 0x6d, 0xa2, 0x62, 0x88, 0x23, 0x7a, 0xcd, 0xef, 0x03, 0xd0, 0xd5, 0xf6, 0x40, 0xbc, 0x85,
-	0x01, 0xd2, 0x64, 0x4b, 0x1b, 0x74, 0x9b, 0x68, 0x5a, 0x52, 0x27, 0xb0, 0xfe, 0x00, 0xb0, 0xae,
-	0x49, 0x41, 0xde, 0xba, 0x0a, 0x36, 0xd5, 0xd2, 0x47, 0xb5, 0xdd, 0x00, 0x7d, 0xf1, 0x0f, 0x53,
-	0xef, 0x06, 0xd6, 0x41, 0xf5, 0xdd, 0x00, 0x4d, 0x35, 0xc6, 0x1e, 0xc1, 0xde, 0x1f, 0x0d, 0xc7,
-	0x9e, 0xf8, 0x9e, 0x34, 0xf6, 0x08, 0x36, 0xb0, 0x47, 0xb0, 0xf7, 0xc7, 0x43, 0xb2, 0x27, 0xc0,
-	0x74, 0xf6, 0x22, 0xdb, 0x8f, 0xf7, 0xf4, 0x3f, 0x49, 0xbd, 0xfd, 0xa0, 0xfb, 0xeb, 0xdb, 0x8f,
-	0x2b, 0x02, 0x2d, 0x9d, 0x40, 0x11, 0xfc, 0x69, 0xfa, 0x74, 0x62, 0x0e, 0x22, 0xe9, 0x04, 0x7a,
-	0x42, 0xdd, 0x0d, 0xa0, 0x27, 0xfe, 0x2c, 0xf5, 0x6e, 0x60, 0xca, 0x43, 0xdf, 0x0d, 0x20, 0x46,
-	0xb6, 0xd0, 0x81, 0x10, 0x44, 0x11, 0x23, 0x7f, 0x0e, 0x48, 0xaf, 0xb0, 0x47, 0x0a, 0x05, 0x08,
-	0xa0, 0x15, 0x5b, 0x91, 0x61, 0xf7, 0x3c, 0x9a, 0x89, 0x20, 0x8a, 0xb6, 0xfa, 0x17, 0x00, 0x7a,
-	0x6d, 0x4a, 0x50, 0x3e, 0x06, 0xb8, 0x07, 0x5a, 0xf1, 0x4f, 0xdc, 0x1d, 0x74, 0x30, 0x84, 0x56,
-	0x25, 0xca, 0x5f, 0x02, 0xf0, 0x29, 0x7b, 0x60, 0xa9, 0x4a, 0x00, 0x76, 0xba, 0x15, 0x1d, 0x77,
-	0xef, 0x40, 0x87, 0x94, 0xea, 0xab, 0xa8, 0x95, 0xef, 0x02, 0xea, 0x72, 0x9a, 0x1a, 0x1c, 0xea,
-	0x14, 0x80, 0x75, 0x5b, 0xb1, 0x0f, 0xdc, 0xbb, 0x91, 0x17, 0xc3, 0x15, 0x4c, 0xff, 0x15, 0x40,
-	0x9f, 0x4e, 0x0d, 0xad, 0x71, 0x7d, 0xa8, 0x65, 0xfa, 0x4c, 0xec, 0x5f, 0xd6, 0xe8, 0x40, 0x73,
-	0xfc, 0x75, 0xaa, 0xfd, 0xcb, 0x3a, 0xbf, 0x14, 0x1d, 0x74, 0xff, 0x86, 0x43, 0x22, 0x19, 0x77,
-	0x14, 0x94, 0xbf, 0x49, 0x95, 0x8c, 0xd0, 0xf8, 0x25, 0x0c, 0x4d, 0x46, 0x39, 0x26, 0x70, 0x7a,
-	0x0a, 0xce, 0xdf, 0xa6, 0xc2, 0x39, 0x63, 0xc0, 0x91, 0x63, 0x0a, 0x69, 0x04, 0x03, 0xcc, 0xdf,
-	0xa5, 0x25, 0x8d, 0xe0, 0x18, 0x69, 0x30, 0xa4, 0x92, 0x26, 0x50, 0xfe, 0x3e, 0x35, 0x69, 0x2a,
-	0x8c, 0x20, 0x4d, 0xc7, 0xe9, 0x29, 0x38, 0xff, 0x90, 0x9a, 0xb4, 0x28, 0x8e, 0x1c, 0x13, 0x2d,
-	0x8d, 0xb7, 0x51, 0x00, 0xfa, 0xc7, 0x54, 0x2d, 0x8d, 0xf7, 0x7d, 0x89, 0x44, 0xbf, 0x0d, 0x65,
-	0x30, 0xa4, 0x8e, 0x95, 0x68, 0x40, 0xfa, 0xa7, 0x74, 0xd4, 0x31, 0x0f, 0x11, 0xea, 0xc2, 0x31,
-	0xb7, 0x84, 0x50, 0xa7, 0xdd, 0xe8, 0xac, 0x03, 0xc4, 0xd3, 0xb9, 0x92, 0x53, 0xde, 0x57, 0x1d,
-	0x09, 0xc6, 0xd9, 0x20, 0xb3, 0x38, 0x82, 0xf6, 0x83, 0x05, 0xc8, 0xd3, 0x67, 0xa8, 0x49, 0xae,
-	0x3a, 0x12, 0xc0, 0x3c, 0x90, 0xcb, 0x2f, 0x43, 0x13, 0x60, 0xc3, 0xb5, 0xf2, 0xb3, 0xd4, 0x68,
-	0xba, 0x3a, 0x12, 0xc0, 0x54, 0x2e, 0x76, 0x43, 0x2b, 0xae, 0x74, 0x9f, 0xa3, 0x56, 0x85, 0xd0,
-	0x8a, 0x4b, 0x55, 0x15, 0x8f, 0x60, 0xef, 0x79, 0x6a, 0x94, 0x55, 0xf1, 0x08, 0xd6, 0xf1, 0x08,
-	0xf6, 0x3e, 0x43, 0x8d, 0x5c, 0x0d, 0x4f, 0xb5, 0xe2, 0x22, 0xf1, 0xb3, 0xd4, 0x6a, 0x54, 0xc3,
-	0x23, 0xd8, 0x7d, 0x39, 0x2a, 0x80, 0x95, 0x90, 0x5d, 0x9f, 0xa3, 0x66, 0x63, 0xd5, 0x91, 0x00,
-	0x66, 0x0b, 0x89, 0x56, 0x46, 0x93, 0x1c, 0x53, 0x18, 0x7e, 0x9e, 0x1a, 0x4e, 0x55, 0x47, 0x02,
-	0x70, 0x10, 0xca, 0xab, 0x30, 0x02, 0xd0, 0x56, 0xbf, 0x4c, 0xcd, 0x32, 0x61, 0x04, 0xa0, 0x8e,
-	0x74, 0x54, 0x82, 0xbd, 0x5f, 0xa1, 0x56, 0x79, 0x1d, 0x95, 0x1d, 0x20, 0x68, 0xa8, 0x04, 0x7b,
-	0xbf, 0x4a, 0x0d, 0x8b, 0x11, 0x54, 0x35, 0x5a, 0xae, 0x49, 0x5e, 0xa0, 0x76, 0x4e, 0x18, 0x2d,
-	0x17, 0x15, 0x92, 0x39, 0x50, 0x14, 0x5f, 0xa0, 0x56, 0xe3, 0x92, 0x39, 0x90, 0x04, 0x61, 0x04,
-	0xa0, 0x07, 0xbe, 0x48, 0x8d, 0x26, 0xc2, 0x08, 0xa0, 0xa3, 0xd7, 0x51, 0x11, 0x6c, 0x94, 0x76,
-	0xfe, 0xa5, 0x5c, 0xfa, 0xc7, 0xb8, 0xd5, 0x91, 0x00, 0x42, 0x95, 0x2d, 0xfc, 0x56, 0x74, 0x40,
-	0x85, 0x10, 0x5d, 0xe5, 0xcb, 0xb9, 0xa1, 0x5e, 0xb1, 0xa9, 0x8e, 0x04, 0xd3, 0x12, 0x48, 0x74,
-	0x91, 0x35, 0x04, 0x83, 0x5a, 0xc3, 0xfe, 0x4a, 0x6e, 0x88, 0xf7, 0x6b, 0xaa, 0x23, 0xc1, 0x14,
-	0x73, 0xa9, 0x34, 0xe9, 0x15, 0xe4, 0x8a, 0x8d, 0xab, 0x74, 0xe8, 0xaf, 0xe6, 0xd2, 0x3c, 0x8b,
-	0xae, 0x8e, 0x04, 0x45, 0xbe, 0xdd, 0x65, 0x37, 0x3e, 0x87, 0x0e, 0xe9, 0x00, 0x82, 0xb4, 0xaf,
-	0xe5, 0x52, 0xbe, 0x59, 0x53, 0x1d, 0x09, 0x0e, 0xa8, 0x30, 0x82, 0xb0, 0x1f, 0xe3, 0x95, 0x03,
-	0x98, 0xfa, 0x7a, 0xce, 0xfa, 0x35, 0xc1, 0x9b, 0xe8, 0x6c, 0xc1, 0x94, 0xe2, 0x4b, 0xe6, 0x06,
-	0xec, 0xd1, 0x45, 0xef, 0x1b, 0x62, 0x93, 0x4e, 0x28, 0x9b, 0x74, 0x31, 0x6a, 0xe7, 0x7b, 0xdf,
-	0x34, 0xd9, 0xf9, 0x51, 0xbb, 0x25, 0xef, 0x5b, 0x26, 0xbb, 0x25, 0xf7, 0x0a, 0x74, 0x90, 0x67,
-	0x90, 0xfe, 0x40, 0xeb, 0xde, 0xbc, 0x7c, 0xa1, 0xa7, 0xea, 0x04, 0xf0, 0x0d, 0xea, 0xcf, 0xb3,
-	0xae, 0x12, 0xb4, 0x47, 0x1f, 0x66, 0xbd, 0x2f, 0xaf, 0xbe, 0xdd, 0x53, 0x75, 0x38, 0x97, 0x91,
-	0x67, 0x59, 0x57, 0xa3, 0x99, 0xe8, 0x74, 0x5e, 0x49, 0xef, 0xcb, 0x2b, 0xaf, 0xfa, 0x54, 0x9d,
-	0xe0, 0xa0, 0x3e, 0x9d, 0x57, 0xd6, 0xab, 0xe2, 0xf3, 0x79, 0x8d, 0xbd, 0x3f, 0x2f, 0xdf, 0xfb,
-	0x89, 0x4f, 0x3f, 0x23, 0x1e, 0x83, 0x99, 0x56, 0x4f, 0xb0, 0xf7, 0x40, 0x3e, 0xfa, 0x12, 0x90,
-	0x31, 0x02, 0x82, 0x93, 0x22, 0x20, 0xd8, 0x7b, 0x30, 0xaf, 0xbc, 0x11, 0x64, 0x8e, 0x80, 0xe0,
-	0xa4, 0x08, 0x08, 0xf6, 0x1e, 0xca, 0xcb, 0xd7, 0x83, 0xcc, 0x11, 0xb0, 0x47, 0x5f, 0xb3, 0xd1,
-	0xe9, 0xa2, 0x4a, 0x3f, 0x9c, 0x57, 0xdf, 0x15, 0xaa, 0x3a, 0xc1, 0x21, 0xdd, 0x83, 0xa8, 0xef,
-	0xd7, 0x21, 0x2f, 0x16, 0x81, 0xf0, 0xf1, 0x48, 0x5e, 0x7b, 0x71, 0xa8, 0xea, 0x04, 0x33, 0x91,
-	0x28, 0x44, 0xed, 0xbf, 0x3a, 0x4e, 0x25, 0x74, 0x81, 0xf7, 0xe7, 0xb5, 0xb7, 0x88, 0xe2, 0x3c,
-	0x42, 0x5f, 0x48, 0x0a, 0x84, 0x60, 0xef, 0x03, 0x79, 0xf5, 0x95, 0xa2, 0x84, 0x40, 0x08, 0x4e,
-	0x0e, 0x84, 0x60, 0xef, 0xd1, 0xbc, 0xf6, 0x7e, 0x51, 0x52, 0x20, 0x04, 0xbb, 0xd7, 0xc7, 0xbf,
-	0x10, 0xde, 0x58, 0x1e, 0xcb, 0x1b, 0x5e, 0x36, 0x8a, 0x7f, 0x33, 0xbc, 0xe1, 0xdc, 0x60, 0xd8,
-	0x18, 0xd0, 0x7a, 0x1e, 0xcf, 0x9b, 0xdf, 0x3c, 0x32, 0xec, 0x11, 0xe8, 0x4a, 0x37, 0xc5, 0xb9,
-	0x85, 0xfe, 0xf4, 0x44, 0x7e, 0xf0, 0x6b, 0x48, 0x71, 0xb2, 0xa1, 0x85, 0xbd, 0x16, 0xcd, 0x45,
-	0x1d, 0x2a, 0xcd, 0xec, 0xc9, 0xfc, 0xd0, 0xef, 0x24, 0x55, 0x9d, 0x60, 0x56, 0x07, 0x56, 0xff,
-	0x3e, 0xbd, 0x38, 0x9e, 0x31, 0x4a, 0x53, 0x78, 0x2a, 0x3f, 0xc4, 0x0b, 0x4a, 0x55, 0x27, 0x38,
-	0x1c, 0xcd, 0xb3, 0xd0, 0x66, 0xee, 0xa7, 0xd0, 0x84, 0xd6, 0xfb, 0x5e, 0xc4, 0x37, 0xcd, 0xe7,
-	0xee, 0x42, 0x48, 0xe9, 0x87, 0x2f, 0x26, 0xf2, 0x35, 0xa8, 0xa0, 0xbd, 0xc9, 0x69, 0x0b, 0x4e,
-	0x1d, 0x68, 0xef, 0x44, 0xa4, 0x73, 0xa0, 0x1c, 0x9e, 0x5b, 0x3b, 0xb8, 0x1a, 0x15, 0xa3, 0x87,
-	0xe3, 0x6e, 0x11, 0x65, 0x6f, 0x6b, 0x9c, 0x67, 0x4e, 0xf6, 0x05, 0xf4, 0x7f, 0xdd, 0x83, 0x28,
-	0x77, 0x47, 0xbd, 0xd9, 0x6b, 0x78, 0x19, 0x36, 0x06, 0xff, 0xa8, 0x64, 0x4e, 0x3a, 0x73, 0xd7,
-	0xa0, 0xe9, 0xd8, 0xc9, 0xf7, 0x6e, 0x0e, 0x72, 0xaa, 0x83, 0x57, 0x20, 0x37, 0x7e, 0xa8, 0xbd,
-	0x9b, 0x87, 0x69, 0xb3, 0x87, 0x33, 0x7b, 0xf7, 0x50, 0x48, 0x0c, 0x82, 0x9f, 0xd2, 0xed, 0xe6,
-	0x20, 0x9b, 0x1c, 0xc4, 0x1e, 0x3d, 0xb8, 0xc9, 0x41, 0xec, 0xd1, 0xc3, 0xa8, 0xea, 0xe1, 0x14,
-	0x3a, 0x60, 0x38, 0x17, 0xde, 0xcd, 0xc5, 0x98, 0xea, 0x62, 0x19, 0x1d, 0x34, 0x1d, 0xf7, 0xee,
-	0xe6, 0x63, 0xca, 0xcc, 0xa5, 0x3c, 0xc7, 0xdd, 0xcd, 0x41, 0x66, 0x40, 0x1c, 0x7b, 0xa4, 0x22,
-	0x3f, 0x28, 0x8e, 0x3d, 0xfa, 0x28, 0x9a, 0xbf, 0x10, 0xe5, 0x40, 0x75, 0x37, 0x0f, 0x4e, 0xc2,
-	0xa6, 0x90, 0x47, 0xa5, 0xbb, 0x79, 0x18, 0x37, 0x73, 0x29, 0x4f, 0x41, 0x77, 0x73, 0x30, 0xa1,
-	0x3a, 0x38, 0x8f, 0x0e, 0x19, 0x0f, 0x37, 0x0d, 0x4e, 0x5e, 0xa5, 0x3a, 0x49, 0xfb, 0x30, 0x57,
-	0x81, 0xbe, 0x1b, 0x79, 0x49, 0x47, 0x9c, 0x06, 0xf4, 0x1b, 0x55, 0xf4, 0x21, 0x1e, 0xf0, 0x2a,
-	0x0b, 0x78, 0x2d, 0x9a, 0x31, 0x1f, 0x75, 0x1a, 0xe0, 0x7f, 0x44, 0x87, 0x4f, 0xf9, 0xc4, 0x57,
-	0x01, 0xef, 0xa1, 0xd9, 0x84, 0x13, 0x4f, 0x03, 0xfa, 0x75, 0x3a, 0xf5, 0xb6, 0x0f, 0x81, 0xb5,
-	0x98, 0xe7, 0x92, 0x4f, 0x3b, 0x0d, 0xc8, 0xaf, 0xd4, 0xe3, 0x4e, 0xf1, 0x58, 0x38, 0xb6, 0x5b,
-	0xf5, 0x33, 0x4f, 0x15, 0x33, 0xb7, 0x5b, 0x2f, 0x81, 0x84, 0x89, 0x1c, 0x67, 0xaa, 0x1e, 0xa6,
-	0xf7, 0xe6, 0xe1, 0x4c, 0xb2, 0x87, 0xc2, 0xde, 0xfa, 0x99, 0x7e, 0x06, 0xa9, 0x3a, 0xc8, 0xee,
-	0x3d, 0x88, 0x04, 0x0f, 0xee, 0xde, 0x83, 0x48, 0xf0, 0x30, 0xba, 0x9b, 0x07, 0x28, 0xa1, 0xd1,
-	0x13, 0x41, 0xd5, 0xc5, 0xd8, 0x1e, 0xc3, 0xd0, 0x8f, 0xfa, 0x54, 0x0f, 0xe3, 0xbb, 0x79, 0xb8,
-	0x12, 0x21, 0xf9, 0xf7, 0xb8, 0xb5, 0x2e, 0xa9, 0xa2, 0x99, 0xd3, 0x77, 0x75, 0x1b, 0xed, 0x9d,
-	0xcd, 0x4e, 0x7b, 0x38, 0x8d, 0xa5, 0x7a, 0x1a, 0x4a, 0x2b, 0x1d, 0x99, 0x47, 0xe3, 0x52, 0x6c,
-	0x8f, 0x23, 0xd0, 0xc5, 0xc5, 0x11, 0xfa, 0xbf, 0xcb, 0xc1, 0xa9, 0x1f, 0xbd, 0xa9, 0xe8, 0xb8,
-	0xfb, 0xd1, 0xd8, 0xb5, 0xd5, 0x53, 0xc1, 0xab, 0x6f, 0x38, 0x5d, 0xcc, 0x5c, 0x36, 0xbe, 0xef,
-	0x9e, 0x5a, 0xf1, 0xc2, 0x85, 0x0b, 0x17, 0x32, 0xfe, 0x59, 0x34, 0xdb, 0x10, 0x8b, 0x58, 0xd1,
-	0xee, 0x2c, 0xba, 0x16, 0xa2, 0xd3, 0xbb, 0xa7, 0xc6, 0x58, 0x3e, 0xd4, 0x88, 0x52, 0x43, 0xbf,
-	0x22, 0xbf, 0x81, 0x3c, 0x03, 0x08, 0xfc, 0x41, 0x6e, 0x83, 0xf2, 0x86, 0x1a, 0xcb, 0xd6, 0x99,
-	0x18, 0x0a, 0xcb, 0x6d, 0x7f, 0x03, 0x1d, 0x36, 0xc0, 0xec, 0xd8, 0xe3, 0xbc, 0xb1, 0xc6, 0x72,
-	0x7a, 0x36, 0x86, 0x03, 0x25, 0x20, 0x01, 0xa8, 0x67, 0x0f, 0xf4, 0xa6, 0x1a, 0x4b, 0xfd, 0x38,
-	0x10, 0x54, 0x8a, 0x64, 0xe2, 0x08, 0xb6, 0xc2, 0x79, 0x73, 0x8d, 0x55, 0x08, 0x23, 0x71, 0x04,
-	0x0f, 0x20, 0xce, 0x12, 0xe7, 0x2d, 0x35, 0x56, 0x47, 0xcc, 0xc4, 0x25, 0x02, 0xf5, 0xec, 0x81,
-	0xde, 0x5a, 0x63, 0xe5, 0xc6, 0x4c, 0x1c, 0xc1, 0xfe, 0x26, 0x9a, 0x33, 0x00, 0x89, 0x93, 0x0b,
-	0x1b, 0xa4, 0xb7, 0xd5, 0x58, 0x55, 0xf2, 0x62, 0x48, 0xbc, 0x8a, 0xf9, 0xb7, 0xa1, 0x8b, 0x4c,
-	0xe4, 0xa5, 0xc1, 0x7a, 0x7b, 0x8d, 0x89, 0xd6, 0xc3, 0x71, 0xfa, 0xb8, 0xb7, 0x84, 0x0d, 0xb1,
-	0x0e, 0xaf, 0xf6, 0x59, 0x20, 0xbd, 0xa3, 0xc6, 0xd4, 0x6d, 0x7c, 0x43, 0x30, 0x6d, 0x3c, 0x88,
-	0x3e, 0xcb, 0x2f, 0xea, 0x9d, 0x35, 0xa6, 0x81, 0x13, 0xe8, 0x23, 0x78, 0x20, 0x7d, 0x96, 0x58,
-	0xef, 0xaa, 0x31, 0xad, 0x9c, 0x44, 0x5f, 0xe2, 0xfe, 0x83, 0xc3, 0x1e, 0x2b, 0xa8, 0x7e, 0x8d,
-	0x89, 0xea, 0xf8, 0xfe, 0x03, 0x4d, 0x9e, 0x94, 0x51, 0x70, 0xb8, 0x63, 0x03, 0xf4, 0xee, 0x1a,
-	0xeb, 0x02, 0x86, 0x8c, 0x82, 0x13, 0x5f, 0xf3, 0x86, 0x60, 0x67, 0x45, 0x56, 0x38, 0xef, 0xa9,
-	0x31, 0x89, 0x1e, 0xdf, 0x10, 0x4c, 0xe0, 0xfb, 0x0f, 0x38, 0xe8, 0x12, 0x03, 0x8e, 0x3c, 0x42,
-	0xb2, 0x02, 0x7b, 0x6f, 0x6d, 0x08, 0x29, 0x3f, 0x17, 0x5b, 0x62, 0xf8, 0x99, 0xff, 0xb8, 0x83,
-	0x4a, 0x89, 0xcb, 0xe4, 0x8f, 0x07, 0xac, 0x56, 0x7a, 0x6f, 0x6d, 0x38, 0xd9, 0x7f, 0x89, 0x79,
-	0xb1, 0xfc, 0x63, 0xff, 0x61, 0x07, 0x7d, 0x9f, 0x61, 0xbd, 0xca, 0x73, 0x19, 0xab, 0xd5, 0xbe,
-	0xaf, 0x36, 0xcc, 0x5f, 0x09, 0x17, 0xc5, 0xd6, 0x2a, 0x3f, 0xf4, 0xef, 0x73, 0xd0, 0xa5, 0xc6,
-	0x1e, 0x21, 0x8f, 0xf1, 0xac, 0x96, 0x7a, 0x5f, 0x2d, 0xd5, 0x9f, 0x14, 0x17, 0x1b, 0x3a, 0x4b,
-	0xf8, 0xa9, 0xff, 0xa8, 0x83, 0x8e, 0x0c, 0x58, 0x64, 0x9a, 0x0d, 0x70, 0x7f, 0x2d, 0xed, 0x1f,
-	0x20, 0x97, 0x26, 0x2d, 0x55, 0x7c, 0xf9, 0x0f, 0x39, 0x48, 0xa6, 0x9b, 0x7e, 0xd3, 0xda, 0x66,
-	0x85, 0x0f, 0xd4, 0xd8, 0xe3, 0x28, 0x9b, 0x37, 0x6d, 0xcc, 0x02, 0x36, 0x48, 0x58, 0x8d, 0xdf,
-	0x54, 0x6b, 0x8c, 0xfe, 0xc0, 0xc8, 0x2e, 0x99, 0xfa, 0xea, 0x75, 0x71, 0x89, 0xa6, 0x3d, 0x5f,
-	0xf2, 0xb7, 0xd4, 0xd2, 0x19, 0x79, 0xc6, 0x64, 0x97, 0x0d, 0x7d, 0xfd, 0xba, 0xf9, 0x6c, 0x1c,
-	0x10, 0x74, 0xe3, 0xed, 0x6a, 0xb7, 0x8b, 0x3e, 0x96, 0xb2, 0xdb, 0xd5, 0x7d, 0xed, 0xba, 0xba,
-	0x17, 0x47, 0xe4, 0x0a, 0x72, 0xcb, 0x0c, 0x99, 0x42, 0x42, 0xde, 0xdf, 0x57, 0xaf, 0xbb, 0x1b,
-	0x10, 0xb9, 0x94, 0xec, 0x26, 0xd2, 0x6a, 0xd9, 0x65, 0x1f, 0xe8, 0xc7, 0xaf, 0xcb, 0x9b, 0xa9,
-	0x25, 0x78, 0x10, 0xb5, 0x96, 0xb0, 0x0f, 0xf6, 0xb5, 0xeb, 0xf6, 0x09, 0xd4, 0x12, 0x3c, 0x88,
-	0x5a, 0x4b, 0xc8, 0x87, 0xfa, 0xea, 0x75, 0xfd, 0x04, 0x6a, 0x09, 0xf6, 0xbb, 0xaa, 0x84, 0x89,
-	0x3d, 0x95, 0xb3, 0x82, 0x7c, 0xb8, 0xaf, 0x5f, 0xf7, 0x3f, 0x1c, 0x07, 0x15, 0xba, 0xf3, 0x4e,
-	0x74, 0xb1, 0x91, 0xda, 0x34, 0xb0, 0x8f, 0xf4, 0x23, 0x3f, 0x17, 0x30, 0x67, 0xa0, 0x57, 0x68,
-	0xd0, 0xdb, 0xcd, 0x3b, 0xc9, 0x5e, 0x84, 0xbe, 0xbf, 0x1f, 0xf9, 0xb9, 0x01, 0xc3, 0x36, 0x02,
-	0x3d, 0x3a, 0x88, 0x61, 0xcb, 0x2f, 0xf5, 0x03, 0x7d, 0xfd, 0xe7, 0x0a, 0x92, 0x18, 0x26, 0x78,
-	0x30, 0xc3, 0x96, 0xb0, 0x8f, 0xf6, 0x23, 0x3f, 0x77, 0x90, 0xc8, 0x30, 0xc1, 0xfe, 0x79, 0xf3,
-	0x16, 0x4e, 0xa1, 0x53, 0x1f, 0xeb, 0x1b, 0x7f, 0x2e, 0xc1, 0xb0, 0x97, 0xb9, 0x70, 0x7d, 0x5d,
-	0x42, 0xc2, 0xda, 0x2b, 0xd7, 0xc7, 0xfb, 0x49, 0x3f, 0xb7, 0x60, 0xca, 0x5d, 0x50, 0xb3, 0xaf,
-	0x77, 0xcc, 0x7b, 0xcb, 0x5e, 0xcf, 0x3e, 0xd1, 0xdf, 0xed, 0xf7, 0x1a, 0x0c, 0x9b, 0x0d, 0xb4,
-	0xee, 0x13, 0x9a, 0x28, 0x33, 0x3d, 0x2f, 0xb5, 0x5a, 0xc9, 0x93, 0xfd, 0xef, 0xc1, 0x0f, 0x3e,
-	0x5c, 0x14, 0x5f, 0xac, 0x54, 0xbd, 0x8f, 0x69, 0xaa, 0xd7, 0xfc, 0x8c, 0xd5, 0x6a, 0xc9, 0x4f,
-	0xf5, 0x87, 0xfa, 0xc5, 0x88, 0x4b, 0x4c, 0xb5, 0x59, 0xaa, 0xb4, 0x35, 0xf5, 0xc8, 0x49, 0xbb,
-	0x2c, 0x68, 0xb7, 0xc8, 0xef, 0x3a, 0xec, 0x66, 0xa1, 0x3c, 0x73, 0x0a, 0x94, 0x2b, 0x86, 0xfe,
-	0xba, 0x2a, 0x5a, 0xf4, 0xcb, 0x86, 0x56, 0x30, 0x1f, 0x64, 0x30, 0xea, 0xa1, 0x53, 0xa0, 0x5e,
-	0x51, 0xf4, 0xcf, 0xa9, 0x3b, 0x36, 0x72, 0x59, 0xd1, 0x0a, 0xe8, 0x43, 0x0c, 0x48, 0x3d, 0x75,
-	0x0a, 0xb4, 0x2b, 0x8e, 0x09, 0x48, 0x29, 0x24, 0xc3, 0x87, 0x19, 0x52, 0xc1, 0x80, 0xc4, 0xb5,
-	0x42, 0x22, 0x77, 0x96, 0x45, 0xef, 0x23, 0x0c, 0x28, 0x6b, 0xe6, 0x8e, 0xe0, 0x01, 0xdc, 0x59,
-	0x02, 0x7d, 0x94, 0x01, 0xb9, 0x09, 0xdc, 0x25, 0x22, 0xa5, 0xd0, 0x04, 0x1f, 0x63, 0x48, 0xa3,
-	0x09, 0xdc, 0x11, 0xec, 0xdf, 0xaa, 0x16, 0xd0, 0xe8, 0x65, 0x4f, 0x2b, 0xa8, 0x8f, 0x33, 0x28,
-	0xf5, 0xe8, 0x29, 0xd0, 0xaf, 0x88, 0xfa, 0x4d, 0xb5, 0x2d, 0xc6, 0x2e, 0x8b, 0x5a, 0x81, 0x7d,
-	0x82, 0x81, 0xa9, 0x67, 0x4f, 0x41, 0xe4, 0x8a, 0x69, 0xc2, 0xae, 0xb0, 0x6f, 0xfb, 0x9f, 0x64,
-	0x50, 0x19, 0xc3, 0xae, 0x80, 0x66, 0x3f, 0x80, 0x41, 0xcb, 0x2f, 0xeb, 0x53, 0x0c, 0x29, 0x9f,
-	0xc4, 0x20, 0xc1, 0x03, 0x19, 0xb4, 0x04, 0xfb, 0x34, 0x03, 0x2b, 0x26, 0x32, 0x98, 0xb8, 0x0b,
-	0x53, 0xb4, 0xf5, 0xa7, 0x19, 0x96, 0x63, 0xd8, 0x85, 0xbc, 0x8d, 0x27, 0x64, 0x96, 0x7d, 0x17,
-	0x7f, 0x86, 0x21, 0x8d, 0x9b, 0x32, 0x0b, 0x5a, 0xb6, 0x79, 0x57, 0xd8, 0x37, 0xec, 0x67, 0x19,
-	0xd0, 0x84, 0x61, 0x57, 0x40, 0x57, 0x7e, 0x50, 0x3b, 0x81, 0x32, 0xdc, 0xf6, 0xb5, 0x42, 0x7b,
-	0x8e, 0xa1, 0x0d, 0x7f, 0x04, 0x15, 0x44, 0xef, 0x08, 0x53, 0xf5, 0x50, 0x4a, 0x5c, 0x67, 0x9a,
-	0x13, 0x88, 0xe7, 0xd9, 0x52, 0xbf, 0x27, 0x67, 0x50, 0x81, 0xe1, 0x92, 0xb1, 0xff, 0x88, 0x26,
-	0x77, 0x4c, 0xf7, 0x8d, 0xad, 0x96, 0xfb, 0x19, 0xbe, 0xdc, 0xa1, 0x0f, 0xa1, 0x82, 0xd8, 0x2d,
-	0x65, 0xff, 0x7e, 0xed, 0x10, 0xca, 0x78, 0x61, 0xd9, 0x6a, 0xad, 0x9f, 0xe5, 0xbb, 0x20, 0xfd,
-	0x29, 0x54, 0x10, 0xbf, 0xe6, 0x4c, 0xe5, 0xd8, 0x91, 0x01, 0xab, 0x4c, 0xb3, 0x07, 0x3e, 0xc7,
-	0x49, 0x1d, 0xea, 0x18, 0x2a, 0x30, 0xde, 0x93, 0xf6, 0x1f, 0x56, 0x8f, 0xa1, 0xf4, 0x1b, 0xce,
-	0x36, 0x4b, 0xfc, 0x3c, 0x5b, 0x62, 0xca, 0x73, 0x28, 0xfd, 0x9e, 0x75, 0xc2, 0x72, 0x96, 0x0b,
-	0xe2, 0x55, 0xfd, 0x5e, 0x7b, 0xb3, 0xd3, 0x5e, 0x9e, 0x8d, 0xbf, 0x23, 0xc9, 0x3e, 0xb8, 0x6c,
-	0x11, 0xed, 0x57, 0xdf, 0x13, 0x37, 0x3d, 0x10, 0x45, 0xee, 0x84, 0x7c, 0x20, 0xfa, 0x82, 0xb3,
-	0xfc, 0x9a, 0x1f, 0xaf, 0xc5, 0x96, 0x7d, 0x8c, 0x2d, 0x7b, 0xb5, 0xb7, 0x7e, 0x6c, 0xb3, 0xdd,
-	0x6d, 0x6c, 0xb7, 0xeb, 0x4d, 0xf6, 0x3b, 0xb7, 0x6c, 0x74, 0xe7, 0x58, 0xb3, 0xb1, 0x51, 0x3f,
-	0x7b, 0xfe, 0x58, 0xd2, 0x4f, 0xe2, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0xf2, 0x23,
-	0x9e, 0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20180814_aa810b61/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/test.pb.go
deleted file mode 100644
index 38a43bc2b67..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/test.pb.go
+++ /dev/null
@@ -1,3315 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto2_20190205_c823c79e/test.proto
-
-package proto2_20190205_c823c79e
-
-import (
-	fmt "fmt"
-	math "math"
-
-	proto "google.golang.org/protobuf/internal/protolegacy"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) Enum() *SiblingEnum {
-	p := new(SiblingEnum)
-	*p = x
-	return p
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-
-func (x *SiblingEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SiblingEnum_value, data, "SiblingEnum")
-	if err != nil {
-		return err
-	}
-	*x = SiblingEnum(value)
-	return nil
-}
-
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) Enum() *Message_ChildEnum {
-	p := new(Message_ChildEnum)
-	*p = x
-	return p
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-
-func (x *Message_ChildEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_ChildEnum_value, data, "Message_ChildEnum")
-	if err != nil {
-		return err
-	}
-	*x = Message_ChildEnum(value)
-	return nil
-}
-
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{0}
-}
-
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (m *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(m, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message struct {
-	Namedgroup *Message_NamedGroup `protobuf:"group,1,opt,name=NamedGroup,json=namedgroup" json:"namedgroup,omitempty"`
-	// Optional fields.
-	OptionalBool           *bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          *int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         *int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         *uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          *int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         *int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         *uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        *uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       *int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          *float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        *uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       *int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         *float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         *string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                 `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      *Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage  `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalNamedGroup     *Message_NamedGroup    `protobuf:"bytes,117,opt,name=optional_named_group,json=optionalNamedGroup" json:"optional_named_group,omitempty"`
-	OptionalSiblingEnum    *SiblingEnum           `protobuf:"varint,118,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage        `protobuf:"bytes,119,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	Optionalgroup          *Message_OptionalGroup `protobuf:"group,120,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	// Optional default fields.
-	DefaultedBool        *bool              `protobuf:"varint,200,opt,name=defaulted_bool,json=defaultedBool,def=1" json:"defaulted_bool,omitempty"`
-	DefaultedInt32       *int32             `protobuf:"varint,201,opt,name=defaulted_int32,json=defaultedInt32,def=-12345" json:"defaulted_int32,omitempty"`
-	DefaultedSint32      *int32             `protobuf:"zigzag32,202,opt,name=defaulted_sint32,json=defaultedSint32,def=-3200" json:"defaulted_sint32,omitempty"`
-	DefaultedUint32      *uint32            `protobuf:"varint,203,opt,name=defaulted_uint32,json=defaultedUint32,def=3200" json:"defaulted_uint32,omitempty"`
-	DefaultedInt64       *int64             `protobuf:"varint,204,opt,name=defaulted_int64,json=defaultedInt64,def=-123456789" json:"defaulted_int64,omitempty"`
-	DefaultedSint64      *int64             `protobuf:"zigzag64,205,opt,name=defaulted_sint64,json=defaultedSint64,def=-6400" json:"defaulted_sint64,omitempty"`
-	DefaultedUint64      *uint64            `protobuf:"varint,206,opt,name=defaulted_uint64,json=defaultedUint64,def=6400" json:"defaulted_uint64,omitempty"`
-	DefaultedFixed32     *uint32            `protobuf:"fixed32,207,opt,name=defaulted_fixed32,json=defaultedFixed32,def=320000" json:"defaulted_fixed32,omitempty"`
-	DefaultedSfixed32    *int32             `protobuf:"fixed32,208,opt,name=defaulted_sfixed32,json=defaultedSfixed32,def=-320000" json:"defaulted_sfixed32,omitempty"`
-	DefaultedFloat       *float32           `protobuf:"fixed32,209,opt,name=defaulted_float,json=defaultedFloat,def=3.14159" json:"defaulted_float,omitempty"`
-	DefaultedFixed64     *uint64            `protobuf:"fixed64,210,opt,name=defaulted_fixed64,json=defaultedFixed64,def=640000" json:"defaulted_fixed64,omitempty"`
-	DefaultedSfixed64    *int64             `protobuf:"fixed64,211,opt,name=defaulted_sfixed64,json=defaultedSfixed64,def=-640000" json:"defaulted_sfixed64,omitempty"`
-	DefaultedDouble      *float64           `protobuf:"fixed64,212,opt,name=defaulted_double,json=defaultedDouble,def=3.14159265359" json:"defaulted_double,omitempty"`
-	DefaultedString      *string            `protobuf:"bytes,213,opt,name=defaulted_string,json=defaultedString,def=hello, \"world!\"\n" json:"defaulted_string,omitempty"`
-	DefaultedBytes       []byte             `protobuf:"bytes,214,opt,name=defaulted_bytes,json=defaultedBytes,def=dead\\336\\255\\276\\357beef" json:"defaulted_bytes,omitempty"`
-	DefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,215,opt,name=defaulted_child_enum,json=defaultedChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum,def=0" json:"defaulted_child_enum,omitempty"`
-	DefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,216,opt,name=defaulted_sibling_enum,json=defaultedSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum,def=0" json:"defaulted_sibling_enum,omitempty"`
-	// Required fields.
-	RequiredBool           *bool                  `protobuf:"varint,300,req,name=required_bool,json=requiredBool" json:"required_bool,omitempty"`
-	RequiredInt32          *int32                 `protobuf:"varint,301,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
-	RequiredSint32         *int32                 `protobuf:"zigzag32,302,req,name=required_sint32,json=requiredSint32" json:"required_sint32,omitempty"`
-	RequiredUint32         *uint32                `protobuf:"varint,303,req,name=required_uint32,json=requiredUint32" json:"required_uint32,omitempty"`
-	RequiredInt64          *int64                 `protobuf:"varint,304,req,name=required_int64,json=requiredInt64" json:"required_int64,omitempty"`
-	RequiredSint64         *int64                 `protobuf:"zigzag64,305,req,name=required_sint64,json=requiredSint64" json:"required_sint64,omitempty"`
-	RequiredUint64         *uint64                `protobuf:"varint,306,req,name=required_uint64,json=requiredUint64" json:"required_uint64,omitempty"`
-	RequiredFixed32        *uint32                `protobuf:"fixed32,307,req,name=required_fixed32,json=requiredFixed32" json:"required_fixed32,omitempty"`
-	RequiredSfixed32       *int32                 `protobuf:"fixed32,308,req,name=required_sfixed32,json=requiredSfixed32" json:"required_sfixed32,omitempty"`
-	RequiredFloat          *float32               `protobuf:"fixed32,309,req,name=required_float,json=requiredFloat" json:"required_float,omitempty"`
-	RequiredFixed64        *uint64                `protobuf:"fixed64,310,req,name=required_fixed64,json=requiredFixed64" json:"required_fixed64,omitempty"`
-	RequiredSfixed64       *int64                 `protobuf:"fixed64,311,req,name=required_sfixed64,json=requiredSfixed64" json:"required_sfixed64,omitempty"`
-	RequiredDouble         *float64               `protobuf:"fixed64,312,req,name=required_double,json=requiredDouble" json:"required_double,omitempty"`
-	RequiredString         *string                `protobuf:"bytes,313,req,name=required_string,json=requiredString" json:"required_string,omitempty"`
-	RequiredBytes          []byte                 `protobuf:"bytes,314,req,name=required_bytes,json=requiredBytes" json:"required_bytes,omitempty"`
-	RequiredChildEnum      *Message_ChildEnum     `protobuf:"varint,315,req,name=required_child_enum,json=requiredChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum" json:"required_child_enum,omitempty"`
-	RequiredChildMessage   *Message_ChildMessage  `protobuf:"bytes,316,req,name=required_child_message,json=requiredChildMessage" json:"required_child_message,omitempty"`
-	RequiredNamedGroup     *Message_NamedGroup    `protobuf:"bytes,317,req,name=required_named_group,json=requiredNamedGroup" json:"required_named_group,omitempty"`
-	RequiredSiblingEnum    *SiblingEnum           `protobuf:"varint,318,req,name=required_sibling_enum,json=requiredSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum" json:"required_sibling_enum,omitempty"`
-	RequiredSiblingMessage *SiblingMessage        `protobuf:"bytes,319,req,name=required_sibling_message,json=requiredSiblingMessage" json:"required_sibling_message,omitempty"`
-	Requiredgroup          *Message_RequiredGroup `protobuf:"group,320,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	// Required default fields.
-	RequiredDefaultedBool        *bool              `protobuf:"varint,400,req,name=required_defaulted_bool,json=requiredDefaultedBool,def=1" json:"required_defaulted_bool,omitempty"`
-	RequiredDefaultedInt32       *int32             `protobuf:"varint,401,req,name=required_defaulted_int32,json=requiredDefaultedInt32,def=-12345" json:"required_defaulted_int32,omitempty"`
-	RequiredDefaultedSint32      *int32             `protobuf:"zigzag32,402,req,name=required_defaulted_sint32,json=requiredDefaultedSint32,def=-3200" json:"required_defaulted_sint32,omitempty"`
-	RequiredDefaultedUint32      *uint32            `protobuf:"varint,403,req,name=required_defaulted_uint32,json=requiredDefaultedUint32,def=3200" json:"required_defaulted_uint32,omitempty"`
-	RequiredDefaultedInt64       *int64             `protobuf:"varint,404,req,name=required_defaulted_int64,json=requiredDefaultedInt64,def=-123456789" json:"required_defaulted_int64,omitempty"`
-	RequiredDefaultedSint64      *int64             `protobuf:"zigzag64,405,req,name=required_defaulted_sint64,json=requiredDefaultedSint64,def=-6400" json:"required_defaulted_sint64,omitempty"`
-	RequiredDefaultedUint64      *uint64            `protobuf:"varint,406,req,name=required_defaulted_uint64,json=requiredDefaultedUint64,def=6400" json:"required_defaulted_uint64,omitempty"`
-	RequiredDefaultedFixed32     *uint32            `protobuf:"fixed32,407,req,name=required_defaulted_fixed32,json=requiredDefaultedFixed32,def=320000" json:"required_defaulted_fixed32,omitempty"`
-	RequiredDefaultedSfixed32    *int32             `protobuf:"fixed32,408,req,name=required_defaulted_sfixed32,json=requiredDefaultedSfixed32,def=-320000" json:"required_defaulted_sfixed32,omitempty"`
-	RequiredDefaultedFloat       *float32           `protobuf:"fixed32,409,req,name=required_defaulted_float,json=requiredDefaultedFloat,def=3.14159" json:"required_defaulted_float,omitempty"`
-	RequiredDefaultedFixed64     *uint64            `protobuf:"fixed64,410,req,name=required_defaulted_fixed64,json=requiredDefaultedFixed64,def=640000" json:"required_defaulted_fixed64,omitempty"`
-	RequiredDefaultedSfixed64    *int64             `protobuf:"fixed64,411,req,name=required_defaulted_sfixed64,json=requiredDefaultedSfixed64,def=-640000" json:"required_defaulted_sfixed64,omitempty"`
-	RequiredDefaultedDouble      *float64           `protobuf:"fixed64,412,req,name=required_defaulted_double,json=requiredDefaultedDouble,def=3.14159265359" json:"required_defaulted_double,omitempty"`
-	RequiredDefaultedString      *string            `protobuf:"bytes,413,req,name=required_defaulted_string,json=requiredDefaultedString,def=hello, \"world!\"\n" json:"required_defaulted_string,omitempty"`
-	RequiredDefaultedBytes       []byte             `protobuf:"bytes,414,req,name=required_defaulted_bytes,json=requiredDefaultedBytes,def=dead\\336\\255\\276\\357beef" json:"required_defaulted_bytes,omitempty"`
-	RequiredDefaultedChildEnum   *Message_ChildEnum `protobuf:"varint,415,req,name=required_defaulted_child_enum,json=requiredDefaultedChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum,def=0" json:"required_defaulted_child_enum,omitempty"`
-	RequiredDefaultedSiblingEnum *SiblingEnum       `protobuf:"varint,416,req,name=required_defaulted_sibling_enum,json=requiredDefaultedSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum,def=0" json:"required_defaulted_sibling_enum,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                   `protobuf:"varint,500,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                  `protobuf:"varint,501,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                  `protobuf:"zigzag32,502,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                 `protobuf:"varint,503,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                  `protobuf:"varint,504,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                  `protobuf:"zigzag64,505,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                 `protobuf:"varint,506,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                 `protobuf:"fixed32,507,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                  `protobuf:"fixed32,508,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32                `protobuf:"fixed32,509,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                 `protobuf:"fixed64,510,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                  `protobuf:"fixed64,511,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64                `protobuf:"fixed64,512,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                 `protobuf:"bytes,513,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                 `protobuf:"bytes,514,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum      `protobuf:"varint,515,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage  `protobuf:"bytes,516,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedNamedGroup     []*Message_NamedGroup    `protobuf:"bytes,517,rep,name=repeated_named_group,json=repeatedNamedGroup" json:"repeated_named_group,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum            `protobuf:"varint,518,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage        `protobuf:"bytes,519,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	Repeatedgroup          []*Message_RepeatedGroup `protobuf:"group,520,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,600,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,601,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,602,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,603,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,604,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,605,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,606,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,607,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,608,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,609,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,610,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,611,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,612,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,613,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,614,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,615,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20190205.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,616,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolNamedGroup     map[bool]*Message_NamedGroup   `protobuf:"bytes,617,rep,name=map_bool_named_group,json=mapBoolNamedGroup" json:"map_bool_named_group,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,618,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto2_20190205.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,619,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,620,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,621,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,622,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,623,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,624,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,625,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,626,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,627,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofNamedGroup
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_Oneofgroup
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	// Oneof default fields.
-	//
-	// Types that are valid to be assigned to OneofDefaultedUnion:
-	//	*Message_OneofDefaultedBool
-	//	*Message_OneofDefaultedInt32
-	//	*Message_OneofDefaultedSint32
-	//	*Message_OneofDefaultedUint32
-	//	*Message_OneofDefaultedInt64
-	//	*Message_OneofDefaultedSint64
-	//	*Message_OneofDefaultedUint64
-	//	*Message_OneofDefaultedFixed32
-	//	*Message_OneofDefaultedSfixed32
-	//	*Message_OneofDefaultedFloat
-	//	*Message_OneofDefaultedFixed64
-	//	*Message_OneofDefaultedSfixed64
-	//	*Message_OneofDefaultedDouble
-	//	*Message_OneofDefaultedString
-	//	*Message_OneofDefaultedBytes
-	//	*Message_OneofDefaultedChildEnum
-	//	*Message_OneofDefaultedSiblingEnum
-	OneofDefaultedUnion          isMessage_OneofDefaultedUnion `protobuf_oneof:"oneof_defaulted_union"`
-	XXX_NoUnkeyedLiteral         struct{}                      `json:"-"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-	XXX_sizecache                int32  `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1}
-}
-
-var extRange_Message = []proto.ExtensionRange{
-	{Start: 10000, End: 536870911},
-}
-
-func (*Message) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Message
-}
-
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (m *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(m, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-const Default_Message_DefaultedBool bool = true
-const Default_Message_DefaultedInt32 int32 = -12345
-const Default_Message_DefaultedSint32 int32 = -3200
-const Default_Message_DefaultedUint32 uint32 = 3200
-const Default_Message_DefaultedInt64 int64 = -123456789
-const Default_Message_DefaultedSint64 int64 = -6400
-const Default_Message_DefaultedUint64 uint64 = 6400
-const Default_Message_DefaultedFixed32 uint32 = 320000
-const Default_Message_DefaultedSfixed32 int32 = -320000
-const Default_Message_DefaultedFloat float32 = 3.14159
-const Default_Message_DefaultedFixed64 uint64 = 640000
-const Default_Message_DefaultedSfixed64 int64 = -640000
-const Default_Message_DefaultedDouble float64 = 3.14159265359
-const Default_Message_DefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_DefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_DefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_DefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_RequiredDefaultedBool bool = true
-const Default_Message_RequiredDefaultedInt32 int32 = -12345
-const Default_Message_RequiredDefaultedSint32 int32 = -3200
-const Default_Message_RequiredDefaultedUint32 uint32 = 3200
-const Default_Message_RequiredDefaultedInt64 int64 = -123456789
-const Default_Message_RequiredDefaultedSint64 int64 = -6400
-const Default_Message_RequiredDefaultedUint64 uint64 = 6400
-const Default_Message_RequiredDefaultedFixed32 uint32 = 320000
-const Default_Message_RequiredDefaultedSfixed32 int32 = -320000
-const Default_Message_RequiredDefaultedFloat float32 = 3.14159
-const Default_Message_RequiredDefaultedFixed64 uint64 = 640000
-const Default_Message_RequiredDefaultedSfixed64 int64 = -640000
-const Default_Message_RequiredDefaultedDouble float64 = 3.14159265359
-const Default_Message_RequiredDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_RequiredDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_RequiredDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_RequiredDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-const Default_Message_OneofDefaultedBool bool = true
-const Default_Message_OneofDefaultedInt32 int32 = -12345
-const Default_Message_OneofDefaultedSint32 int32 = -3200
-const Default_Message_OneofDefaultedUint32 uint32 = 3200
-const Default_Message_OneofDefaultedInt64 int64 = -123456789
-const Default_Message_OneofDefaultedSint64 int64 = -6400
-const Default_Message_OneofDefaultedUint64 uint64 = 6400
-const Default_Message_OneofDefaultedFixed32 uint32 = 320000
-const Default_Message_OneofDefaultedSfixed32 int32 = -320000
-const Default_Message_OneofDefaultedFloat float32 = 3.14159
-const Default_Message_OneofDefaultedFixed64 uint64 = 640000
-const Default_Message_OneofDefaultedSfixed64 int64 = -640000
-const Default_Message_OneofDefaultedDouble float64 = 3.14159265359
-const Default_Message_OneofDefaultedString string = "hello, \"world!\"\n"
-
-var Default_Message_OneofDefaultedBytes []byte = []byte("deadޭ\xbe\xefbeef")
-
-const Default_Message_OneofDefaultedChildEnum Message_ChildEnum = Message_ALPHA
-const Default_Message_OneofDefaultedSiblingEnum SiblingEnum = SiblingEnum_ALPHA
-
-func (m *Message) GetNamedgroup() *Message_NamedGroup {
-	if m != nil {
-		return m.Namedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil && m.OptionalBool != nil {
-		return *m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil && m.OptionalInt32 != nil {
-		return *m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil && m.OptionalSint32 != nil {
-		return *m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil && m.OptionalUint32 != nil {
-		return *m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil && m.OptionalInt64 != nil {
-		return *m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil && m.OptionalSint64 != nil {
-		return *m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil && m.OptionalUint64 != nil {
-		return *m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil && m.OptionalFixed32 != nil {
-		return *m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil && m.OptionalSfixed32 != nil {
-		return *m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil && m.OptionalFloat != nil {
-		return *m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil && m.OptionalFixed64 != nil {
-		return *m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil && m.OptionalSfixed64 != nil {
-		return *m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil && m.OptionalDouble != nil {
-		return *m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil && m.OptionalString != nil {
-		return *m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil && m.OptionalChildEnum != nil {
-		return *m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.OptionalNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil && m.OptionalSiblingEnum != nil {
-		return *m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalgroup() *Message_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-func (m *Message) GetDefaultedBool() bool {
-	if m != nil && m.DefaultedBool != nil {
-		return *m.DefaultedBool
-	}
-	return Default_Message_DefaultedBool
-}
-
-func (m *Message) GetDefaultedInt32() int32 {
-	if m != nil && m.DefaultedInt32 != nil {
-		return *m.DefaultedInt32
-	}
-	return Default_Message_DefaultedInt32
-}
-
-func (m *Message) GetDefaultedSint32() int32 {
-	if m != nil && m.DefaultedSint32 != nil {
-		return *m.DefaultedSint32
-	}
-	return Default_Message_DefaultedSint32
-}
-
-func (m *Message) GetDefaultedUint32() uint32 {
-	if m != nil && m.DefaultedUint32 != nil {
-		return *m.DefaultedUint32
-	}
-	return Default_Message_DefaultedUint32
-}
-
-func (m *Message) GetDefaultedInt64() int64 {
-	if m != nil && m.DefaultedInt64 != nil {
-		return *m.DefaultedInt64
-	}
-	return Default_Message_DefaultedInt64
-}
-
-func (m *Message) GetDefaultedSint64() int64 {
-	if m != nil && m.DefaultedSint64 != nil {
-		return *m.DefaultedSint64
-	}
-	return Default_Message_DefaultedSint64
-}
-
-func (m *Message) GetDefaultedUint64() uint64 {
-	if m != nil && m.DefaultedUint64 != nil {
-		return *m.DefaultedUint64
-	}
-	return Default_Message_DefaultedUint64
-}
-
-func (m *Message) GetDefaultedFixed32() uint32 {
-	if m != nil && m.DefaultedFixed32 != nil {
-		return *m.DefaultedFixed32
-	}
-	return Default_Message_DefaultedFixed32
-}
-
-func (m *Message) GetDefaultedSfixed32() int32 {
-	if m != nil && m.DefaultedSfixed32 != nil {
-		return *m.DefaultedSfixed32
-	}
-	return Default_Message_DefaultedSfixed32
-}
-
-func (m *Message) GetDefaultedFloat() float32 {
-	if m != nil && m.DefaultedFloat != nil {
-		return *m.DefaultedFloat
-	}
-	return Default_Message_DefaultedFloat
-}
-
-func (m *Message) GetDefaultedFixed64() uint64 {
-	if m != nil && m.DefaultedFixed64 != nil {
-		return *m.DefaultedFixed64
-	}
-	return Default_Message_DefaultedFixed64
-}
-
-func (m *Message) GetDefaultedSfixed64() int64 {
-	if m != nil && m.DefaultedSfixed64 != nil {
-		return *m.DefaultedSfixed64
-	}
-	return Default_Message_DefaultedSfixed64
-}
-
-func (m *Message) GetDefaultedDouble() float64 {
-	if m != nil && m.DefaultedDouble != nil {
-		return *m.DefaultedDouble
-	}
-	return Default_Message_DefaultedDouble
-}
-
-func (m *Message) GetDefaultedString() string {
-	if m != nil && m.DefaultedString != nil {
-		return *m.DefaultedString
-	}
-	return Default_Message_DefaultedString
-}
-
-func (m *Message) GetDefaultedBytes() []byte {
-	if m != nil && m.DefaultedBytes != nil {
-		return m.DefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_DefaultedBytes...)
-}
-
-func (m *Message) GetDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.DefaultedChildEnum != nil {
-		return *m.DefaultedChildEnum
-	}
-	return Default_Message_DefaultedChildEnum
-}
-
-func (m *Message) GetDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.DefaultedSiblingEnum != nil {
-		return *m.DefaultedSiblingEnum
-	}
-	return Default_Message_DefaultedSiblingEnum
-}
-
-func (m *Message) GetRequiredBool() bool {
-	if m != nil && m.RequiredBool != nil {
-		return *m.RequiredBool
-	}
-	return false
-}
-
-func (m *Message) GetRequiredInt32() int32 {
-	if m != nil && m.RequiredInt32 != nil {
-		return *m.RequiredInt32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint32() int32 {
-	if m != nil && m.RequiredSint32 != nil {
-		return *m.RequiredSint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint32() uint32 {
-	if m != nil && m.RequiredUint32 != nil {
-		return *m.RequiredUint32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredInt64() int64 {
-	if m != nil && m.RequiredInt64 != nil {
-		return *m.RequiredInt64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSint64() int64 {
-	if m != nil && m.RequiredSint64 != nil {
-		return *m.RequiredSint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredUint64() uint64 {
-	if m != nil && m.RequiredUint64 != nil {
-		return *m.RequiredUint64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed32() uint32 {
-	if m != nil && m.RequiredFixed32 != nil {
-		return *m.RequiredFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed32() int32 {
-	if m != nil && m.RequiredSfixed32 != nil {
-		return *m.RequiredSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFloat() float32 {
-	if m != nil && m.RequiredFloat != nil {
-		return *m.RequiredFloat
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredFixed64() uint64 {
-	if m != nil && m.RequiredFixed64 != nil {
-		return *m.RequiredFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredSfixed64() int64 {
-	if m != nil && m.RequiredSfixed64 != nil {
-		return *m.RequiredSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredDouble() float64 {
-	if m != nil && m.RequiredDouble != nil {
-		return *m.RequiredDouble
-	}
-	return 0
-}
-
-func (m *Message) GetRequiredString() string {
-	if m != nil && m.RequiredString != nil {
-		return *m.RequiredString
-	}
-	return ""
-}
-
-func (m *Message) GetRequiredBytes() []byte {
-	if m != nil {
-		return m.RequiredBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredChildEnum != nil {
-		return *m.RequiredChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetRequiredChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.RequiredChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredNamedGroup() *Message_NamedGroup {
-	if m != nil {
-		return m.RequiredNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredSiblingEnum != nil {
-		return *m.RequiredSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetRequiredSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.RequiredSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredgroup() *Message_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *Message) GetRequiredDefaultedBool() bool {
-	if m != nil && m.RequiredDefaultedBool != nil {
-		return *m.RequiredDefaultedBool
-	}
-	return Default_Message_RequiredDefaultedBool
-}
-
-func (m *Message) GetRequiredDefaultedInt32() int32 {
-	if m != nil && m.RequiredDefaultedInt32 != nil {
-		return *m.RequiredDefaultedInt32
-	}
-	return Default_Message_RequiredDefaultedInt32
-}
-
-func (m *Message) GetRequiredDefaultedSint32() int32 {
-	if m != nil && m.RequiredDefaultedSint32 != nil {
-		return *m.RequiredDefaultedSint32
-	}
-	return Default_Message_RequiredDefaultedSint32
-}
-
-func (m *Message) GetRequiredDefaultedUint32() uint32 {
-	if m != nil && m.RequiredDefaultedUint32 != nil {
-		return *m.RequiredDefaultedUint32
-	}
-	return Default_Message_RequiredDefaultedUint32
-}
-
-func (m *Message) GetRequiredDefaultedInt64() int64 {
-	if m != nil && m.RequiredDefaultedInt64 != nil {
-		return *m.RequiredDefaultedInt64
-	}
-	return Default_Message_RequiredDefaultedInt64
-}
-
-func (m *Message) GetRequiredDefaultedSint64() int64 {
-	if m != nil && m.RequiredDefaultedSint64 != nil {
-		return *m.RequiredDefaultedSint64
-	}
-	return Default_Message_RequiredDefaultedSint64
-}
-
-func (m *Message) GetRequiredDefaultedUint64() uint64 {
-	if m != nil && m.RequiredDefaultedUint64 != nil {
-		return *m.RequiredDefaultedUint64
-	}
-	return Default_Message_RequiredDefaultedUint64
-}
-
-func (m *Message) GetRequiredDefaultedFixed32() uint32 {
-	if m != nil && m.RequiredDefaultedFixed32 != nil {
-		return *m.RequiredDefaultedFixed32
-	}
-	return Default_Message_RequiredDefaultedFixed32
-}
-
-func (m *Message) GetRequiredDefaultedSfixed32() int32 {
-	if m != nil && m.RequiredDefaultedSfixed32 != nil {
-		return *m.RequiredDefaultedSfixed32
-	}
-	return Default_Message_RequiredDefaultedSfixed32
-}
-
-func (m *Message) GetRequiredDefaultedFloat() float32 {
-	if m != nil && m.RequiredDefaultedFloat != nil {
-		return *m.RequiredDefaultedFloat
-	}
-	return Default_Message_RequiredDefaultedFloat
-}
-
-func (m *Message) GetRequiredDefaultedFixed64() uint64 {
-	if m != nil && m.RequiredDefaultedFixed64 != nil {
-		return *m.RequiredDefaultedFixed64
-	}
-	return Default_Message_RequiredDefaultedFixed64
-}
-
-func (m *Message) GetRequiredDefaultedSfixed64() int64 {
-	if m != nil && m.RequiredDefaultedSfixed64 != nil {
-		return *m.RequiredDefaultedSfixed64
-	}
-	return Default_Message_RequiredDefaultedSfixed64
-}
-
-func (m *Message) GetRequiredDefaultedDouble() float64 {
-	if m != nil && m.RequiredDefaultedDouble != nil {
-		return *m.RequiredDefaultedDouble
-	}
-	return Default_Message_RequiredDefaultedDouble
-}
-
-func (m *Message) GetRequiredDefaultedString() string {
-	if m != nil && m.RequiredDefaultedString != nil {
-		return *m.RequiredDefaultedString
-	}
-	return Default_Message_RequiredDefaultedString
-}
-
-func (m *Message) GetRequiredDefaultedBytes() []byte {
-	if m != nil && m.RequiredDefaultedBytes != nil {
-		return m.RequiredDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_RequiredDefaultedBytes...)
-}
-
-func (m *Message) GetRequiredDefaultedChildEnum() Message_ChildEnum {
-	if m != nil && m.RequiredDefaultedChildEnum != nil {
-		return *m.RequiredDefaultedChildEnum
-	}
-	return Default_Message_RequiredDefaultedChildEnum
-}
-
-func (m *Message) GetRequiredDefaultedSiblingEnum() SiblingEnum {
-	if m != nil && m.RequiredDefaultedSiblingEnum != nil {
-		return *m.RequiredDefaultedSiblingEnum
-	}
-	return Default_Message_RequiredDefaultedSiblingEnum
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedNamedGroup() []*Message_NamedGroup {
-	if m != nil {
-		return m.RepeatedNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedgroup() []*Message_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolNamedGroup() map[bool]*Message_NamedGroup {
-	if m != nil {
-		return m.MapBoolNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,700,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,701,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,702,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,703,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,704,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,705,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,706,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,707,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,708,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,709,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,710,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,711,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,712,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,713,opt,name=oneof_string,json=oneofString,oneof"`
-}
-
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,714,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,715,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum,oneof"`
-}
-
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,716,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-
-type Message_OneofNamedGroup struct {
-	OneofNamedGroup *Message_NamedGroup `protobuf:"bytes,717,opt,name=oneof_named_group,json=oneofNamedGroup,oneof"`
-}
-
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,718,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum,oneof"`
-}
-
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,719,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-
-type Message_Oneofgroup struct {
-	Oneofgroup *Message_OneofGroup `protobuf:"group,720,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,721,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,722,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,723,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofFloat) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofDouble) isMessage_OneofUnion() {}
-
-func (*Message_OneofString) isMessage_OneofUnion() {}
-
-func (*Message_OneofBytes) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofNamedGroup) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-
-func (*Message_Oneofgroup) isMessage_OneofUnion() {}
-
-func (*Message_OneofString1) isMessage_OneofUnion() {}
-
-func (*Message_OneofString2) isMessage_OneofUnion() {}
-
-func (*Message_OneofString3) isMessage_OneofUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofNamedGroup() *Message_NamedGroup {
-	if x, ok := m.GetOneofUnion().(*Message_OneofNamedGroup); ok {
-		return x.OneofNamedGroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofgroup() *Message_OneofGroup {
-	if x, ok := m.GetOneofUnion().(*Message_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-type isMessage_OneofDefaultedUnion interface {
-	isMessage_OneofDefaultedUnion()
-}
-
-type Message_OneofDefaultedBool struct {
-	OneofDefaultedBool bool `protobuf:"varint,800,opt,name=oneof_defaulted_bool,json=oneofDefaultedBool,oneof,def=1"`
-}
-
-type Message_OneofDefaultedInt32 struct {
-	OneofDefaultedInt32 int32 `protobuf:"varint,801,opt,name=oneof_defaulted_int32,json=oneofDefaultedInt32,oneof,def=-12345"`
-}
-
-type Message_OneofDefaultedSint32 struct {
-	OneofDefaultedSint32 int32 `protobuf:"zigzag32,802,opt,name=oneof_defaulted_sint32,json=oneofDefaultedSint32,oneof,def=-3200"`
-}
-
-type Message_OneofDefaultedUint32 struct {
-	OneofDefaultedUint32 uint32 `protobuf:"varint,803,opt,name=oneof_defaulted_uint32,json=oneofDefaultedUint32,oneof,def=3200"`
-}
-
-type Message_OneofDefaultedInt64 struct {
-	OneofDefaultedInt64 int64 `protobuf:"varint,804,opt,name=oneof_defaulted_int64,json=oneofDefaultedInt64,oneof,def=-123456789"`
-}
-
-type Message_OneofDefaultedSint64 struct {
-	OneofDefaultedSint64 int64 `protobuf:"zigzag64,805,opt,name=oneof_defaulted_sint64,json=oneofDefaultedSint64,oneof,def=-6400"`
-}
-
-type Message_OneofDefaultedUint64 struct {
-	OneofDefaultedUint64 uint64 `protobuf:"varint,806,opt,name=oneof_defaulted_uint64,json=oneofDefaultedUint64,oneof,def=6400"`
-}
-
-type Message_OneofDefaultedFixed32 struct {
-	OneofDefaultedFixed32 uint32 `protobuf:"fixed32,807,opt,name=oneof_defaulted_fixed32,json=oneofDefaultedFixed32,oneof,def=320000"`
-}
-
-type Message_OneofDefaultedSfixed32 struct {
-	OneofDefaultedSfixed32 int32 `protobuf:"fixed32,808,opt,name=oneof_defaulted_sfixed32,json=oneofDefaultedSfixed32,oneof,def=-320000"`
-}
-
-type Message_OneofDefaultedFloat struct {
-	OneofDefaultedFloat float32 `protobuf:"fixed32,809,opt,name=oneof_defaulted_float,json=oneofDefaultedFloat,oneof,def=3.14159"`
-}
-
-type Message_OneofDefaultedFixed64 struct {
-	OneofDefaultedFixed64 uint64 `protobuf:"fixed64,810,opt,name=oneof_defaulted_fixed64,json=oneofDefaultedFixed64,oneof,def=640000"`
-}
-
-type Message_OneofDefaultedSfixed64 struct {
-	OneofDefaultedSfixed64 int64 `protobuf:"fixed64,811,opt,name=oneof_defaulted_sfixed64,json=oneofDefaultedSfixed64,oneof,def=-640000"`
-}
-
-type Message_OneofDefaultedDouble struct {
-	OneofDefaultedDouble float64 `protobuf:"fixed64,812,opt,name=oneof_defaulted_double,json=oneofDefaultedDouble,oneof,def=3.14159265359"`
-}
-
-type Message_OneofDefaultedString struct {
-	OneofDefaultedString string `protobuf:"bytes,813,opt,name=oneof_defaulted_string,json=oneofDefaultedString,oneof,def=hello, \"world!\"\n"`
-}
-
-type Message_OneofDefaultedBytes struct {
-	OneofDefaultedBytes []byte `protobuf:"bytes,814,opt,name=oneof_defaulted_bytes,json=oneofDefaultedBytes,oneof,def=dead\\336\\255\\276\\357beef"`
-}
-
-type Message_OneofDefaultedChildEnum struct {
-	OneofDefaultedChildEnum Message_ChildEnum `protobuf:"varint,815,opt,name=oneof_defaulted_child_enum,json=oneofDefaultedChildEnum,enum=google.golang.org.proto2_20190205.Message_ChildEnum,oneof,def=0"`
-}
-
-type Message_OneofDefaultedSiblingEnum struct {
-	OneofDefaultedSiblingEnum SiblingEnum `protobuf:"varint,816,opt,name=oneof_defaulted_sibling_enum,json=oneofDefaultedSiblingEnum,enum=google.golang.org.proto2_20190205.SiblingEnum,oneof,def=0"`
-}
-
-func (*Message_OneofDefaultedBool) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedInt32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSint32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedUint32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedInt64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSint64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedUint64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFixed32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSfixed32) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFloat) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedFixed64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSfixed64) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedDouble) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedString) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedBytes) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedChildEnum) isMessage_OneofDefaultedUnion() {}
-
-func (*Message_OneofDefaultedSiblingEnum) isMessage_OneofDefaultedUnion() {}
-
-func (m *Message) GetOneofDefaultedUnion() isMessage_OneofDefaultedUnion {
-	if m != nil {
-		return m.OneofDefaultedUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofDefaultedBool() bool {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBool); ok {
-		return x.OneofDefaultedBool
-	}
-	return Default_Message_OneofDefaultedBool
-}
-
-func (m *Message) GetOneofDefaultedInt32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt32); ok {
-		return x.OneofDefaultedInt32
-	}
-	return Default_Message_OneofDefaultedInt32
-}
-
-func (m *Message) GetOneofDefaultedSint32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint32); ok {
-		return x.OneofDefaultedSint32
-	}
-	return Default_Message_OneofDefaultedSint32
-}
-
-func (m *Message) GetOneofDefaultedUint32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint32); ok {
-		return x.OneofDefaultedUint32
-	}
-	return Default_Message_OneofDefaultedUint32
-}
-
-func (m *Message) GetOneofDefaultedInt64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedInt64); ok {
-		return x.OneofDefaultedInt64
-	}
-	return Default_Message_OneofDefaultedInt64
-}
-
-func (m *Message) GetOneofDefaultedSint64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSint64); ok {
-		return x.OneofDefaultedSint64
-	}
-	return Default_Message_OneofDefaultedSint64
-}
-
-func (m *Message) GetOneofDefaultedUint64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedUint64); ok {
-		return x.OneofDefaultedUint64
-	}
-	return Default_Message_OneofDefaultedUint64
-}
-
-func (m *Message) GetOneofDefaultedFixed32() uint32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed32); ok {
-		return x.OneofDefaultedFixed32
-	}
-	return Default_Message_OneofDefaultedFixed32
-}
-
-func (m *Message) GetOneofDefaultedSfixed32() int32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed32); ok {
-		return x.OneofDefaultedSfixed32
-	}
-	return Default_Message_OneofDefaultedSfixed32
-}
-
-func (m *Message) GetOneofDefaultedFloat() float32 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFloat); ok {
-		return x.OneofDefaultedFloat
-	}
-	return Default_Message_OneofDefaultedFloat
-}
-
-func (m *Message) GetOneofDefaultedFixed64() uint64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedFixed64); ok {
-		return x.OneofDefaultedFixed64
-	}
-	return Default_Message_OneofDefaultedFixed64
-}
-
-func (m *Message) GetOneofDefaultedSfixed64() int64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSfixed64); ok {
-		return x.OneofDefaultedSfixed64
-	}
-	return Default_Message_OneofDefaultedSfixed64
-}
-
-func (m *Message) GetOneofDefaultedDouble() float64 {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedDouble); ok {
-		return x.OneofDefaultedDouble
-	}
-	return Default_Message_OneofDefaultedDouble
-}
-
-func (m *Message) GetOneofDefaultedString() string {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedString); ok {
-		return x.OneofDefaultedString
-	}
-	return Default_Message_OneofDefaultedString
-}
-
-func (m *Message) GetOneofDefaultedBytes() []byte {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedBytes); ok {
-		return x.OneofDefaultedBytes
-	}
-	return append([]byte(nil), Default_Message_OneofDefaultedBytes...)
-}
-
-func (m *Message) GetOneofDefaultedChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedChildEnum); ok {
-		return x.OneofDefaultedChildEnum
-	}
-	return Default_Message_OneofDefaultedChildEnum
-}
-
-func (m *Message) GetOneofDefaultedSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofDefaultedUnion().(*Message_OneofDefaultedSiblingEnum); ok {
-		return x.OneofDefaultedSiblingEnum
-	}
-	return Default_Message_OneofDefaultedSiblingEnum
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Message) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofNamedGroup)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_Oneofgroup)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-		(*Message_OneofDefaultedBool)(nil),
-		(*Message_OneofDefaultedInt32)(nil),
-		(*Message_OneofDefaultedSint32)(nil),
-		(*Message_OneofDefaultedUint32)(nil),
-		(*Message_OneofDefaultedInt64)(nil),
-		(*Message_OneofDefaultedSint64)(nil),
-		(*Message_OneofDefaultedUint64)(nil),
-		(*Message_OneofDefaultedFixed32)(nil),
-		(*Message_OneofDefaultedSfixed32)(nil),
-		(*Message_OneofDefaultedFloat)(nil),
-		(*Message_OneofDefaultedFixed64)(nil),
-		(*Message_OneofDefaultedSfixed64)(nil),
-		(*Message_OneofDefaultedDouble)(nil),
-		(*Message_OneofDefaultedString)(nil),
-		(*Message_OneofDefaultedBytes)(nil),
-		(*Message_OneofDefaultedChildEnum)(nil),
-		(*Message_OneofDefaultedSiblingEnum)(nil),
-	}
-}
-
-var E_Message_ExtensionOptionalBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         10000,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_bool",
-	Tag:           "varint,10000,opt,name=extension_optional_bool",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10001,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_int32",
-	Tag:           "varint,10001,opt,name=extension_optional_int32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10002,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sint32",
-	Tag:           "zigzag32,10002,opt,name=extension_optional_sint32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10003,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_uint32",
-	Tag:           "varint,10003,opt,name=extension_optional_uint32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10004,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_int64",
-	Tag:           "varint,10004,opt,name=extension_optional_int64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10005,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sint64",
-	Tag:           "zigzag64,10005,opt,name=extension_optional_sint64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10006,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_uint64",
-	Tag:           "varint,10006,opt,name=extension_optional_uint64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         10007,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_fixed32",
-	Tag:           "fixed32,10007,opt,name=extension_optional_fixed32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         10008,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sfixed32",
-	Tag:           "fixed32,10008,opt,name=extension_optional_sfixed32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         10009,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_float",
-	Tag:           "fixed32,10009,opt,name=extension_optional_float",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         10010,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_fixed64",
-	Tag:           "fixed64,10010,opt,name=extension_optional_fixed64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         10011,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sfixed64",
-	Tag:           "fixed64,10011,opt,name=extension_optional_sfixed64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         10012,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_double",
-	Tag:           "fixed64,10012,opt,name=extension_optional_double",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         10013,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_string",
-	Tag:           "bytes,10013,opt,name=extension_optional_string",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         10014,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_bytes",
-	Tag:           "bytes,10014,opt,name=extension_optional_bytes",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         10015,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_child_enum",
-	Tag:           "varint,10015,opt,name=extension_optional_child_enum,enum=google.golang.org.proto2_20190205.Message_ChildEnum",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildMessage)(nil),
-	Field:         10016,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_child_message",
-	Tag:           "bytes,10016,opt,name=extension_optional_child_message",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_NamedGroup)(nil),
-	Field:         10017,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_named_group",
-	Tag:           "bytes,10017,opt,name=extension_optional_named_group",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         10018,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sibling_enum",
-	Tag:           "varint,10018,opt,name=extension_optional_sibling_enum,enum=google.golang.org.proto2_20190205.SiblingEnum",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionOptionalSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingMessage)(nil),
-	Field:         10019,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_optional_sibling_message",
-	Tag:           "bytes,10019,opt,name=extension_optional_sibling_message",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_Extensionoptionalgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ExtensionOptionalGroup)(nil),
-	Field:         10020,
-	Name:          "google.golang.org.proto2_20190205.Message.extensionoptionalgroup",
-	Tag:           "group,10020,opt,name=ExtensionOptionalGroup",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         20000,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_bool",
-	Tag:           "varint,20000,opt,name=extension_defaulted_bool,def=1",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20001,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_int32",
-	Tag:           "varint,20001,opt,name=extension_defaulted_int32,def=-12345",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20002,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_sint32",
-	Tag:           "zigzag32,20002,opt,name=extension_defaulted_sint32,def=-3200",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20003,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_uint32",
-	Tag:           "varint,20003,opt,name=extension_defaulted_uint32,def=3200",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20004,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_int64",
-	Tag:           "varint,20004,opt,name=extension_defaulted_int64,def=-123456789",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20005,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_sint64",
-	Tag:           "zigzag64,20005,opt,name=extension_defaulted_sint64,def=-6400",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20006,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_uint64",
-	Tag:           "varint,20006,opt,name=extension_defaulted_uint64,def=6400",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         20007,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_fixed32",
-	Tag:           "fixed32,20007,opt,name=extension_defaulted_fixed32,def=320000",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         20008,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_sfixed32",
-	Tag:           "fixed32,20008,opt,name=extension_defaulted_sfixed32,def=-320000",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         20009,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_float",
-	Tag:           "fixed32,20009,opt,name=extension_defaulted_float,def=3.14159",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         20010,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_fixed64",
-	Tag:           "fixed64,20010,opt,name=extension_defaulted_fixed64,def=640000",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         20011,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_sfixed64",
-	Tag:           "fixed64,20011,opt,name=extension_defaulted_sfixed64,def=-640000",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         20012,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_double",
-	Tag:           "fixed64,20012,opt,name=extension_defaulted_double,def=3.14159265359",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         20013,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_string",
-	Tag:           "bytes,20013,opt,name=extension_defaulted_string,def=hello, \"world!\"\n",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         20014,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_bytes",
-	Tag:           "bytes,20014,opt,name=extension_defaulted_bytes,def=dead\\336\\255\\276\\357beef",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*Message_ChildEnum)(nil),
-	Field:         20015,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_child_enum",
-	Tag:           "varint,20015,opt,name=extension_defaulted_child_enum,enum=google.golang.org.proto2_20190205.Message_ChildEnum,def=0",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionDefaultedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: (*SiblingEnum)(nil),
-	Field:         20016,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_defaulted_sibling_enum",
-	Tag:           "varint,20016,opt,name=extension_defaulted_sibling_enum,enum=google.golang.org.proto2_20190205.SiblingEnum,def=0",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBool = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]bool)(nil),
-	Field:         30000,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_bool",
-	Tag:           "varint,30000,rep,name=extension_repeated_bool",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30001,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_int32",
-	Tag:           "varint,30001,rep,name=extension_repeated_int32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30002,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sint32",
-	Tag:           "zigzag32,30002,rep,name=extension_repeated_sint32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30003,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_uint32",
-	Tag:           "varint,30003,rep,name=extension_repeated_uint32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30004,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_int64",
-	Tag:           "varint,30004,rep,name=extension_repeated_int64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30005,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sint64",
-	Tag:           "zigzag64,30005,rep,name=extension_repeated_sint64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30006,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_uint64",
-	Tag:           "varint,30006,rep,name=extension_repeated_uint64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint32)(nil),
-	Field:         30007,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_fixed32",
-	Tag:           "fixed32,30007,rep,name=extension_repeated_fixed32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int32)(nil),
-	Field:         30008,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sfixed32",
-	Tag:           "fixed32,30008,rep,name=extension_repeated_sfixed32",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float32)(nil),
-	Field:         30009,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_float",
-	Tag:           "fixed32,30009,rep,name=extension_repeated_float",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]uint64)(nil),
-	Field:         30010,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_fixed64",
-	Tag:           "fixed64,30010,rep,name=extension_repeated_fixed64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]int64)(nil),
-	Field:         30011,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sfixed64",
-	Tag:           "fixed64,30011,rep,name=extension_repeated_sfixed64",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]float64)(nil),
-	Field:         30012,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_double",
-	Tag:           "fixed64,30012,rep,name=extension_repeated_double",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedString = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         30013,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_string",
-	Tag:           "bytes,30013,rep,name=extension_repeated_string",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([][]byte)(nil),
-	Field:         30014,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_bytes",
-	Tag:           "bytes,30014,rep,name=extension_repeated_bytes",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]Message_ChildEnum)(nil),
-	Field:         30015,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_child_enum",
-	Tag:           "varint,30015,rep,name=extension_repeated_child_enum,enum=google.golang.org.proto2_20190205.Message_ChildEnum",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedChildMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ChildMessage)(nil),
-	Field:         30016,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_child_message",
-	Tag:           "bytes,30016,rep,name=extension_repeated_child_message",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedNamedGroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_NamedGroup)(nil),
-	Field:         30017,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_named_group",
-	Tag:           "bytes,30017,rep,name=extension_repeated_named_group",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]SiblingEnum)(nil),
-	Field:         30018,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sibling_enum",
-	Tag:           "varint,30018,rep,name=extension_repeated_sibling_enum,enum=google.golang.org.proto2_20190205.SiblingEnum",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_ExtensionRepeatedSiblingMessage = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*SiblingMessage)(nil),
-	Field:         30019,
-	Name:          "google.golang.org.proto2_20190205.Message.extension_repeated_sibling_message",
-	Tag:           "bytes,30019,rep,name=extension_repeated_sibling_message",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-var E_Message_Extensionrepeatedgroup = &proto.ExtensionDesc{
-	ExtendedType:  (*Message)(nil),
-	ExtensionType: ([]*Message_ExtensionRepeatedGroup)(nil),
-	Field:         30020,
-	Name:          "google.golang.org.proto2_20190205.Message.extensionrepeatedgroup",
-	Tag:           "group,30020,rep,name=ExtensionRepeatedGroup",
-	Filename:      "proto2_20190205_c823c79e/test.proto",
-}
-
-type Message_ChildMessage struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 0}
-}
-
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (m *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(m, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_NamedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	F4                   *Message `protobuf:"bytes,4,opt,name=f4" json:"f4,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_NamedGroup) Reset()         { *m = Message_NamedGroup{} }
-func (m *Message_NamedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_NamedGroup) ProtoMessage()    {}
-func (*Message_NamedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 1}
-}
-
-func (m *Message_NamedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_NamedGroup.Unmarshal(m, b)
-}
-func (m *Message_NamedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_NamedGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_NamedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_NamedGroup.Merge(m, src)
-}
-func (m *Message_NamedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_NamedGroup.Size(m)
-}
-func (m *Message_NamedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_NamedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_NamedGroup proto.InternalMessageInfo
-
-func (m *Message_NamedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_NamedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func (m *Message_NamedGroup) GetF4() *Message {
-	if m != nil {
-		return m.F4
-	}
-	return nil
-}
-
-type Message_OptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OptionalGroup) Reset()         { *m = Message_OptionalGroup{} }
-func (m *Message_OptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OptionalGroup) ProtoMessage()    {}
-func (*Message_OptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 2}
-}
-
-func (m *Message_OptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_OptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OptionalGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_OptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OptionalGroup.Merge(m, src)
-}
-func (m *Message_OptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OptionalGroup.Size(m)
-}
-func (m *Message_OptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OptionalGroup proto.InternalMessageInfo
-
-func (m *Message_OptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RequiredGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RequiredGroup) Reset()         { *m = Message_RequiredGroup{} }
-func (m *Message_RequiredGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RequiredGroup) ProtoMessage()    {}
-func (*Message_RequiredGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 3}
-}
-
-func (m *Message_RequiredGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RequiredGroup.Unmarshal(m, b)
-}
-func (m *Message_RequiredGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RequiredGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_RequiredGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RequiredGroup.Merge(m, src)
-}
-func (m *Message_RequiredGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RequiredGroup.Size(m)
-}
-func (m *Message_RequiredGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RequiredGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RequiredGroup proto.InternalMessageInfo
-
-func (m *Message_RequiredGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RequiredGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_RepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_RepeatedGroup) Reset()         { *m = Message_RepeatedGroup{} }
-func (m *Message_RepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_RepeatedGroup) ProtoMessage()    {}
-func (*Message_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 4}
-}
-
-func (m *Message_RepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_RepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_RepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_RepeatedGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_RepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_RepeatedGroup.Merge(m, src)
-}
-func (m *Message_RepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_RepeatedGroup.Size(m)
-}
-func (m *Message_RepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_RepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_RepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_RepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_RepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_OneofGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_OneofGroup) Reset()         { *m = Message_OneofGroup{} }
-func (m *Message_OneofGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_OneofGroup) ProtoMessage()    {}
-func (*Message_OneofGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 33}
-}
-
-func (m *Message_OneofGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_OneofGroup.Unmarshal(m, b)
-}
-func (m *Message_OneofGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_OneofGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_OneofGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_OneofGroup.Merge(m, src)
-}
-func (m *Message_OneofGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_OneofGroup.Size(m)
-}
-func (m *Message_OneofGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_OneofGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_OneofGroup proto.InternalMessageInfo
-
-func (m *Message_OneofGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_OneofGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionOptionalGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionOptionalGroup) Reset()         { *m = Message_ExtensionOptionalGroup{} }
-func (m *Message_ExtensionOptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionOptionalGroup) ProtoMessage()    {}
-func (*Message_ExtensionOptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 34}
-}
-
-func (m *Message_ExtensionOptionalGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.Merge(m, src)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionOptionalGroup.Size(m)
-}
-func (m *Message_ExtensionOptionalGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionOptionalGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionOptionalGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionOptionalGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionOptionalGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message_ExtensionRepeatedGroup struct {
-	F1                   *string  `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   *string  `protobuf:"bytes,2,req,name=f2" json:"f2,omitempty"`
-	F3                   []string `protobuf:"bytes,3,rep,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ExtensionRepeatedGroup) Reset()         { *m = Message_ExtensionRepeatedGroup{} }
-func (m *Message_ExtensionRepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*Message_ExtensionRepeatedGroup) ProtoMessage()    {}
-func (*Message_ExtensionRepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3a17e2c63b2b3424, []int{1, 35}
-}
-
-func (m *Message_ExtensionRepeatedGroup) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Unmarshal(m, b)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Marshal(b, m, deterministic)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.Merge(m, src)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_Size() int {
-	return xxx_messageInfo_Message_ExtensionRepeatedGroup.Size(m)
-}
-func (m *Message_ExtensionRepeatedGroup) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ExtensionRepeatedGroup.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ExtensionRepeatedGroup proto.InternalMessageInfo
-
-func (m *Message_ExtensionRepeatedGroup) GetF1() string {
-	if m != nil && m.F1 != nil {
-		return *m.F1
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF2() string {
-	if m != nil && m.F2 != nil {
-		return *m.F2
-	}
-	return ""
-}
-
-func (m *Message_ExtensionRepeatedGroup) GetF3() []string {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("google.golang.org.proto2_20190205.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto2_20190205.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto2_20190205.SiblingMessage")
-	proto.RegisterExtension(E_Message_ExtensionOptionalBool)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalInt64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalUint64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFloat)
-	proto.RegisterExtension(E_Message_ExtensionOptionalFixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionOptionalDouble)
-	proto.RegisterExtension(E_Message_ExtensionOptionalString)
-	proto.RegisterExtension(E_Message_ExtensionOptionalBytes)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionOptionalNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionOptionalSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionoptionalgroup)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBool)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedInt64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedUint64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFloat)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedDouble)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedString)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedBytes)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionDefaultedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBool)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedInt64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedUint64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed32)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFloat)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedFixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSfixed64)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedDouble)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedString)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedBytes)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedChildMessage)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedNamedGroup)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingEnum)
-	proto.RegisterExtension(E_Message_ExtensionRepeatedSiblingMessage)
-	proto.RegisterExtension(E_Message_Extensionrepeatedgroup)
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto2_20190205.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto2_20190205.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto2_20190205.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto2_20190205.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto2_20190205.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]*Message_NamedGroup)(nil), "google.golang.org.proto2_20190205.Message.MapBoolNamedGroupEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto2_20190205.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto2_20190205.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto2_20190205.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20190205.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20190205.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20190205.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto2_20190205.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto2_20190205.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto2_20190205.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto2_20190205.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto2_20190205.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto2_20190205.Message.ChildMessage")
-	proto.RegisterType((*Message_NamedGroup)(nil), "google.golang.org.proto2_20190205.Message.NamedGroup")
-	proto.RegisterType((*Message_OptionalGroup)(nil), "google.golang.org.proto2_20190205.Message.OptionalGroup")
-	proto.RegisterType((*Message_RequiredGroup)(nil), "google.golang.org.proto2_20190205.Message.RequiredGroup")
-	proto.RegisterType((*Message_RepeatedGroup)(nil), "google.golang.org.proto2_20190205.Message.RepeatedGroup")
-	proto.RegisterType((*Message_OneofGroup)(nil), "google.golang.org.proto2_20190205.Message.OneofGroup")
-	proto.RegisterType((*Message_ExtensionOptionalGroup)(nil), "google.golang.org.proto2_20190205.Message.ExtensionOptionalGroup")
-	proto.RegisterType((*Message_ExtensionRepeatedGroup)(nil), "google.golang.org.proto2_20190205.Message.ExtensionRepeatedGroup")
-}
-
-func init() {
-	proto.RegisterFile("proto2_20190205_c823c79e/test.proto", fileDescriptor_3a17e2c63b2b3424)
-}
-
-var fileDescriptor_3a17e2c63b2b3424 = []byte{
-	// 4469 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x5c, 0x67, 0x70, 0x24, 0xc7,
-	0x75, 0xc6, 0xec, 0x62, 0x17, 0x87, 0x3e, 0x2c, 0xb0, 0x98, 0xbb, 0x03, 0xe6, 0x40, 0xd2, 0x5c,
-	0x41, 0xb2, 0xbc, 0xa6, 0x79, 0x38, 0x60, 0xd0, 0xe8, 0xe3, 0xad, 0x19, 0x04, 0x90, 0x47, 0x2d,
-	0x65, 0x71, 0xa9, 0x1a, 0xd6, 0xb9, 0x5c, 0x2e, 0x96, 0x61, 0xdc, 0x61, 0x81, 0x03, 0xb9, 0x01,
-	0x04, 0x76, 0x49, 0x9e, 0x25, 0x17, 0xcf, 0x72, 0xfc, 0x49, 0xe5, 0xb4, 0x92, 0x28, 0x66, 0x89,
-	0x51, 0x39, 0x31, 0x29, 0xd8, 0xa6, 0x72, 0x72, 0x90, 0x93, 0x9c, 0x93, 0x9c, 0x73, 0x0e, 0xd5,
-	0xfd, 0xba, 0xa7, 0xbb, 0x67, 0x7a, 0x16, 0xe8, 0x59, 0x15, 0x7f, 0xb0, 0x8a, 0xd7, 0xfb, 0xfa,
-	0x7d, 0xfd, 0xbe, 0xed, 0xf7, 0xde, 0x87, 0x9e, 0xe9, 0x45, 0x2f, 0xdd, 0xde, 0x69, 0x77, 0xda,
-	0xfe, 0xaa, 0x3f, 0xbf, 0x70, 0x72, 0xde, 0x9f, 0x5f, 0x5a, 0x3d, 0x7b, 0x85, 0xbf, 0x78, 0xf6,
-	0xc4, 0xc9, 0xfa, 0xf1, 0x4e, 0x7d, 0xb7, 0x33, 0xc7, 0x3e, 0x75, 0x5f, 0xb2, 0xd9, 0x6e, 0x6f,
-	0x36, 0xea, 0x73, 0x9b, 0xed, 0xc6, 0x5a, 0x6b, 0x73, 0xae, 0xbd, 0xb3, 0x39, 0x17, 0x99, 0x36,
-	0xfb, 0x3a, 0x34, 0x7e, 0xf3, 0xd6, 0x99, 0xc6, 0x56, 0x6b, 0xf3, 0xc6, 0xfa, 0xee, 0xee, 0xda,
-	0x66, 0xdd, 0x1d, 0x47, 0x99, 0x8d, 0x05, 0xcf, 0x29, 0x39, 0xe5, 0xd1, 0x20, 0xb3, 0xb1, 0xc0,
-	0xfe, 0xed, 0x7b, 0x99, 0x52, 0x86, 0xfd, 0xdb, 0x67, 0xff, 0x5e, 0xf4, 0xb2, 0xa5, 0x2c, 0xfb,
-	0xf7, 0xa2, 0x5b, 0x41, 0x99, 0x0d, 0xec, 0x0d, 0x97, 0x9c, 0xf2, 0x41, 0xff, 0xb2, 0xb9, 0x3d,
-	0x11, 0xe7, 0x38, 0x4e, 0x90, 0xd9, 0xc0, 0xb3, 0xdf, 0x79, 0xd4, 0x41, 0x23, 0x02, 0xf8, 0x34,
-	0x42, 0xad, 0xb5, 0x66, 0x7d, 0x7d, 0x73, 0xa7, 0xdd, 0xdd, 0x66, 0x0b, 0x40, 0xfe, 0xd2, 0xfe,
-	0x1d, 0xce, 0xd5, 0xe8, 0xe4, 0x57, 0xd2, 0xc9, 0x81, 0xe2, 0xc8, 0x7d, 0x29, 0x2a, 0xb4, 0xb7,
-	0x3b, 0x5b, 0xed, 0xd6, 0x5a, 0x63, 0xf5, 0x4c, 0xbb, 0xdd, 0xf0, 0xd6, 0x4b, 0x4e, 0xf9, 0x40,
-	0x30, 0x26, 0x06, 0x57, 0xda, 0xed, 0x86, 0xfb, 0xfd, 0x68, 0x3c, 0x34, 0xda, 0x6a, 0x75, 0x16,
-	0x7d, 0xaf, 0x5e, 0x72, 0xca, 0xb9, 0x20, 0x9c, 0x7a, 0x03, 0x1d, 0x74, 0x7f, 0x00, 0x4d, 0x84,
-	0x66, 0xbb, 0x60, 0xb7, 0x51, 0x72, 0xca, 0x93, 0x41, 0x38, 0xfb, 0xe6, 0xad, 0x98, 0x61, 0x17,
-	0x0c, 0x37, 0x4b, 0x4e, 0xb9, 0x20, 0x0d, 0x4f, 0x83, 0x61, 0x04, 0x98, 0x60, 0xef, 0x5c, 0xc9,
-	0x29, 0x67, 0x35, 0x60, 0x82, 0x63, 0xc0, 0x04, 0x7b, 0x5b, 0x25, 0xa7, 0xec, 0xea, 0xc0, 0x11,
-	0xc3, 0x2e, 0x18, 0xde, 0x5a, 0x72, 0xca, 0xc3, 0x3a, 0x30, 0xc1, 0xee, 0x0f, 0xa2, 0x62, 0x68,
-	0xb8, 0xb1, 0x75, 0x57, 0x7d, 0x7d, 0xd1, 0xf7, 0x6e, 0x2b, 0x39, 0xe5, 0x91, 0x20, 0x74, 0x70,
-	0x3d, 0x0c, 0xbb, 0x3f, 0x84, 0x26, 0x25, 0xb8, 0xb0, 0x6d, 0x94, 0x9c, 0xf2, 0x44, 0x10, 0xfa,
-	0xb8, 0x99, 0x8f, 0x6b, 0x01, 0x6d, 0x34, 0xda, 0x6b, 0x1d, 0xaf, 0x59, 0x72, 0xca, 0x19, 0x19,
-	0xd0, 0xf5, 0x74, 0x30, 0x0e, 0x4f, 0xb0, 0xd7, 0x2a, 0x39, 0xe5, 0x7c, 0x04, 0x9e, 0x60, 0x03,
-	0x3c, 0xc1, 0x5e, 0xbb, 0xe4, 0x94, 0x8b, 0x51, 0xf8, 0x48, 0xfc, 0xeb, 0xed, 0xee, 0x99, 0x46,
-	0xdd, 0xdb, 0x2e, 0x39, 0x65, 0x47, 0xc6, 0x7f, 0x1d, 0x1b, 0xd5, 0x19, 0xed, 0xec, 0x6c, 0xb5,
-	0x36, 0xbd, 0xdb, 0xd9, 0x9e, 0x97, 0x8c, 0xb2, 0x51, 0x2d, 0xa0, 0x33, 0xe7, 0x3b, 0xf5, 0x5d,
-	0x6f, 0xa7, 0xe4, 0x94, 0xc7, 0x64, 0x40, 0x2b, 0x74, 0xd0, 0x5d, 0x47, 0x87, 0x42, 0xb3, 0xb3,
-	0xe7, 0xb6, 0x1a, 0xeb, 0xab, 0xf5, 0x56, 0xb7, 0xe9, 0xed, 0x96, 0x9c, 0xf2, 0xb8, 0x8f, 0x2d,
-	0xb6, 0xf1, 0xb5, 0x74, 0xf2, 0xa9, 0x56, 0xb7, 0x19, 0x84, 0x61, 0x87, 0x43, 0x6e, 0x13, 0x4d,
-	0x45, 0x50, 0x9a, 0x30, 0xcd, 0xeb, 0xb0, 0x04, 0x3c, 0x61, 0x0b, 0x24, 0xb2, 0xf1, 0xb0, 0x86,
-	0x25, 0x52, 0x72, 0x13, 0x85, 0xe3, 0xab, 0x2c, 0xa5, 0x56, 0x21, 0x39, 0xbb, 0x0c, 0x2c, 0x65,
-	0x72, 0xba, 0xc2, 0xa5, 0x1c, 0x73, 0xcf, 0xa0, 0x23, 0xca, 0xfe, 0x66, 0xf5, 0x08, 0xf8, 0xbb,
-	0x83, 0xf1, 0x37, 0xb7, 0x0f, 0x24, 0x5e, 0xc6, 0x18, 0x73, 0x87, 0x64, 0x56, 0x84, 0x83, 0xee,
-	0x6d, 0xc8, 0x8b, 0x61, 0x08, 0xf6, 0xee, 0x64, 0x01, 0x2d, 0xec, 0x1f, 0x46, 0xf0, 0x36, 0x15,
-	0x41, 0x12, 0xcc, 0xfd, 0x84, 0xac, 0x3a, 0x40, 0xd9, 0x5d, 0xac, 0x9e, 0x5d, 0x61, 0x41, 0xd9,
-	0x4d, 0x7c, 0x3e, 0xb0, 0xa6, 0xbb, 0x73, 0x2f, 0x47, 0xe3, 0xeb, 0xf5, 0x8d, 0xb5, 0x6e, 0xa3,
-	0x53, 0x5f, 0x87, 0xb2, 0xf6, 0x02, 0xad, 0x98, 0x07, 0x2a, 0xc3, 0x9d, 0x9d, 0x6e, 0x3d, 0x28,
-	0x84, 0x1f, 0xb2, 0xf2, 0x36, 0x8f, 0x26, 0xa4, 0x35, 0x94, 0xa3, 0x2f, 0x50, 0xf3, 0x5c, 0x25,
-	0x7f, 0x6c, 0xc1, 0x5f, 0xc4, 0x4b, 0x81, 0xf4, 0x06, 0x95, 0x6e, 0x01, 0x15, 0xe5, 0x0c, 0x5e,
-	0xea, 0xbe, 0x48, 0xa7, 0x4c, 0x56, 0x72, 0xc7, 0x16, 0xfd, 0xf9, 0xf9, 0x40, 0x7a, 0xe4, 0x35,
-	0x6f, 0x5e, 0x9d, 0xc2, 0x8b, 0xde, 0x97, 0xe8, 0x94, 0x42, 0x65, 0x38, 0x32, 0x83, 0x17, 0x3f,
-	0x1c, 0x59, 0x16, 0xc1, 0xde, 0x97, 0xe9, 0x84, 0x6c, 0x05, 0xc1, 0xb2, 0xc8, 0x89, 0x2b, 0x4e,
-	0xea, 0x4b, 0x23, 0x38, 0xbe, 0x34, 0x82, 0xbd, 0xaf, 0xd0, 0x69, 0x6e, 0x25, 0x77, 0x8c, 0xe0,
-	0xd8, 0xd2, 0x08, 0x8e, 0x2f, 0x8d, 0x60, 0xef, 0xab, 0x74, 0xca, 0x70, 0x65, 0x38, 0x32, 0x83,
-	0x97, 0x47, 0x8c, 0x26, 0xe5, 0x0c, 0x51, 0xf3, 0xbe, 0x46, 0xa7, 0x8c, 0x54, 0xf2, 0x34, 0x9a,
-	0xf9, 0xf9, 0x40, 0xfa, 0x14, 0x95, 0xf2, 0x04, 0x72, 0x95, 0xa5, 0x89, 0x69, 0x5f, 0xa7, 0xd3,
-	0x26, 0x2a, 0x23, 0xc7, 0xf8, 0x3c, 0xe9, 0x39, 0xac, 0x9a, 0x0b, 0x2a, 0x13, 0x50, 0x36, 0xbf,
-	0x41, 0x67, 0x65, 0x2a, 0x23, 0x8b, 0x73, 0x0b, 0x78, 0x61, 0x49, 0xa5, 0x01, 0x2a, 0x68, 0x7c,
-	0x85, 0x04, 0x7b, 0xdf, 0xa4, 0x93, 0xf2, 0x95, 0x3c, 0x0d, 0x2a, 0xbe, 0x42, 0x82, 0x4d, 0x2b,
-	0x24, 0xd8, 0xfb, 0x16, 0x9d, 0x56, 0xac, 0x8c, 0x1c, 0xe3, 0xf3, 0xa2, 0x2b, 0x24, 0xd8, 0x3d,
-	0xa9, 0x52, 0xc8, 0x2b, 0xeb, 0xaf, 0xd1, 0x69, 0x4e, 0xa5, 0xc0, 0x97, 0xe8, 0x93, 0xa5, 0xc5,
-	0xa5, 0x93, 0x0a, 0x97, 0xbc, 0xd4, 0x5e, 0xa9, 0x7d, 0x61, 0x50, 0x6b, 0x7f, 0x9d, 0x09, 0x8c,
-	0x4a, 0xf1, 0x5c, 0xbd, 0xd1, 0x68, 0x5f, 0x5e, 0x9a, 0xbd, 0xb3, 0xbd, 0xd3, 0x58, 0x7f, 0xc9,
-	0x2c, 0x52, 0xbf, 0x3b, 0xa8, 0xbf, 0x2b, 0x2a, 0x35, 0x50, 0x80, 0x7f, 0x83, 0x4e, 0x1e, 0xab,
-	0x78, 0xeb, 0xf5, 0xb5, 0xf5, 0x5b, 0x16, 0x17, 0xc9, 0x2d, 0xfe, 0xd2, 0xd2, 0x2d, 0xfe, 0x09,
-	0x72, 0xcb, 0xe2, 0xd2, 0x89, 0x33, 0xf5, 0xfa, 0x86, 0xc2, 0x15, 0x14, 0xe7, 0x16, 0x3a, 0x2c,
-	0x7d, 0x28, 0xd5, 0xf9, 0x37, 0x9d, 0xf4, 0xe5, 0xb9, 0x92, 0x5b, 0x7e, 0xf5, 0x6b, 0xaa, 0xcb,
-	0x81, 0xe4, 0x53, 0x96, 0xe9, 0x06, 0x9a, 0x52, 0xb7, 0xa8, 0x52, 0xcf, 0xbe, 0xed, 0xa4, 0x29,
-	0x68, 0x02, 0xeb, 0xb0, 0xb2, 0xb1, 0x65, 0x61, 0x7b, 0x19, 0x2a, 0xec, 0xd4, 0x6f, 0xef, 0x6e,
-	0xed, 0x88, 0x52, 0xf0, 0x18, 0x55, 0x6b, 0x07, 0x82, 0x31, 0x31, 0xca, 0x6a, 0xc0, 0xcb, 0xd1,
-	0x78, 0x68, 0x05, 0xc9, 0xf9, 0x38, 0x35, 0xcb, 0x05, 0xe1, 0x64, 0xc8, 0xfc, 0x32, 0x9a, 0x08,
-	0xed, 0x78, 0xe2, 0x3f, 0x41, 0x0d, 0x27, 0x83, 0x70, 0x3e, 0x4f, 0x78, 0xd5, 0x92, 0xe7, 0xfb,
-	0x93, 0xd4, 0xb2, 0x20, 0x2d, 0x79, 0xa2, 0x47, 0xb0, 0x09, 0xf6, 0x9e, 0xa2, 0x86, 0x59, 0x0d,
-	0x9b, 0xe0, 0x18, 0x36, 0xc1, 0xde, 0x07, 0xa9, 0xa1, 0xab, 0x63, 0x47, 0x2c, 0x79, 0x42, 0x7f,
-	0x88, 0x5a, 0x0e, 0xeb, 0xd8, 0x04, 0xbb, 0x97, 0xa1, 0x62, 0x68, 0x29, 0x32, 0xf2, 0xc3, 0xd4,
-	0x74, 0x24, 0x08, 0x5d, 0x88, 0xfc, 0xbd, 0x1c, 0x4d, 0x4a, 0x7c, 0x61, 0xfc, 0x11, 0x6a, 0x3c,
-	0x11, 0x84, 0x5e, 0xc2, 0xa4, 0x55, 0xa3, 0x82, 0x9c, 0xfd, 0x28, 0x35, 0xcd, 0xc8, 0xa8, 0x20,
-	0x53, 0x63, 0x2b, 0x20, 0xd8, 0xfb, 0x18, 0xb5, 0xcc, 0x47, 0x56, 0x40, 0xb0, 0x61, 0x05, 0x04,
-	0x7b, 0x1f, 0xa7, 0xc6, 0xc5, 0xe8, 0x0a, 0x22, 0x2c, 0xf0, 0x9c, 0xfc, 0x04, 0xb5, 0x75, 0x24,
-	0x0b, 0x3c, 0x07, 0x35, 0x66, 0x21, 0x05, 0x3f, 0x09, 0x9a, 0x5e, 0x32, 0x0b, 0xf9, 0xa6, 0x46,
-	0x05, 0xe9, 0xf6, 0x29, 0x6a, 0x38, 0x26, 0xa3, 0x82, 0x9c, 0xaa, 0xa3, 0x43, 0xa1, 0x9d, 0x92,
-	0x52, 0x9f, 0xa6, 0xc6, 0xa9, 0x15, 0x8f, 0xf0, 0x28, 0x53, 0xa9, 0x85, 0xa6, 0x22, 0x30, 0xa2,
-	0x67, 0x3f, 0x4d, 0x91, 0x06, 0x91, 0x3c, 0x1a, 0x98, 0x68, 0xdc, 0xe7, 0x50, 0x38, 0xae, 0x49,
-	0x9e, 0x67, 0x00, 0x2d, 0xad, 0xe6, 0x11, 0x3e, 0x15, 0xcd, 0x73, 0x16, 0x1d, 0x51, 0x36, 0xbb,
-	0x52, 0x23, 0x9e, 0x05, 0x0a, 0xad, 0x45, 0x8f, 0x4c, 0x11, 0x59, 0x1b, 0x1a, 0xc8, 0x8b, 0x81,
-	0x08, 0x02, 0x9f, 0x83, 0x90, 0xd2, 0xa8, 0x9e, 0x08, 0x94, 0x20, 0x6f, 0x55, 0x56, 0x22, 0x60,
-	0xed, 0x79, 0x0a, 0x61, 0x27, 0x7b, 0x02, 0xee, 0x80, 0xcb, 0x1e, 0xcd, 0x9f, 0x7b, 0x15, 0x9a,
-	0x96, 0x1b, 0x5e, 0xd7, 0x3f, 0xf7, 0x64, 0x69, 0xd1, 0xe3, 0xfa, 0x27, 0x64, 0xf6, 0x3a, 0x4d,
-	0x07, 0x2d, 0x2b, 0x6c, 0x44, 0x05, 0xd1, 0x1b, 0xe8, 0x7c, 0x29, 0x88, 0xa6, 0x62, 0x1e, 0xa0,
-	0x3c, 0xae, 0xa0, 0xa3, 0x06, 0x17, 0xbc, 0x50, 0xbe, 0x91, 0xfa, 0x08, 0x15, 0xd2, 0x74, 0xcc,
-	0x05, 0x2f, 0x9c, 0xcb, 0x46, 0x1f, 0xbc, 0x84, 0xbe, 0x89, 0xfa, 0x10, 0x92, 0x29, 0xee, 0x82,
-	0x57, 0xd4, 0x53, 0x49, 0x91, 0x10, 0xec, 0xbd, 0x99, 0x7a, 0xd0, 0x35, 0x94, 0x31, 0x1a, 0x82,
-	0xfb, 0x44, 0x43, 0xb0, 0xf7, 0x16, 0xea, 0x27, 0x14, 0x55, 0xe6, 0x68, 0x08, 0xee, 0x13, 0x0d,
-	0xc1, 0xde, 0x5b, 0xa9, 0x0f, 0xa1, 0xb2, 0xcc, 0xd1, 0x10, 0xec, 0x9e, 0x42, 0x33, 0x06, 0x17,
-	0xa2, 0x00, 0xbf, 0x8d, 0xfa, 0x90, 0xb2, 0xcb, 0x8b, 0x79, 0x11, 0xe5, 0xbb, 0x8a, 0x2e, 0x32,
-	0x45, 0x23, 0xfc, 0xbc, 0x9d, 0xfa, 0x51, 0x74, 0xd8, 0xd1, 0x78, 0x44, 0xa2, 0xb4, 0xaf, 0x18,
-	0xe9, 0x85, 0x22, 0xff, 0x0e, 0xea, 0x46, 0x11, 0x66, 0x71, 0x6e, 0xa1, 0xec, 0xf7, 0x09, 0x8a,
-	0x60, 0xef, 0x9d, 0xd4, 0x8b, 0x54, 0x6a, 0x09, 0x41, 0x11, 0xdc, 0x37, 0x28, 0x82, 0xbd, 0x77,
-	0x51, 0x3f, 0x8a, 0x74, 0x4b, 0x0a, 0x8a, 0x60, 0xf7, 0x55, 0xc6, 0x2f, 0x8a, 0xf7, 0x8d, 0x1e,
-	0xf5, 0x13, 0xd3, 0x72, 0xf1, 0x6f, 0x8c, 0xf7, 0x93, 0x1b, 0xcd, 0x1b, 0x07, 0x3a, 0xcb, 0xbb,
-	0xa9, 0x2f, 0x93, 0xb8, 0x33, 0xec, 0x21, 0x68, 0x3a, 0x37, 0x1b, 0xf9, 0x86, 0xf6, 0xf3, 0x1e,
-	0xea, 0xad, 0x9f, 0xda, 0x8b, 0x7f, 0x01, 0xd0, 0xa1, 0xee, 0x46, 0x97, 0x18, 0x9c, 0x2a, 0xbd,
-	0xea, 0xbd, 0xd9, 0xf4, 0xbd, 0x4a, 0x48, 0xb2, 0x99, 0x18, 0xb8, 0xec, 0x5d, 0x3f, 0x8d, 0x2e,
-	0x35, 0x66, 0x97, 0x52, 0xeb, 0xef, 0xcd, 0xa6, 0xa9, 0xf5, 0x02, 0xfc, 0x62, 0x43, 0x4e, 0x46,
-	0x74, 0xe1, 0x76, 0x7d, 0x2d, 0x2c, 0x91, 0xff, 0x9c, 0x2d, 0x65, 0x41, 0x17, 0xc2, 0xa8, 0xd4,
-	0x85, 0xdc, 0x0a, 0x2a, 0xd0, 0xbf, 0x50, 0x33, 0xa6, 0x0b, 0x61, 0x58, 0xd1, 0x85, 0xdc, 0x8e,
-	0x97, 0xbb, 0x7f, 0xa5, 0x86, 0x4c, 0x17, 0xc2, 0xb8, 0xaa, 0x0b, 0xb9, 0x25, 0x2f, 0x6a, 0xff,
-	0x46, 0x2d, 0x0b, 0xd2, 0x52, 0xd5, 0x85, 0x12, 0x9b, 0x60, 0xef, 0xdf, 0xa9, 0x61, 0x56, 0xc3,
-	0x16, 0x3a, 0x47, 0xc1, 0x26, 0xd8, 0xfb, 0x0f, 0x6a, 0xe8, 0xea, 0xd8, 0x11, 0x4b, 0x5e, 0x82,
-	0xfe, 0x93, 0x5a, 0x0e, 0xeb, 0xd8, 0x42, 0x17, 0x72, 0x4b, 0x51, 0x21, 0xfe, 0x8b, 0x9a, 0x32,
-	0x5d, 0x08, 0x1f, 0x68, 0xba, 0x50, 0xe0, 0x0b, 0xe3, 0xff, 0xa6, 0xc6, 0x4c, 0x17, 0xf2, 0x15,
-	0x68, 0xba, 0x50, 0x78, 0x66, 0x25, 0xe3, 0x7f, 0xa8, 0x69, 0x46, 0x46, 0xa5, 0xe8, 0x42, 0x75,
-	0x05, 0x04, 0x7b, 0xff, 0x4b, 0x2d, 0xf3, 0x91, 0x15, 0x08, 0x5d, 0xa8, 0xad, 0x80, 0x60, 0xef,
-	0xff, 0xa8, 0x71, 0x31, 0xba, 0x82, 0x08, 0x0b, 0x3c, 0xbf, 0x2f, 0x0c, 0x97, 0xb2, 0xa0, 0x0b,
-	0x61, 0x5c, 0xd5, 0x85, 0xc2, 0x2f, 0x64, 0xef, 0xcf, 0x0c, 0xb3, 0xb3, 0x5d, 0xc9, 0xac, 0xa2,
-	0x0b, 0xc5, 0x6e, 0x62, 0x89, 0xf9, 0x7a, 0x6a, 0x38, 0x26, 0xa3, 0x52, 0x74, 0x21, 0xb7, 0x53,
-	0x72, 0xed, 0x67, 0xa9, 0xf1, 0x00, 0xba, 0x10, 0x3c, 0x46, 0x74, 0xa1, 0x06, 0x23, 0x64, 0xcd,
-	0xcf, 0x51, 0xa4, 0xc1, 0x74, 0xa1, 0x02, 0xa6, 0xe9, 0x42, 0x8e, 0xa7, 0xea, 0xc2, 0x9f, 0x07,
-	0xb4, 0xf4, 0xba, 0x10, 0x7c, 0x46, 0x75, 0x61, 0xb8, 0xd9, 0x95, 0x5a, 0xf1, 0x0b, 0x40, 0x61,
-	0x0a, 0x5d, 0x28, 0x52, 0x24, 0xa2, 0x0b, 0x23, 0x20, 0x82, 0xc0, 0x5f, 0x84, 0x90, 0xd2, 0xe9,
-	0x42, 0x0d, 0x4a, 0xd3, 0x85, 0xf0, 0x09, 0xb0, 0xf6, 0x4b, 0x14, 0xc2, 0x56, 0x17, 0x82, 0x83,
-	0x50, 0x17, 0x2a, 0xfe, 0xdc, 0x9f, 0x44, 0x85, 0xe6, 0xda, 0x36, 0xab, 0x72, 0x50, 0xea, 0xbe,
-	0x0d, 0x31, 0xfc, 0xb0, 0x05, 0xc0, 0x8d, 0x6b, 0xdb, 0xb4, 0x20, 0xd2, 0xff, 0x4e, 0xb5, 0x3a,
-	0x3b, 0xe7, 0x83, 0x83, 0x4d, 0x39, 0xe2, 0x9e, 0x45, 0xe3, 0x21, 0x02, 0xd4, 0xb4, 0xdf, 0x02,
-	0x88, 0x2b, 0xed, 0x21, 0x58, 0x41, 0x05, 0x8c, 0xb1, 0xa6, 0x32, 0xe4, 0x6e, 0xa0, 0x89, 0x10,
-	0x84, 0xd7, 0xd8, 0xdf, 0x06, 0x94, 0xab, 0xec, 0x51, 0xa0, 0x1a, 0x03, 0x4c, 0xa1, 0xa9, 0x8e,
-	0x69, 0x38, 0xbc, 0x42, 0xff, 0x4e, 0x6a, 0x9c, 0xd3, 0x06, 0x1c, 0x5e, 0xdf, 0x23, 0xa4, 0x11,
-	0xec, 0xfd, 0xee, 0x20, 0xa4, 0x11, 0x1c, 0x23, 0x8d, 0xe0, 0x18, 0x69, 0x04, 0x7b, 0xbf, 0x37,
-	0x10, 0x69, 0x02, 0x46, 0x25, 0x2d, 0x82, 0xc3, 0x5b, 0xcb, 0x77, 0x06, 0x22, 0x2d, 0x8a, 0xc3,
-	0x1b, 0xd3, 0x16, 0x2a, 0x86, 0x38, 0xa2, 0xd7, 0xfc, 0x3e, 0x00, 0x5d, 0x6d, 0x0f, 0xc4, 0x5b,
-	0x18, 0x20, 0x8d, 0x37, 0xb5, 0x41, 0xb7, 0x81, 0x26, 0x25, 0x75, 0x02, 0xeb, 0x0f, 0x00, 0xeb,
-	0x9a, 0x14, 0xe4, 0x6d, 0xa8, 0x60, 0x13, 0x4d, 0x7d, 0x54, 0xdb, 0x0d, 0xd0, 0x17, 0xff, 0x30,
-	0xf5, 0x6e, 0x60, 0x1d, 0x54, 0xdf, 0x0d, 0xd0, 0x54, 0x63, 0xec, 0x11, 0xec, 0xfd, 0xd1, 0x60,
-	0xec, 0x89, 0xef, 0x49, 0x63, 0x8f, 0x60, 0x03, 0x7b, 0x04, 0x7b, 0x7f, 0x3c, 0x20, 0x7b, 0x02,
-	0x4c, 0x67, 0x2f, 0xb2, 0xfd, 0x78, 0x4f, 0xff, 0x93, 0xd4, 0xdb, 0x0f, 0xba, 0xbf, 0xbe, 0xfd,
-	0xb8, 0x22, 0xd0, 0xd2, 0x09, 0x14, 0xc1, 0x9f, 0xa6, 0x4f, 0x27, 0xe6, 0x20, 0x92, 0x4e, 0xa0,
-	0x27, 0xd4, 0xdd, 0x00, 0x7a, 0xe2, 0xcf, 0x52, 0xef, 0x06, 0xa6, 0x3c, 0xf4, 0xdd, 0x00, 0x62,
-	0x64, 0x1b, 0x1d, 0x0a, 0x41, 0x14, 0x31, 0xf2, 0xe7, 0x80, 0xf4, 0x0a, 0x7b, 0xa4, 0x50, 0x80,
-	0x00, 0x5a, 0xb1, 0x19, 0x19, 0x76, 0xcf, 0xa3, 0xa9, 0x08, 0xa2, 0x68, 0xab, 0x7f, 0x01, 0xa0,
-	0xd7, 0xa6, 0x04, 0xe5, 0x63, 0x80, 0x7b, 0xa8, 0x19, 0xff, 0xc4, 0xdd, 0x45, 0x87, 0x43, 0x68,
-	0x55, 0xa2, 0xfc, 0x25, 0x00, 0x2f, 0xdb, 0x03, 0x4b, 0x55, 0x02, 0xb0, 0x93, 0xcd, 0xe8, 0xb8,
-	0x7b, 0x07, 0x3a, 0xa2, 0x54, 0x5f, 0x45, 0xad, 0x7c, 0x17, 0x50, 0x57, 0xd2, 0xd4, 0xe0, 0x50,
-	0xa7, 0x00, 0xac, 0xdb, 0x8c, 0x7d, 0xe0, 0xde, 0x8d, 0xbc, 0x18, 0xae, 0x60, 0xfa, 0xaf, 0x00,
-	0xfa, 0x54, 0x6a, 0x68, 0x8d, 0xeb, 0x23, 0x4d, 0xd3, 0x67, 0x62, 0xff, 0xb2, 0x46, 0x07, 0x9a,
-	0xe3, 0xaf, 0x53, 0xed, 0x5f, 0xd6, 0xf9, 0xa5, 0xe8, 0xa0, 0xfb, 0x37, 0x1c, 0x12, 0xc9, 0xb8,
-	0xab, 0xa0, 0xfc, 0x4d, 0xaa, 0x64, 0x84, 0xc6, 0x2f, 0x61, 0x68, 0x32, 0xca, 0x31, 0x81, 0xd3,
-	0x55, 0x70, 0xfe, 0x36, 0x15, 0xce, 0x69, 0x03, 0x8e, 0x1c, 0x53, 0x48, 0x23, 0x18, 0x60, 0xfe,
-	0x2e, 0x2d, 0x69, 0x04, 0xc7, 0x48, 0x83, 0x21, 0x95, 0x34, 0x81, 0xf2, 0xf7, 0xa9, 0x49, 0x53,
-	0x61, 0x04, 0x69, 0x3a, 0x4e, 0x57, 0xc1, 0xf9, 0x87, 0xd4, 0xa4, 0x45, 0x71, 0xe4, 0x98, 0x68,
-	0x69, 0xbc, 0x8d, 0x02, 0xd0, 0x3f, 0xa6, 0x6a, 0x69, 0xbc, 0xef, 0x4b, 0x24, 0xfa, 0x6d, 0x28,
-	0x83, 0x21, 0x75, 0xac, 0x44, 0x03, 0xd2, 0x3f, 0xa5, 0xa3, 0x8e, 0x79, 0x88, 0x50, 0x17, 0x8e,
-	0xb9, 0x25, 0x84, 0xda, 0xad, 0x7a, 0x7b, 0x03, 0x20, 0x9e, 0xce, 0x95, 0x9c, 0xf2, 0x81, 0xea,
-	0x50, 0x30, 0xca, 0x06, 0x99, 0xc5, 0x2c, 0x3a, 0x08, 0x16, 0x20, 0x4f, 0x9f, 0xa1, 0x26, 0xb9,
-	0xea, 0x50, 0x00, 0xf3, 0x40, 0x2e, 0xbf, 0x0c, 0x8d, 0x81, 0x0d, 0xd7, 0xca, 0xcf, 0x52, 0xa3,
-	0xc9, 0xea, 0x50, 0x00, 0x53, 0xb9, 0xd8, 0x0d, 0xad, 0xb8, 0xd2, 0x7d, 0x8e, 0x5a, 0x15, 0x42,
-	0x2b, 0x2e, 0x55, 0x55, 0x3c, 0x82, 0xbd, 0xe7, 0xa9, 0x51, 0x56, 0xc5, 0x23, 0x58, 0xc7, 0x23,
-	0xd8, 0xfb, 0x0c, 0x35, 0x72, 0x35, 0x3c, 0xd5, 0x8a, 0x8b, 0xc4, 0xcf, 0x52, 0xab, 0x61, 0x0d,
-	0x8f, 0x60, 0xf7, 0xe5, 0xa8, 0x00, 0x56, 0x42, 0x76, 0x7d, 0x8e, 0x9a, 0x8d, 0x54, 0x87, 0x02,
-	0x98, 0x2d, 0x24, 0x5a, 0x19, 0x8d, 0x73, 0x4c, 0x61, 0xf8, 0x79, 0x6a, 0x38, 0x51, 0x1d, 0x0a,
-	0xc0, 0x41, 0x28, 0xaf, 0xc2, 0x08, 0x40, 0x5b, 0xfd, 0x32, 0x35, 0xcb, 0x84, 0x11, 0x80, 0x3a,
-	0xd2, 0x51, 0x09, 0xf6, 0x7e, 0x85, 0x5a, 0xe5, 0x75, 0x54, 0x76, 0x80, 0xa0, 0xa1, 0x12, 0xec,
-	0xfd, 0x2a, 0x35, 0x2c, 0x46, 0x50, 0xd5, 0x68, 0xb9, 0x26, 0x79, 0x81, 0xda, 0x39, 0x61, 0xb4,
-	0x5c, 0x54, 0x48, 0xe6, 0x40, 0x51, 0x7c, 0x81, 0x5a, 0x8d, 0x4a, 0xe6, 0x40, 0x12, 0x84, 0x11,
-	0x80, 0x1e, 0xf8, 0x22, 0x35, 0x1a, 0x0b, 0x23, 0x80, 0x8e, 0xbe, 0x86, 0x8a, 0x60, 0xa3, 0xb4,
-	0xf3, 0x2f, 0xe5, 0xd2, 0x3f, 0xc6, 0xad, 0x0e, 0x05, 0x10, 0xaa, 0x6c, 0xe1, 0xb7, 0xa2, 0x43,
-	0x2a, 0x84, 0xe8, 0x2a, 0x5f, 0xce, 0x0d, 0xf4, 0x8a, 0x4d, 0x75, 0x28, 0x98, 0x94, 0x40, 0xa2,
-	0x8b, 0xac, 0x23, 0x18, 0xd4, 0x1a, 0xf6, 0x57, 0x72, 0x03, 0xbc, 0x5f, 0x53, 0x1d, 0x0a, 0x26,
-	0x98, 0x4b, 0xa5, 0x49, 0xaf, 0x22, 0x57, 0x6c, 0x5c, 0xa5, 0x43, 0x7f, 0x35, 0x97, 0xe6, 0x59,
-	0x74, 0x75, 0x28, 0x28, 0xf2, 0xed, 0x2e, 0xbb, 0xf1, 0x39, 0x74, 0x44, 0x07, 0x10, 0xa4, 0x7d,
-	0x2d, 0x97, 0xf2, 0xcd, 0x9a, 0xea, 0x50, 0x70, 0x48, 0x85, 0x11, 0x84, 0xfd, 0x18, 0xaf, 0x1c,
-	0xc0, 0xd4, 0xd7, 0x73, 0xd6, 0xaf, 0x09, 0xde, 0x44, 0x67, 0x0b, 0xa6, 0x14, 0x5f, 0x32, 0x37,
-	0x60, 0x8f, 0x2e, 0x78, 0xdf, 0x10, 0x9b, 0x74, 0x4c, 0xd9, 0xa4, 0x0b, 0x51, 0x3b, 0xdf, 0xfb,
-	0xa6, 0xc9, 0xce, 0x8f, 0xda, 0x2d, 0x7a, 0xdf, 0x32, 0xd9, 0x2d, 0xba, 0x27, 0xd1, 0x61, 0x9e,
-	0x41, 0xfa, 0x03, 0xad, 0x7b, 0xf3, 0xf2, 0x85, 0x9e, 0xaa, 0x13, 0xc0, 0x37, 0xa8, 0x3f, 0xcf,
-	0xba, 0x4a, 0xd0, 0x1e, 0x7d, 0x98, 0xf5, 0xbe, 0xbc, 0xfa, 0x76, 0x4f, 0xd5, 0xe1, 0x5c, 0x46,
-	0x9e, 0x65, 0x5d, 0x8d, 0xa6, 0xa2, 0xd3, 0x79, 0x25, 0xbd, 0x2f, 0xaf, 0xbc, 0xea, 0x53, 0x75,
-	0x82, 0xc3, 0xfa, 0x74, 0x5e, 0x59, 0xaf, 0x8a, 0xcf, 0xe7, 0x35, 0xf6, 0xfe, 0xbc, 0x7c, 0xef,
-	0x27, 0x3e, 0xfd, 0xb4, 0x78, 0x0c, 0x66, 0x5a, 0x3d, 0xc1, 0xde, 0x03, 0xf9, 0xe8, 0x4b, 0x40,
-	0xc6, 0x08, 0x08, 0x4e, 0x8a, 0x80, 0x60, 0xef, 0xc1, 0xbc, 0xf2, 0x46, 0x90, 0x39, 0x02, 0x82,
-	0x93, 0x22, 0x20, 0xd8, 0x7b, 0x28, 0x2f, 0x5f, 0x0f, 0x32, 0x47, 0xc0, 0x1e, 0x7d, 0x4d, 0x47,
-	0xa7, 0x8b, 0x2a, 0xfd, 0x70, 0x5e, 0x7d, 0x57, 0xa8, 0xea, 0x04, 0x47, 0x74, 0x0f, 0xa2, 0xbe,
-	0x5f, 0x87, 0xbc, 0x58, 0x04, 0xc2, 0xc7, 0x23, 0x79, 0xed, 0xc5, 0xa1, 0xaa, 0x13, 0x4c, 0x45,
-	0xa2, 0x10, 0xb5, 0xff, 0xea, 0x38, 0x95, 0xd0, 0x05, 0xde, 0x9f, 0xd7, 0xde, 0x22, 0x8a, 0xf3,
-	0x08, 0x7d, 0x21, 0x29, 0x10, 0x82, 0xbd, 0x0f, 0xe4, 0xd5, 0x57, 0x8a, 0x12, 0x02, 0x21, 0x38,
-	0x39, 0x10, 0x82, 0xbd, 0x47, 0xf3, 0xda, 0xfb, 0x45, 0x49, 0x81, 0x10, 0xec, 0x5e, 0x1f, 0xff,
-	0x42, 0x78, 0x63, 0x79, 0x2c, 0x6f, 0x78, 0xd9, 0x28, 0xfe, 0xcd, 0xf0, 0x86, 0x73, 0x83, 0x61,
-	0x63, 0x40, 0xeb, 0x79, 0x3c, 0x6f, 0x7e, 0xf3, 0xc8, 0xb0, 0x47, 0xa0, 0x2b, 0xdd, 0x14, 0xe7,
-	0x16, 0xfa, 0xd3, 0x13, 0xf9, 0xfe, 0xaf, 0x21, 0xc5, 0xc9, 0x86, 0x16, 0xf6, 0x5a, 0x34, 0x13,
-	0x75, 0xa8, 0x34, 0xb3, 0x27, 0xf3, 0x03, 0xbf, 0x93, 0x54, 0x75, 0x82, 0x69, 0x1d, 0x58, 0xfd,
-	0xfb, 0xf4, 0xe2, 0x78, 0xc6, 0x28, 0x4d, 0xe1, 0xa9, 0xfc, 0x00, 0x2f, 0x28, 0x55, 0x9d, 0xe0,
-	0x68, 0x34, 0xcf, 0x42, 0x9b, 0x99, 0x9f, 0x42, 0x63, 0x5a, 0xef, 0x7b, 0x11, 0xdf, 0x34, 0x9f,
-	0xb9, 0x0b, 0x21, 0xa5, 0x1f, 0xbe, 0x98, 0xc8, 0xd7, 0xa0, 0x82, 0xf6, 0x26, 0xa7, 0x2d, 0x38,
-	0x75, 0xa0, 0xbd, 0x13, 0x91, 0xce, 0x81, 0x72, 0x78, 0x6e, 0xed, 0xe0, 0x6a, 0x54, 0x8c, 0x1e,
-	0x8e, 0xbb, 0x45, 0x94, 0xbd, 0xad, 0x7e, 0x9e, 0x39, 0x39, 0x10, 0xd0, 0xff, 0x75, 0x0f, 0xa3,
-	0xdc, 0x1d, 0x6b, 0x8d, 0x6e, 0xdd, 0xcb, 0xb0, 0x31, 0xf8, 0x47, 0x25, 0x73, 0x85, 0x33, 0x73,
-	0x0d, 0x9a, 0x8c, 0x9d, 0x7c, 0xef, 0xe5, 0x20, 0xa7, 0x3a, 0x78, 0x05, 0x72, 0xe3, 0x87, 0xda,
-	0x7b, 0x79, 0x98, 0x34, 0x7b, 0x38, 0xbd, 0x7f, 0x0f, 0x85, 0xc4, 0x20, 0xf8, 0x29, 0xdd, 0x5e,
-	0x0e, 0xb2, 0xc9, 0x41, 0xec, 0xd3, 0x83, 0x9b, 0x1c, 0xc4, 0x3e, 0x3d, 0x0c, 0xab, 0x1e, 0x96,
-	0xd1, 0x21, 0xc3, 0xb9, 0xf0, 0x5e, 0x2e, 0x46, 0x54, 0x17, 0x2b, 0xe8, 0xb0, 0xe9, 0xb8, 0x77,
-	0x2f, 0x1f, 0x13, 0x66, 0x2e, 0xe5, 0x39, 0xee, 0x5e, 0x0e, 0x32, 0x7d, 0xe2, 0xd8, 0x27, 0x15,
-	0xf9, 0x7e, 0x71, 0xec, 0xd3, 0x47, 0xd1, 0xfc, 0x85, 0x28, 0x07, 0xaa, 0x7b, 0x79, 0x70, 0x12,
-	0x36, 0x85, 0x3c, 0x2a, 0xdd, 0xcb, 0xc3, 0xa8, 0x99, 0x4b, 0x79, 0x0a, 0xba, 0x97, 0x83, 0x31,
-	0xd5, 0xc1, 0x79, 0x74, 0xc4, 0x78, 0xb8, 0x69, 0x70, 0xf2, 0x2a, 0xd5, 0x49, 0xda, 0x87, 0xb9,
-	0x0a, 0xf4, 0xdd, 0xc8, 0x4b, 0x3a, 0xe2, 0x34, 0xa0, 0xdf, 0xa8, 0xa2, 0x0f, 0xf0, 0x80, 0x57,
-	0x59, 0xc0, 0x6b, 0xd1, 0x94, 0xf9, 0xa8, 0xd3, 0x00, 0xff, 0x23, 0x3a, 0x7c, 0xca, 0x27, 0xbe,
-	0x0a, 0x78, 0x17, 0x4d, 0x27, 0x9c, 0x78, 0x1a, 0xd0, 0xaf, 0xd3, 0xa9, 0xb7, 0x7d, 0x08, 0xac,
-	0xc5, 0x3c, 0x93, 0x7c, 0xda, 0x69, 0x40, 0x7e, 0xa5, 0x1e, 0x77, 0x8a, 0xc7, 0xc2, 0xb1, 0xdd,
-	0xaa, 0x9f, 0x79, 0xaa, 0x98, 0xb9, 0xbd, 0x7a, 0x09, 0x24, 0x4c, 0xe4, 0x38, 0x53, 0xf5, 0x30,
-	0xb9, 0x3f, 0x0f, 0xa7, 0x93, 0x3d, 0x14, 0xf6, 0xd7, 0xcf, 0xf4, 0x33, 0x48, 0xd5, 0x41, 0x76,
-	0xff, 0x41, 0x24, 0x78, 0x70, 0xf7, 0x1f, 0x44, 0x82, 0x87, 0xe1, 0xbd, 0x3c, 0x40, 0x09, 0x8d,
-	0x9e, 0x08, 0xaa, 0x2e, 0x46, 0xf6, 0x19, 0x86, 0x7e, 0xd4, 0xa7, 0x7a, 0x18, 0xdd, 0xcb, 0xc3,
-	0x95, 0x08, 0xc9, 0xbf, 0xc7, 0xad, 0x75, 0x49, 0x15, 0x4d, 0x9d, 0xba, 0xab, 0x53, 0x6f, 0xed,
-	0x6e, 0xb5, 0x5b, 0x83, 0x69, 0x2c, 0xd5, 0xd3, 0x40, 0x5a, 0x69, 0x76, 0x0e, 0x8d, 0x4a, 0xb1,
-	0x3d, 0x8a, 0x40, 0x17, 0x17, 0x87, 0xe8, 0xff, 0xae, 0x04, 0xcb, 0x3f, 0x7a, 0x53, 0xd1, 0x71,
-	0x0f, 0xa2, 0x91, 0x6b, 0xab, 0xcb, 0xc1, 0xab, 0x6f, 0x38, 0x55, 0xcc, 0x5c, 0x36, 0x7a, 0xe0,
-	0x9e, 0x5a, 0xf1, 0xc2, 0x85, 0x0b, 0x17, 0x32, 0xfe, 0x59, 0x34, 0x5d, 0x17, 0x8b, 0x58, 0xd5,
-	0xee, 0x2c, 0xba, 0x16, 0xa2, 0xd3, 0xbb, 0xa7, 0xc6, 0x58, 0x3e, 0x52, 0x8f, 0x52, 0x43, 0xbf,
-	0x22, 0xbf, 0x8e, 0x3c, 0x03, 0x08, 0xfc, 0x41, 0x6e, 0x83, 0xf2, 0x86, 0x1a, 0xcb, 0xd6, 0xa9,
-	0x18, 0x0a, 0xcb, 0x6d, 0x7f, 0x13, 0x1d, 0x35, 0xc0, 0xec, 0xda, 0xe3, 0xbc, 0xb1, 0xc6, 0x72,
-	0x7a, 0x3a, 0x86, 0x03, 0x25, 0x20, 0x01, 0xa8, 0x6b, 0x0f, 0xf4, 0xa6, 0x1a, 0x4b, 0xfd, 0x38,
-	0x10, 0x54, 0x8a, 0x64, 0xe2, 0x08, 0xb6, 0xc2, 0x79, 0x73, 0x8d, 0x55, 0x08, 0x23, 0x71, 0x04,
-	0xf7, 0x21, 0xce, 0x12, 0xe7, 0x2d, 0x35, 0x56, 0x47, 0xcc, 0xc4, 0x25, 0x02, 0x75, 0xed, 0x81,
-	0xde, 0x5a, 0x63, 0xe5, 0xc6, 0x4c, 0x1c, 0xc1, 0xfe, 0x16, 0x9a, 0x31, 0x00, 0x89, 0x93, 0x0b,
-	0x1b, 0xa4, 0xb7, 0xd5, 0x58, 0x55, 0xf2, 0x62, 0x48, 0xbc, 0x8a, 0xf9, 0xb7, 0xa1, 0x8b, 0x4c,
-	0xe4, 0xa5, 0xc1, 0x7a, 0x7b, 0x8d, 0x89, 0xd6, 0xa3, 0x71, 0xfa, 0xb8, 0xb7, 0x84, 0x0d, 0xb1,
-	0x01, 0xaf, 0xf6, 0x59, 0x20, 0xbd, 0xa3, 0xc6, 0xd4, 0x6d, 0x7c, 0x43, 0x30, 0x6d, 0xdc, 0x8f,
-	0x3e, 0xcb, 0x2f, 0xea, 0x9d, 0x35, 0xa6, 0x81, 0x13, 0xe8, 0x23, 0xb8, 0x2f, 0x7d, 0x96, 0x58,
-	0xef, 0xaa, 0x31, 0xad, 0x9c, 0x44, 0x5f, 0xe2, 0xfe, 0x83, 0xc3, 0x1e, 0x2b, 0xa8, 0x5e, 0x8d,
-	0x89, 0xea, 0xf8, 0xfe, 0x03, 0x4d, 0x9e, 0x94, 0x51, 0x70, 0xb8, 0x63, 0x03, 0xf4, 0xee, 0x1a,
-	0xeb, 0x02, 0x86, 0x8c, 0x82, 0x13, 0x5f, 0xf3, 0x86, 0x60, 0x67, 0x45, 0x56, 0x38, 0xef, 0xa9,
-	0x31, 0x89, 0x1e, 0xdf, 0x10, 0x4c, 0xe0, 0xfb, 0x0f, 0x38, 0xe8, 0x12, 0x03, 0x8e, 0x3c, 0x42,
-	0xb2, 0x02, 0x7b, 0x6f, 0x6d, 0x00, 0x29, 0x3f, 0x13, 0x5b, 0x62, 0xf8, 0x99, 0xff, 0xb8, 0x83,
-	0x4a, 0x89, 0xcb, 0xe4, 0x8f, 0x07, 0xac, 0x56, 0x7a, 0x6f, 0x6d, 0x30, 0xd9, 0x7f, 0x89, 0x79,
-	0xb1, 0xfc, 0x63, 0xff, 0x61, 0x07, 0x7d, 0x9f, 0x61, 0xbd, 0xca, 0x73, 0x19, 0xab, 0xd5, 0xbe,
-	0xaf, 0x36, 0xc8, 0x5f, 0x09, 0x17, 0xc5, 0xd6, 0x2a, 0x3f, 0xf4, 0xef, 0x73, 0xd0, 0xa5, 0xc6,
-	0x1e, 0x21, 0x8f, 0xf1, 0xac, 0x96, 0x7a, 0x5f, 0x2d, 0xd5, 0x9f, 0x14, 0x17, 0x1b, 0x3a, 0x4b,
-	0xf8, 0xa9, 0xff, 0xa8, 0x83, 0x66, 0xfb, 0x2c, 0x32, 0xcd, 0x06, 0xb8, 0xbf, 0x96, 0xf6, 0x0f,
-	0x90, 0x4b, 0x93, 0x96, 0x2a, 0xbe, 0xfc, 0x87, 0x1c, 0x24, 0xd3, 0x4d, 0xbf, 0x69, 0x6d, 0xb3,
-	0xc2, 0x07, 0x6a, 0xec, 0x71, 0x94, 0xcd, 0x9b, 0x36, 0x66, 0x01, 0x1b, 0x24, 0xac, 0xc6, 0x6f,
-	0xa8, 0x35, 0x46, 0x7f, 0x60, 0x64, 0x97, 0x4c, 0x3d, 0xf5, 0xba, 0xb8, 0x44, 0xd3, 0x9e, 0x2f,
-	0xf9, 0xdb, 0x6a, 0xe9, 0x8c, 0x3c, 0x63, 0xb2, 0xcb, 0x86, 0x9e, 0x7e, 0xdd, 0x7c, 0x3a, 0x0e,
-	0x08, 0xba, 0xf1, 0x76, 0xb5, 0xdb, 0x45, 0x1f, 0x4b, 0xd9, 0xed, 0xea, 0x9e, 0x76, 0x5d, 0xdd,
-	0x8b, 0x23, 0x72, 0x05, 0xb9, 0x6d, 0x86, 0x4c, 0x21, 0x21, 0xef, 0xef, 0xa9, 0xd7, 0xdd, 0x0d,
-	0x88, 0x5c, 0x4a, 0x76, 0x12, 0x69, 0xb5, 0xec, 0xb2, 0x0f, 0xf4, 0xe2, 0xd7, 0xe5, 0xcd, 0xd4,
-	0x12, 0xdc, 0x8f, 0x5a, 0x4b, 0xd8, 0x07, 0x7b, 0xda, 0x75, 0xfb, 0x04, 0x6a, 0x09, 0xee, 0x47,
-	0xad, 0x25, 0xe4, 0x43, 0x3d, 0xf5, 0xba, 0x7e, 0x02, 0xb5, 0x04, 0xfb, 0x1d, 0x55, 0xc2, 0xc4,
-	0x9e, 0xca, 0x59, 0x41, 0x3e, 0xdc, 0xd3, 0xaf, 0xfb, 0x1f, 0x8d, 0x83, 0x0a, 0xdd, 0x79, 0x27,
-	0xba, 0xd8, 0x48, 0x6d, 0x1a, 0xd8, 0x47, 0x7a, 0x91, 0x9f, 0x0b, 0x98, 0x31, 0xd0, 0x2b, 0x34,
-	0xe8, 0xed, 0xe6, 0x9d, 0x64, 0x2f, 0x42, 0xdf, 0xdf, 0x8b, 0xfc, 0xdc, 0x80, 0x61, 0x1b, 0x81,
-	0x1e, 0xed, 0xc7, 0xb0, 0xe5, 0x97, 0xfa, 0x81, 0x9e, 0xfe, 0x73, 0x05, 0x49, 0x0c, 0x13, 0xdc,
-	0x9f, 0x61, 0x4b, 0xd8, 0x47, 0x7b, 0x91, 0x9f, 0x3b, 0x48, 0x64, 0x98, 0x60, 0xff, 0xbc, 0x79,
-	0x0b, 0xa7, 0xd0, 0xa9, 0x8f, 0xf5, 0x8c, 0x3f, 0x97, 0x60, 0xd8, 0xcb, 0x5c, 0xb8, 0xbe, 0x2e,
-	0x21, 0x61, 0xed, 0x95, 0xeb, 0xe3, 0xbd, 0xa4, 0x9f, 0x5b, 0x30, 0xe5, 0x2e, 0xa8, 0xd9, 0xd7,
-	0x3b, 0xe6, 0xbd, 0x65, 0xaf, 0x67, 0x9f, 0xe8, 0xed, 0xf5, 0x7b, 0x0d, 0x86, 0xcd, 0x06, 0x5a,
-	0xf7, 0x09, 0x4d, 0x94, 0x99, 0x9e, 0x97, 0x5a, 0xad, 0xe4, 0xc9, 0xde, 0xf7, 0xe0, 0x07, 0x1f,
-	0x2e, 0x8a, 0x2f, 0x56, 0xaa, 0xde, 0xc7, 0x34, 0xd5, 0x6b, 0x7e, 0xc6, 0x6a, 0xb5, 0xe4, 0xa7,
-	0x7a, 0x03, 0xfd, 0x62, 0xc4, 0x25, 0xa6, 0xda, 0x2c, 0x55, 0xda, 0xba, 0x7a, 0xe4, 0xa4, 0x5d,
-	0x16, 0xb4, 0x5b, 0xe4, 0x77, 0x1d, 0x76, 0xb3, 0x50, 0x9e, 0x39, 0x05, 0xca, 0x15, 0x43, 0x7f,
-	0x43, 0x15, 0x2d, 0xfa, 0x65, 0x43, 0x2b, 0x98, 0x0f, 0x32, 0x18, 0xf5, 0xd0, 0x29, 0x50, 0xaf,
-	0x28, 0xfa, 0xe7, 0xd4, 0x1d, 0x1b, 0xb9, 0xac, 0x68, 0x05, 0xf4, 0x21, 0x06, 0xa4, 0x9e, 0x3a,
-	0x05, 0xda, 0x15, 0xc7, 0x04, 0xa4, 0x14, 0x92, 0xe1, 0xc3, 0x0c, 0xa9, 0x60, 0x40, 0xe2, 0x5a,
-	0x21, 0x91, 0x3b, 0xcb, 0xa2, 0xf7, 0x11, 0x06, 0x94, 0x35, 0x73, 0x47, 0x70, 0x1f, 0xee, 0x2c,
-	0x81, 0x3e, 0xca, 0x80, 0xdc, 0x04, 0xee, 0x12, 0x91, 0x52, 0x68, 0x82, 0x8f, 0x31, 0xa4, 0xe1,
-	0x04, 0xee, 0x08, 0xf6, 0x6f, 0x55, 0x0b, 0x68, 0xf4, 0xb2, 0xa7, 0x15, 0xd4, 0xc7, 0x19, 0x94,
-	0x7a, 0xf4, 0x14, 0xe8, 0x57, 0x44, 0xfd, 0x86, 0xda, 0x16, 0x63, 0x97, 0x45, 0xad, 0xc0, 0x3e,
-	0xc1, 0xc0, 0xd4, 0xb3, 0xa7, 0x20, 0x72, 0xc5, 0x34, 0x61, 0x57, 0xd8, 0xb7, 0xfd, 0x4f, 0x32,
-	0xa8, 0x8c, 0x61, 0x57, 0x40, 0xb3, 0xef, 0xc3, 0xa0, 0xe5, 0x97, 0xf5, 0x29, 0x86, 0x94, 0x4f,
-	0x62, 0x90, 0xe0, 0xbe, 0x0c, 0x5a, 0x82, 0x7d, 0x9a, 0x81, 0x15, 0x13, 0x19, 0x4c, 0xdc, 0x85,
-	0x29, 0xda, 0xfa, 0xd3, 0x0c, 0xcb, 0x31, 0xec, 0x42, 0xde, 0xc6, 0x13, 0x32, 0xcb, 0xbe, 0x8b,
-	0x3f, 0xc3, 0x90, 0x46, 0x4d, 0x99, 0x05, 0x2d, 0xdb, 0xbc, 0x2b, 0xec, 0x1b, 0xf6, 0xb3, 0x0c,
-	0x68, 0xcc, 0xb0, 0x2b, 0xa0, 0x2b, 0x3f, 0xa8, 0x9d, 0x40, 0x19, 0x6e, 0xfb, 0x5a, 0xa1, 0x3d,
-	0xc7, 0xd0, 0x06, 0x3f, 0x82, 0x0a, 0xa2, 0x77, 0x84, 0xa9, 0x7a, 0x28, 0x25, 0xae, 0x33, 0xcd,
-	0x09, 0xc4, 0xf3, 0x6c, 0xa9, 0xdf, 0x93, 0x33, 0xa8, 0xc0, 0x70, 0xc9, 0xd8, 0x7f, 0x44, 0x93,
-	0x3b, 0xa6, 0xfb, 0xc6, 0x56, 0xcb, 0xfd, 0x0c, 0x5f, 0xee, 0xc0, 0x87, 0x50, 0x41, 0xec, 0x96,
-	0xb2, 0x7f, 0xbf, 0x76, 0x08, 0x65, 0xbc, 0xb0, 0x6c, 0xb5, 0xd6, 0xcf, 0xf2, 0x5d, 0x90, 0xfe,
-	0x14, 0x2a, 0x88, 0x5f, 0x73, 0xa6, 0x72, 0x6c, 0xb6, 0xcf, 0x2a, 0xd3, 0xec, 0x81, 0xcf, 0x71,
-	0x52, 0x07, 0x3a, 0x86, 0x0a, 0x8c, 0xf7, 0xa4, 0xfd, 0x87, 0xd5, 0x63, 0x28, 0xfd, 0x86, 0xb3,
-	0xcd, 0x12, 0x3f, 0xcf, 0x96, 0x98, 0xf2, 0x1c, 0x4a, 0xbf, 0x67, 0x9d, 0xb0, 0x9c, 0x95, 0x82,
-	0x78, 0x55, 0xbf, 0xdb, 0xda, 0x6a, 0xb7, 0x56, 0xa6, 0xe3, 0xef, 0x48, 0xb2, 0x0f, 0x2e, 0x5b,
-	0x40, 0x07, 0xd5, 0xf7, 0xc4, 0x4d, 0x0f, 0x44, 0x91, 0x3b, 0x26, 0x1f, 0x88, 0xbe, 0xe0, 0xac,
-	0xbc, 0xe6, 0xc7, 0x6b, 0xb1, 0x65, 0x1f, 0x67, 0xcb, 0x3e, 0xd3, 0xdd, 0x38, 0xbe, 0xd5, 0xea,
-	0xd4, 0x77, 0x5a, 0x6b, 0x0d, 0xf6, 0x3b, 0xb7, 0x6c, 0x74, 0xf7, 0x78, 0xa3, 0xbe, 0xb9, 0x76,
-	0xf6, 0xfc, 0xf1, 0xa4, 0x9f, 0xc4, 0xfd, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x2c, 0x45,
-	0xc2, 0x2d, 0x57, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto2_20190205_c823c79e/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/test.pb.go
deleted file mode 100644
index 7fde665cd5d..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/test.pb.go
+++ /dev/null
@@ -1,1187 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go.
-// source: proto3_20160225_2fc053c5/test.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_20160225_2fc053c5 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto3_20160225_2fc053c5/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto3_20160225_2fc053c5
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto3_20160225.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto3_20160225.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto3_20160225.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto3_20160225.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20160225.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20160225.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto3_20160225.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto3_20160225.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()           {}
-func (*Message_OneofInt32) isMessage_OneofUnion()          {}
-func (*Message_OneofSint32) isMessage_OneofUnion()         {}
-func (*Message_OneofUint32) isMessage_OneofUnion()         {}
-func (*Message_OneofInt64) isMessage_OneofUnion()          {}
-func (*Message_OneofSint64) isMessage_OneofUnion()         {}
-func (*Message_OneofUint64) isMessage_OneofUnion()         {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()       {}
-func (*Message_OneofFloat) isMessage_OneofUnion()          {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()       {}
-func (*Message_OneofDouble) isMessage_OneofUnion()         {}
-func (*Message_OneofString) isMessage_OneofUnion()         {}
-func (*Message_OneofBytes) isMessage_OneofUnion()          {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()      {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()   {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()    {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-func (*Message_OneofString1) isMessage_OneofUnion()        {}
-func (*Message_OneofString2) isMessage_OneofUnion()        {}
-func (*Message_OneofString3) isMessage_OneofUnion()        {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(400<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(401<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(402<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(403<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(404<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(405<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(406<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(407<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(408<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(409<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(410<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(411<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(412<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(413<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(414<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(415<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(416<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(417<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(418<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_OneofString1:
-		b.EncodeVarint(419<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(420<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(421<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 400: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 401: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 402: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 403: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 404: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 405: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 406: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 407: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 408: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 409: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 410: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 411: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 412: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 413: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 414: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 415: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 416: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 417: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 418: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 419: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 420: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 421: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(400<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(401<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(402<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(403<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(404<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(405<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(406<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(407<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(408<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(409<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(410<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(411<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(412<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(413<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(414<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(415<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(416<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(417<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(418<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofString1:
-		n += proto.SizeVarint(419<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(420<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(421<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Message_ChildMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20160225.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20160225.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20160225.Message.ChildMessage")
-	proto.RegisterEnum("google.golang.org.proto3_20160225.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20160225.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-}
-
-var fileDescriptor0 = []byte{
-	// 1946 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x57, 0x73, 0xdb, 0xca,
-	0x15, 0xc7, 0x09, 0x52, 0xc5, 0x5a, 0xb1, 0x82, 0x96, 0xb2, 0xa3, 0x27, 0x44, 0x76, 0x1c, 0xc4,
-	0xc9, 0x50, 0x16, 0x09, 0x23, 0x19, 0x27, 0xb1, 0x2d, 0xd9, 0x72, 0xe8, 0x8c, 0x9d, 0x78, 0xe0,
-	0x51, 0x1e, 0xf2, 0xa2, 0x50, 0x12, 0x48, 0xd3, 0x06, 0x09, 0x45, 0x24, 0x3d, 0xd1, 0xe4, 0xc1,
-	0x5f, 0x21, 0xf5, 0xf6, 0x5e, 0xde, 0x6e, 0xef, 0xbd, 0xfb, 0x8e, 0x6f, 0xef, 0xf5, 0xd3, 0xdc,
-	0x59, 0x1c, 0x6c, 0x03, 0x40, 0x93, 0x04, 0xe7, 0x3e, 0x78, 0x46, 0x3a, 0xfc, 0xef, 0xf9, 0xf1,
-	0x1c, 0x9c, 0x3d, 0x67, 0x17, 0x16, 0x3a, 0xb0, 0xb3, 0xeb, 0x76, 0xdd, 0xca, 0x46, 0xf9, 0xc8,
-	0xb2, 0x79, 0xa4, 0x5c, 0x3e, 0xba, 0x51, 0xae, 0x6f, 0x1d, 0x39, 0x5a, 0xd9, 0x3a, 0xba, 0xd4,
-	0xb5, 0x3b, 0xdd, 0x92, 0xf7, 0xa9, 0xfa, 0xd3, 0x86, 0xeb, 0x36, 0x1c, 0xbb, 0xd4, 0x70, 0x9d,
-	0x5a, 0xbb, 0x51, 0x72, 0x77, 0x1b, 0xa5, 0xc0, 0xb2, 0x45, 0x07, 0x65, 0x2f, 0x36, 0x37, 0x9d,
-	0x66, 0xbb, 0x71, 0xde, 0xee, 0x74, 0x6a, 0x0d, 0x5b, 0xcd, 0xa2, 0x64, 0x7d, 0x19, 0x2b, 0x9a,
-	0xa2, 0xcf, 0x58, 0xc9, 0xfa, 0xb2, 0xf7, 0x7b, 0x19, 0x27, 0xb5, 0x94, 0xf7, 0x7b, 0x59, 0x3d,
-	0x86, 0x92, 0xf5, 0x0a, 0x4e, 0x69, 0x8a, 0x3e, 0x5b, 0x3e, 0x5c, 0x1a, 0x48, 0x28, 0xf9, 0x7e,
-	0xad, 0x64, 0xbd, 0xb2, 0x78, 0xfd, 0x24, 0x9a, 0xa6, 0x9c, 0x03, 0x28, 0xe3, 0xee, 0x74, 0x9b,
-	0x6e, 0xbb, 0xe6, 0x6c, 0x6c, 0xba, 0xae, 0x83, 0xb7, 0x35, 0x45, 0xdf, 0x67, 0xa5, 0xa9, 0x71,
-	0xd5, 0x75, 0x1d, 0xf5, 0x67, 0x28, 0xcb, 0x44, 0xcd, 0x76, 0xb7, 0x52, 0xc6, 0xb6, 0xa6, 0xe8,
-	0x93, 0x16, 0x5b, 0x7a, 0x96, 0x18, 0xd5, 0x9f, 0xa3, 0x1c, 0x93, 0x75, 0x40, 0x57, 0xd7, 0x14,
-	0xbd, 0x60, 0xb1, 0xd5, 0x17, 0x9b, 0x21, 0x61, 0x0f, 0x84, 0x0d, 0x4d, 0xd1, 0x33, 0x5c, 0xb8,
-	0x0e, 0xc2, 0x00, 0xd8, 0x34, 0xf0, 0x25, 0x4d, 0xd1, 0x53, 0x12, 0xd8, 0x34, 0x42, 0x60, 0xd3,
-	0xc0, 0x4d, 0x4d, 0xd1, 0x55, 0x19, 0x1c, 0x10, 0xf6, 0x40, 0x78, 0x59, 0x53, 0xf4, 0x09, 0x19,
-	0x6c, 0x1a, 0xea, 0x2f, 0x50, 0x9e, 0x09, 0xeb, 0xcd, 0x7f, 0xd8, 0xdb, 0x95, 0x32, 0xbe, 0xa2,
-	0x29, 0xfa, 0xb4, 0xc5, 0x1c, 0x9c, 0x01, 0xb3, 0xfa, 0x4b, 0x54, 0xe0, 0x70, 0xaa, 0x75, 0x34,
-	0x45, 0xcf, 0x59, 0xcc, 0xc7, 0x45, 0xdf, 0x2e, 0x05, 0x54, 0x77, 0xdc, 0x5a, 0x17, 0xb7, 0x34,
-	0x45, 0x4f, 0xf2, 0x80, 0xce, 0x10, 0x63, 0x18, 0x6f, 0x1a, 0xb8, 0xad, 0x29, 0xfa, 0x54, 0x00,
-	0x6f, 0x1a, 0x11, 0x78, 0xd3, 0xc0, 0xae, 0xa6, 0xe8, 0xf9, 0x20, 0x3e, 0x10, 0xff, 0xb6, 0xdb,
-	0xdb, 0x74, 0x6c, 0xbc, 0xa3, 0x29, 0xba, 0xc2, 0xe3, 0x3f, 0xed, 0x59, 0xe5, 0x8c, 0x76, 0x77,
-	0x9b, 0xed, 0x06, 0xfe, 0xbb, 0x57, 0x8b, 0x3c, 0xa3, 0x9e, 0x55, 0x0a, 0x68, 0x73, 0xaf, 0x6b,
-	0x77, 0xf0, 0xae, 0xa6, 0xe8, 0x69, 0x1e, 0xd0, 0x2a, 0x31, 0xaa, 0xdb, 0xa8, 0xc8, 0x64, 0x5b,
-	0x97, 0x9a, 0xce, 0xf6, 0x86, 0xdd, 0xee, 0xb5, 0x70, 0x47, 0x53, 0xf4, 0x6c, 0xd9, 0x18, 0xbe,
-	0x7e, 0x4b, 0xa7, 0xc8, 0xe2, 0xb5, 0x76, 0xaf, 0x65, 0xb1, 0xb0, 0x99, 0x49, 0x6d, 0xa1, 0xf9,
-	0x00, 0xa5, 0x05, 0xcb, 0x70, 0xd7, 0xdb, 0x28, 0xbf, 0x1e, 0x15, 0x44, 0x77, 0xcd, 0x7e, 0x89,
-	0x45, 0xf7, 0xce, 0x26, 0x9a, 0x13, 0xca, 0xce, 0xdb, 0xbe, 0x10, 0x56, 0xcf, 0x0b, 0xab, 0x34,
-	0x04, 0xcd, 0xdf, 0xf5, 0x5e, 0x40, 0x45, 0x5e, 0xac, 0xcc, 0xa8, 0x5e, 0x41, 0x38, 0xc4, 0xa0,
-	0x41, 0x5d, 0xf5, 0x82, 0x5a, 0x1e, 0x1e, 0x43, 0xc3, 0x99, 0x0f, 0x90, 0x68, 0x40, 0x07, 0x51,
-	0x66, 0xd7, 0xde, 0xb1, 0x6b, 0x5d, 0x7b, 0x1b, 0x9a, 0xc1, 0x0d, 0x45, 0x4b, 0x91, 0x6e, 0x40,
-	0xad, 0x5e, 0x37, 0x38, 0x84, 0xb2, 0x4c, 0x05, 0x9b, 0xf7, 0x3d, 0x22, 0x9b, 0xb4, 0xd8, 0x62,
-	0x68, 0x07, 0x3a, 0xca, 0x31, 0x9d, 0xdf, 0x0e, 0xde, 0x27, 0xc2, 0x82, 0xc5, 0xd6, 0xfb, 0xfd,
-	0x40, 0x54, 0xfa, 0xfd, 0xe0, 0x03, 0xa2, 0xcc, 0x70, 0xa5, 0xdf, 0x10, 0x02, 0x6c, 0xd3, 0xc0,
-	0x1f, 0x12, 0x61, 0x4a, 0x62, 0x9b, 0x46, 0x88, 0x6d, 0x1a, 0xf8, 0x23, 0x22, 0x54, 0x65, 0x76,
-	0x40, 0xe9, 0xb7, 0x84, 0x8f, 0x89, 0x72, 0x42, 0x66, 0x9b, 0x86, 0x7a, 0x18, 0xe5, 0x99, 0x92,
-	0xee, 0xf3, 0x4f, 0x88, 0x74, 0xda, 0x62, 0x2e, 0x68, 0x53, 0xf8, 0x15, 0x2a, 0x70, 0x3e, 0x15,
-	0x7f, 0x4a, 0xc4, 0x39, 0x8b, 0x79, 0x61, 0x5d, 0x41, 0x8c, 0x0a, 0xba, 0xc2, 0x67, 0x44, 0x9a,
-	0xe4, 0x51, 0x41, 0x5b, 0x08, 0x7d, 0x03, 0xd3, 0xc0, 0x9f, 0x13, 0xe5, 0x54, 0xe0, 0x1b, 0x98,
-	0x46, 0xc4, 0x37, 0x30, 0x0d, 0xfc, 0x05, 0x11, 0xe7, 0x83, 0xdf, 0x20, 0x90, 0x05, 0xbf, 0x31,
-	0x7c, 0x49, 0xb4, 0x0a, 0xcf, 0x82, 0xdf, 0x19, 0xa4, 0xcc, 0x42, 0x67, 0xf8, 0x4a, 0xf1, 0xc6,
-	0x12, 0xcf, 0x2c, 0xb4, 0x06, 0x31, 0x2a, 0x68, 0x0d, 0x5f, 0x13, 0x61, 0x9a, 0x47, 0x05, 0xbd,
-	0xc1, 0x46, 0x45, 0xa6, 0x13, 0x7a, 0xc3, 0x37, 0x44, 0x1c, 0xbb, 0x39, 0x50, 0x8f, 0xbc, 0x39,
-	0xb4, 0xd1, 0x7c, 0x00, 0x43, 0xf7, 0xd1, 0xb7, 0x84, 0x34, 0x4e, 0x77, 0x90, 0x60, 0x74, 0x33,
-	0x6d, 0xa1, 0x39, 0xa1, 0x04, 0x85, 0xee, 0xf0, 0x1d, 0x04, 0x36, 0x72, 0x7b, 0xe0, 0x85, 0xcb,
-	0xdb, 0x83, 0x83, 0x70, 0x08, 0x42, 0xc3, 0xfa, 0x1e, 0xc2, 0x8a, 0xd3, 0x1f, 0x02, 0x28, 0x1a,
-	0xd2, 0xdf, 0x50, 0xa6, 0x55, 0xdb, 0xf1, 0x5a, 0x03, 0xf4, 0x87, 0x47, 0x92, 0x1e, 0xe2, 0xb7,
-	0x23, 0x64, 0xee, 0x7c, 0x6d, 0x87, 0x74, 0x11, 0xf2, 0x6f, 0xad, 0xdd, 0xdd, 0xdd, 0xb3, 0x66,
-	0x5b, 0xdc, 0xa2, 0x6e, 0xa1, 0x2c, 0x23, 0x40, 0x23, 0x78, 0x14, 0x10, 0xbf, 0x1b, 0x1d, 0xe1,
-	0x75, 0x21, 0x60, 0xa4, 0x5b, 0x82, 0x49, 0xad, 0xa3, 0x1c, 0x83, 0xf8, 0x8d, 0xe9, 0x31, 0xa0,
-	0xfc, 0x7e, 0x74, 0x0a, 0xb4, 0x30, 0xc0, 0x64, 0x5a, 0xa2, 0x4d, 0xe2, 0xf8, 0x6d, 0xed, 0xf1,
-	0xd8, 0x9c, 0xf5, 0x08, 0x8e, 0xdf, 0x14, 0x03, 0x49, 0x33, 0x0d, 0xfc, 0xc4, 0x38, 0x49, 0x33,
-	0x8d, 0x50, 0xd2, 0x4c, 0x23, 0x94, 0x34, 0xd3, 0xc0, 0x4f, 0x8e, 0x95, 0x34, 0x8a, 0x11, 0x93,
-	0x16, 0xe0, 0xf8, 0xfd, 0xf8, 0xa9, 0xb1, 0x92, 0x16, 0xe4, 0xf8, 0xdd, 0xbc, 0x89, 0xf2, 0x8c,
-	0x43, 0x1b, 0xf4, 0xd3, 0x00, 0x3a, 0x3e, 0x3a, 0xc8, 0xef, 0xfb, 0x40, 0xca, 0xb6, 0x24, 0xa3,
-	0xea, 0xa0, 0x02, 0x4f, 0x1d, 0x65, 0x3d, 0x03, 0xac, 0x13, 0x31, 0x92, 0x57, 0x17, 0x61, 0xb9,
-	0x96, 0x6c, 0x95, 0xaa, 0x01, 0x86, 0xc9, 0xb3, 0xb1, 0xab, 0xc1, 0x1b, 0x3b, 0x72, 0x35, 0xc0,
-	0x24, 0x0a, 0x65, 0xcf, 0x34, 0xf0, 0x73, 0xe3, 0x65, 0x8f, 0x3e, 0x27, 0x29, 0x7b, 0xa6, 0x11,
-	0x91, 0x3d, 0xd3, 0xc0, 0xcf, 0x8f, 0x99, 0x3d, 0x0a, 0x93, 0xb3, 0x17, 0x28, 0x3f, 0x7f, 0x10,
-	0xbe, 0x10, 0xbb, 0xfc, 0x60, 0x64, 0xca, 0xe5, 0xe7, 0x8f, 0x51, 0x69, 0x3b, 0xc1, 0x18, 0x7d,
-	0x31, 0xfe, 0x76, 0xf2, 0x1c, 0x04, 0xb6, 0x13, 0x0c, 0x61, 0xb1, 0x1a, 0x60, 0x08, 0xbf, 0x14,
-	0xbb, 0x1a, 0xbc, 0x71, 0x2d, 0x57, 0x03, 0x4c, 0xf0, 0x1d, 0x54, 0x64, 0x10, 0x61, 0x82, 0xbf,
-	0x0c, 0xa4, 0x93, 0xa3, 0x93, 0xd8, 0xd4, 0x06, 0x5a, 0xbe, 0x15, 0x30, 0xab, 0x7b, 0x68, 0x3e,
-	0x40, 0xa4, 0x53, 0xef, 0x15, 0x80, 0x9e, 0x8a, 0x09, 0xf5, 0x6d, 0xc0, 0x2d, 0xb6, 0xc2, 0x9f,
-	0xa8, 0x57, 0xd1, 0x9c, 0xd0, 0x08, 0x85, 0xb9, 0xfe, 0x2a, 0x90, 0x57, 0xe3, 0xb4, 0x43, 0x36,
-	0xd1, 0x01, 0xac, 0xb6, 0x42, 0x1f, 0xa8, 0xd7, 0x10, 0x0e, 0x71, 0x69, 0xd0, 0xaf, 0x01, 0x7a,
-	0x2d, 0x36, 0x5a, 0x0a, 0x7b, 0xae, 0x15, 0xf5, 0x19, 0x2d, 0x25, 0x6f, 0xe6, 0xc0, 0xf8, 0x7f,
-	0x3d, 0x56, 0x29, 0x79, 0x43, 0x98, 0xcf, 0x7f, 0x52, 0x4a, 0xcc, 0x44, 0xf7, 0x45, 0x47, 0xa0,
-	0xbc, 0x11, 0x6b, 0x5f, 0xc0, 0x0c, 0xe6, 0x18, 0xb2, 0x2f, 0xb8, 0x8d, 0x72, 0x7a, 0x02, 0xe7,
-	0xcd, 0x58, 0x9c, 0xf5, 0x08, 0x0e, 0xb7, 0x09, 0x49, 0x33, 0x0d, 0xc0, 0xbc, 0x15, 0x37, 0x69,
-	0xa6, 0x11, 0x4a, 0x1a, 0x98, 0xc4, 0xa4, 0x51, 0xca, 0xdb, 0xb1, 0x93, 0x26, 0x62, 0x68, 0xd2,
-	0x64, 0x4e, 0x4f, 0xe0, 0xbc, 0x13, 0x3b, 0x69, 0x41, 0x0e, 0xb7, 0xd1, 0xe9, 0xe2, 0x4f, 0x34,
-	0x00, 0x5d, 0x8f, 0x35, 0x5d, 0xfc, 0x11, 0xcc, 0x49, 0xe4, 0x69, 0x08, 0x46, 0x96, 0x3a, 0xaf,
-	0x5b, 0x02, 0xe9, 0xdd, 0x78, 0xa9, 0xf3, 0x3c, 0x04, 0x52, 0xc7, 0x6c, 0xaa, 0x86, 0x90, 0xdb,
-	0xb6, 0xdd, 0x3a, 0x20, 0xfe, 0x95, 0xd2, 0x14, 0x7d, 0x5f, 0x35, 0x61, 0xcd, 0x78, 0x46, 0x4f,
-	0xb1, 0x88, 0x66, 0x41, 0x01, 0x27, 0xc5, 0x7f, 0x13, 0xc9, 0x64, 0x35, 0x61, 0xc1, 0x3a, 0x38,
-	0xb9, 0x1e, 0x44, 0x69, 0xd0, 0xf8, 0xc7, 0xd6, 0xff, 0x10, 0x51, 0xa1, 0x9a, 0xb0, 0x60, 0xa9,
-	0x7f, 0xee, 0x64, 0x2a, 0xff, 0xd0, 0xf9, 0x5f, 0xa2, 0xca, 0x30, 0x95, 0x7f, 0x6a, 0x14, 0x79,
-	0xa6, 0x81, 0xff, 0x47, 0x44, 0x29, 0x91, 0x67, 0x1a, 0x32, 0xcf, 0x34, 0xf0, 0xff, 0x89, 0x48,
-	0x95, 0x78, 0xa2, 0xca, 0x3f, 0xaf, 0xdd, 0x42, 0x54, 0x13, 0x12, 0xcf, 0x34, 0xd4, 0x43, 0x28,
-	0x03, 0x2a, 0x7a, 0x02, 0xba, 0x95, 0xc8, 0xa6, 0xab, 0x09, 0x0b, 0x56, 0xd3, 0xd3, 0x92, 0x8e,
-	0xb2, 0x3e, 0x93, 0x0a, 0x6f, 0x23, 0xc2, 0x5c, 0x35, 0x61, 0x81, 0x03, 0x76, 0xd2, 0x61, 0x11,
-	0xc0, 0x31, 0xe7, 0x76, 0x22, 0x4b, 0xb2, 0x08, 0xe0, 0xa0, 0x22, 0x53, 0x4d, 0x03, 0xdf, 0x41,
-	0x54, 0x53, 0x32, 0xd5, 0xbb, 0x00, 0x4b, 0x54, 0xd3, 0xc0, 0x77, 0x12, 0x61, 0x3e, 0x40, 0x15,
-	0xa3, 0xf5, 0x8f, 0x07, 0x77, 0x11, 0x9d, 0xc2, 0xa2, 0xf5, 0xe7, 0x3b, 0xcf, 0x1c, 0x0c, 0xf7,
-	0xbb, 0x89, 0x6a, 0x86, 0x67, 0x0e, 0xa6, 0x33, 0x8b, 0x00, 0x46, 0xf3, 0x3d, 0x44, 0x94, 0x66,
-	0x11, 0xc0, 0x70, 0xad, 0xa1, 0x3c, 0x68, 0x84, 0xc9, 0x7a, 0x6f, 0x2a, 0xfe, 0x8b, 0xb3, 0x6a,
-	0xc2, 0x82, 0x50, 0xf9, 0x34, 0xbd, 0x8c, 0x8a, 0x22, 0x82, 0x4e, 0x95, 0xfb, 0x52, 0x63, 0xbd,
-	0x35, 0xab, 0x26, 0xac, 0x02, 0x07, 0xd1, 0x29, 0xb2, 0x81, 0x54, 0x5a, 0x52, 0xc2, 0xec, 0xbc,
-	0x3f, 0x15, 0xe7, 0x95, 0x59, 0x35, 0x61, 0xe5, 0xfd, 0x42, 0xe4, 0x73, 0xf2, 0x12, 0x9a, 0x93,
-	0x01, 0x34, 0x9c, 0x07, 0x52, 0x31, 0xdf, 0x97, 0x55, 0x13, 0x56, 0x51, 0xc4, 0xd0, 0x50, 0x58,
-	0x6d, 0xc1, 0x33, 0x5e, 0xc6, 0x0f, 0xd2, 0x87, 0x9c, 0x16, 0x1e, 0xf2, 0x72, 0x50, 0x57, 0xc6,
-	0x0f, 0x45, 0xe9, 0xca, 0x41, 0x5d, 0x05, 0x3f, 0x1c, 0xa5, 0xab, 0x2c, 0x5c, 0x46, 0x69, 0x29,
-	0xa5, 0x3f, 0xe2, 0xff, 0x15, 0x2c, 0x1c, 0x47, 0xf9, 0xe0, 0x8d, 0x5d, 0xcd, 0xa3, 0xd4, 0x15,
-	0x7b, 0xcf, 0x03, 0xee, 0xb3, 0xc8, 0x8f, 0xea, 0x7e, 0x34, 0x79, 0xb5, 0xe6, 0xf4, 0x6c, 0x9c,
-	0xf4, 0x6c, 0xf0, 0xcb, 0xb1, 0xe4, 0x6f, 0x94, 0x85, 0x13, 0xa8, 0x10, 0xba, 0x8e, 0x0f, 0x72,
-	0x30, 0x29, 0x3a, 0x38, 0x89, 0xd4, 0xf0, 0x4d, 0x7b, 0x90, 0x87, 0x42, 0xb4, 0x87, 0xf5, 0xe1,
-	0x3d, 0x64, 0xfa, 0x06, 0xe1, 0x5f, 0x1d, 0x06, 0x39, 0x48, 0xf5, 0x0f, 0x62, 0x48, 0x0f, 0x6a,
-	0xff, 0x20, 0x86, 0xf4, 0x30, 0x21, 0x7a, 0x58, 0x41, 0xc5, 0x88, 0xcb, 0xea, 0x20, 0x17, 0xd3,
-	0xa2, 0x8b, 0x55, 0xb4, 0x3f, 0xea, 0x0e, 0x3a, 0xc8, 0x47, 0x2e, 0x3a, 0x97, 0xfc, 0x72, 0x39,
-	0xc8, 0x41, 0xf2, 0x26, 0x71, 0x0c, 0x99, 0x8a, 0xa9, 0x9b, 0xc5, 0x31, 0xa4, 0x8f, 0x7c, 0xf4,
-	0x03, 0x11, 0x6e, 0x79, 0x83, 0x3c, 0x28, 0x7d, 0x8a, 0x82, 0xdf, 0xdf, 0x06, 0x79, 0x98, 0x89,
-	0xce, 0x25, 0xbf, 0x9a, 0x0d, 0x72, 0x90, 0x16, 0x1d, 0xec, 0xa1, 0xb9, 0xc8, 0x1b, 0x57, 0x84,
-	0x93, 0x3f, 0x8a, 0x4e, 0xe2, 0xbe, 0x96, 0x15, 0xd0, 0xd7, 0x10, 0xee, 0x77, 0xef, 0x8a, 0xa0,
-	0x9f, 0x17, 0xe9, 0x63, 0xbc, 0xaa, 0x15, 0xbe, 0x40, 0x0f, 0xfd, 0xa4, 0xcf, 0xf5, 0x2b, 0x82,
-	0x7f, 0x5a, 0x8e, 0x7e, 0xd4, 0x77, 0xb7, 0x02, 0xf6, 0x9f, 0x68, 0xa1, 0xff, 0xd5, 0x2b, 0x82,
-	0xfc, 0x07, 0x39, 0xf2, 0x18, 0x6f, 0x73, 0x43, 0x05, 0x23, 0x5f, 0xc0, 0x44, 0xe6, 0xe4, 0xa0,
-	0x76, 0x0e, 0x35, 0x1b, 0xb8, 0x5b, 0x89, 0x1e, 0x0a, 0xc3, 0x79, 0x58, 0xef, 0xef, 0x21, 0x33,
-	0xdc, 0x48, 0x91, 0x2f, 0x44, 0xa2, 0x83, 0xd4, 0xf0, 0x41, 0xf4, 0xf1, 0xa0, 0x0e, 0x1f, 0x44,
-	0x1f, 0x0f, 0x13, 0x83, 0x3c, 0x40, 0x17, 0x0b, 0x5e, 0x4f, 0x44, 0x17, 0xd3, 0x43, 0x86, 0x21,
-	0xdf, 0x3b, 0x44, 0x0f, 0x33, 0x03, 0x3c, 0x2c, 0x96, 0xd0, 0x0c, 0x3f, 0x04, 0xce, 0xa0, 0xc9,
-	0x95, 0x73, 0x17, 0xaa, 0x2b, 0xf9, 0x04, 0xf9, 0x71, 0xd5, 0x5a, 0xf9, 0xcb, 0x9f, 0xf3, 0x8a,
-	0x3a, 0x8b, 0xa6, 0x4f, 0x55, 0x57, 0xac, 0x73, 0x67, 0xd7, 0xf2, 0xc9, 0xd5, 0x0c, 0x3d, 0xae,
-	0xf6, 0xda, 0x4d, 0xb7, 0x7d, 0x78, 0x19, 0xcd, 0x8a, 0x07, 0xaf, 0x28, 0x07, 0x48, 0x4d, 0x73,
-	0x07, 0x37, 0x94, 0xd5, 0x0b, 0x7f, 0xfd, 0x53, 0xa8, 0x7e, 0x97, 0xbc, 0xfa, 0xdd, 0xec, 0xd5,
-	0x97, 0x9a, 0xed, 0xae, 0xbd, 0xdb, 0xae, 0x39, 0xde, 0x5f, 0x4f, 0x78, 0xd6, 0xce, 0x92, 0x63,
-	0x37, 0x6a, 0x5b, 0x7b, 0x4b, 0xfd, 0xfe, 0xd0, 0x62, 0x73, 0x0a, 0x3e, 0xf9, 0x21, 0x00, 0x00,
-	0xff, 0xff, 0x64, 0x49, 0xbf, 0xf0, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160225_2fc053c5/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/test.pb.go
deleted file mode 100644
index 6f426304c79..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/test.pb.go
+++ /dev/null
@@ -1,1187 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go.
-// source: proto3_20160519_a4ab9ec5/test.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_20160519_a4ab9ec5 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto3_20160519_a4ab9ec5/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto3_20160519_a4ab9ec5
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto3_20160519.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto3_20160519.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto3_20160519.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto3_20160519.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20160519.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20160519.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto3_20160519.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto3_20160519.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()           {}
-func (*Message_OneofInt32) isMessage_OneofUnion()          {}
-func (*Message_OneofSint32) isMessage_OneofUnion()         {}
-func (*Message_OneofUint32) isMessage_OneofUnion()         {}
-func (*Message_OneofInt64) isMessage_OneofUnion()          {}
-func (*Message_OneofSint64) isMessage_OneofUnion()         {}
-func (*Message_OneofUint64) isMessage_OneofUnion()         {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()       {}
-func (*Message_OneofFloat) isMessage_OneofUnion()          {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()       {}
-func (*Message_OneofDouble) isMessage_OneofUnion()         {}
-func (*Message_OneofString) isMessage_OneofUnion()         {}
-func (*Message_OneofBytes) isMessage_OneofUnion()          {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()      {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()   {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()    {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-func (*Message_OneofString1) isMessage_OneofUnion()        {}
-func (*Message_OneofString2) isMessage_OneofUnion()        {}
-func (*Message_OneofString3) isMessage_OneofUnion()        {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(400<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(401<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(402<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(403<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(404<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(405<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(406<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(407<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(408<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(409<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(410<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(411<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(412<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(413<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(414<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(415<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(416<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(417<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(418<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_OneofString1:
-		b.EncodeVarint(419<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(420<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(421<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 400: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 401: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 402: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 403: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 404: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 405: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 406: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 407: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 408: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 409: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 410: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 411: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 412: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 413: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 414: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 415: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 416: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 417: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 418: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 419: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 420: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 421: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(400<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(401<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(402<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(403<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(404<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(405<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(406<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(407<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(408<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(409<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(410<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(411<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(412<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(413<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(414<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(415<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(416<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(417<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(418<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofString1:
-		n += proto.SizeVarint(419<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(420<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(421<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Message_ChildMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20160519.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20160519.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20160519.Message.ChildMessage")
-	proto.RegisterEnum("google.golang.org.proto3_20160519.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20160519.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-}
-
-var fileDescriptor0 = []byte{
-	// 1947 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x57, 0x73, 0xdb, 0xca,
-	0x15, 0xc7, 0x09, 0x52, 0xc5, 0x5a, 0xb1, 0x82, 0x96, 0xb2, 0xa3, 0x27, 0x44, 0x76, 0x1c, 0xc4,
-	0xc9, 0x50, 0x26, 0x05, 0x23, 0xb1, 0x93, 0xd8, 0x96, 0x6c, 0x39, 0x74, 0xc6, 0x4e, 0x3c, 0xf0,
-	0x28, 0x0f, 0x79, 0x51, 0x48, 0x09, 0xa4, 0x69, 0x83, 0x84, 0x22, 0x92, 0x9e, 0x68, 0xf2, 0xe0,
-	0xaf, 0x90, 0xde, 0xeb, 0x2d, 0x6f, 0xb7, 0xf7, 0xde, 0x7d, 0xc7, 0xb7, 0xf7, 0xfa, 0x69, 0xee,
-	0x2c, 0x0e, 0xb6, 0x01, 0xa0, 0x49, 0x82, 0x73, 0x1f, 0x3c, 0x23, 0x1d, 0xfe, 0xf7, 0xfc, 0x78,
-	0x0e, 0xce, 0x9e, 0xb3, 0x0b, 0x0b, 0x1d, 0xda, 0xdd, 0x73, 0x7b, 0xee, 0xea, 0x56, 0xe5, 0x58,
-	0xd9, 0x3c, 0x76, 0xbc, 0x7c, 0x62, 0xab, 0x66, 0xd4, 0xea, 0x27, 0xec, 0xed, 0xe3, 0x2b, 0x3d,
-	0xbb, 0xdb, 0x2b, 0x79, 0x9f, 0xaa, 0xdf, 0x6c, 0xba, 0x6e, 0xd3, 0xb1, 0x4b, 0x4d, 0xd7, 0xa9,
-	0x75, 0x9a, 0x25, 0x77, 0xaf, 0x59, 0x0a, 0x2c, 0x5b, 0x76, 0x50, 0xf6, 0x4a, 0xab, 0xee, 0xb4,
-	0x3a, 0xcd, 0x4b, 0x76, 0xb7, 0x5b, 0x6b, 0xda, 0x6a, 0x16, 0x25, 0x1b, 0x65, 0xac, 0x68, 0x8a,
-	0x3e, 0x67, 0x25, 0x1b, 0x65, 0xef, 0xf7, 0x0a, 0x4e, 0x6a, 0x29, 0xef, 0xf7, 0x8a, 0x7a, 0x12,
-	0x25, 0x1b, 0xab, 0x38, 0xa5, 0x29, 0xfa, 0x7c, 0xe5, 0x68, 0x69, 0x28, 0xa1, 0xe4, 0xfb, 0xb5,
-	0x92, 0x8d, 0xd5, 0xe5, 0x5b, 0x67, 0xd0, 0x2c, 0xe5, 0x1c, 0x42, 0x19, 0x77, 0xb7, 0xd7, 0x72,
-	0x3b, 0x35, 0x67, 0xab, 0xee, 0xba, 0x0e, 0xde, 0xd1, 0x14, 0xfd, 0x80, 0x95, 0xa6, 0xc6, 0x75,
-	0xd7, 0x75, 0xd4, 0x6f, 0xa1, 0x2c, 0x13, 0xb5, 0x3a, 0xbd, 0xd5, 0x0a, 0xb6, 0x35, 0x45, 0x9f,
-	0xb6, 0xd8, 0xd2, 0x0b, 0xc4, 0xa8, 0x7e, 0x1b, 0xe5, 0x98, 0xac, 0x0b, 0xba, 0x86, 0xa6, 0xe8,
-	0x05, 0x8b, 0xad, 0xbe, 0xd2, 0x0a, 0x09, 0xfb, 0x20, 0x6c, 0x6a, 0x8a, 0x9e, 0xe1, 0xc2, 0x4d,
-	0x10, 0x06, 0xc0, 0xa6, 0x81, 0xaf, 0x6a, 0x8a, 0x9e, 0x92, 0xc0, 0xa6, 0x11, 0x02, 0x9b, 0x06,
-	0x6e, 0x69, 0x8a, 0xae, 0xca, 0xe0, 0x80, 0xb0, 0x0f, 0xc2, 0x6b, 0x9a, 0xa2, 0x4f, 0xc9, 0x60,
-	0xd3, 0x50, 0xbf, 0x83, 0xf2, 0x4c, 0xd8, 0x68, 0xfd, 0xc6, 0xde, 0x59, 0xad, 0xe0, 0xeb, 0x9a,
-	0xa2, 0xcf, 0x5a, 0xcc, 0xc1, 0x79, 0x30, 0xab, 0xdf, 0x45, 0x05, 0x0e, 0xa7, 0x5a, 0x47, 0x53,
-	0xf4, 0x9c, 0xc5, 0x7c, 0x5c, 0xf1, 0xed, 0x52, 0x40, 0x0d, 0xc7, 0xad, 0xf5, 0x70, 0x5b, 0x53,
-	0xf4, 0x24, 0x0f, 0xe8, 0x3c, 0x31, 0x86, 0xf1, 0xa6, 0x81, 0x3b, 0x9a, 0xa2, 0xcf, 0x04, 0xf0,
-	0xa6, 0x11, 0x81, 0x37, 0x0d, 0xec, 0x6a, 0x8a, 0x9e, 0x0f, 0xe2, 0x03, 0xf1, 0xef, 0xb8, 0xfd,
-	0xba, 0x63, 0xe3, 0x5d, 0x4d, 0xd1, 0x15, 0x1e, 0xff, 0x39, 0xcf, 0x2a, 0x67, 0xb4, 0xb7, 0xd7,
-	0xea, 0x34, 0xf1, 0xaf, 0xbd, 0x5a, 0xe4, 0x19, 0xf5, 0xac, 0x52, 0x40, 0xf5, 0xfd, 0x9e, 0xdd,
-	0xc5, 0x7b, 0x9a, 0xa2, 0xa7, 0x79, 0x40, 0xeb, 0xc4, 0xa8, 0xee, 0xa0, 0x22, 0x93, 0x6d, 0x5f,
-	0x6d, 0x39, 0x3b, 0x5b, 0x76, 0xa7, 0xdf, 0xc6, 0x5d, 0x4d, 0xd1, 0xb3, 0x15, 0x63, 0xf4, 0xfa,
-	0x2d, 0x9d, 0x25, 0x8b, 0x37, 0x3a, 0xfd, 0xb6, 0xc5, 0xc2, 0x66, 0x26, 0xb5, 0x8d, 0x16, 0x03,
-	0x94, 0x36, 0x2c, 0xc3, 0x3d, 0x6f, 0xa3, 0x7c, 0x7f, 0x5c, 0x10, 0xdd, 0x35, 0x07, 0x25, 0x16,
-	0xdd, 0x3b, 0x75, 0xb4, 0x20, 0x94, 0x9d, 0xb7, 0x7d, 0x21, 0xac, 0xbe, 0x17, 0x56, 0x69, 0x04,
-	0x9a, 0xbf, 0xeb, 0xbd, 0x80, 0x8a, 0xbc, 0x58, 0x99, 0x51, 0xbd, 0x8e, 0x70, 0x88, 0x41, 0x83,
-	0xba, 0xe1, 0x05, 0x55, 0x1e, 0x1d, 0x43, 0xc3, 0x59, 0x0c, 0x90, 0x68, 0x40, 0x87, 0x51, 0x66,
-	0xcf, 0xde, 0xb5, 0x6b, 0x3d, 0x7b, 0x07, 0x9a, 0xc1, 0x6d, 0x45, 0x4b, 0x91, 0x6e, 0x40, 0xad,
-	0x5e, 0x37, 0x38, 0x82, 0xb2, 0x4c, 0x05, 0x9b, 0xf7, 0x0d, 0x22, 0x9b, 0xb6, 0xd8, 0x62, 0x68,
-	0x07, 0x3a, 0xca, 0x31, 0x9d, 0xdf, 0x0e, 0xde, 0x24, 0xc2, 0x82, 0xc5, 0xd6, 0xfb, 0xfd, 0x40,
-	0x54, 0xfa, 0xfd, 0xe0, 0x2d, 0xa2, 0xcc, 0x70, 0xa5, 0xdf, 0x10, 0x02, 0x6c, 0xd3, 0xc0, 0x6f,
-	0x13, 0x61, 0x4a, 0x62, 0x9b, 0x46, 0x88, 0x6d, 0x1a, 0xf8, 0x1d, 0x22, 0x54, 0x65, 0x76, 0x40,
-	0xe9, 0xb7, 0x84, 0x77, 0x89, 0x72, 0x4a, 0x66, 0x9b, 0x86, 0x7a, 0x14, 0xe5, 0x99, 0x92, 0xee,
-	0xf3, 0xf7, 0x88, 0x74, 0xd6, 0x62, 0x2e, 0x68, 0x53, 0xf8, 0x1e, 0x2a, 0x70, 0x3e, 0x15, 0xbf,
-	0x4f, 0xc4, 0x39, 0x8b, 0x79, 0x61, 0x5d, 0x41, 0x8c, 0x0a, 0xba, 0xc2, 0x07, 0x44, 0x9a, 0xe4,
-	0x51, 0x41, 0x5b, 0x08, 0x7d, 0x03, 0xd3, 0xc0, 0x1f, 0x12, 0xe5, 0x4c, 0xe0, 0x1b, 0x98, 0x46,
-	0xc4, 0x37, 0x30, 0x0d, 0xfc, 0x11, 0x11, 0xe7, 0x83, 0xdf, 0x20, 0x90, 0x05, 0xbf, 0x31, 0x7c,
-	0x4c, 0xb4, 0x0a, 0xcf, 0x82, 0xdf, 0x19, 0xa4, 0xcc, 0x42, 0x67, 0xf8, 0x44, 0xf1, 0xc6, 0x12,
-	0xcf, 0x2c, 0xb4, 0x06, 0x31, 0x2a, 0x68, 0x0d, 0x9f, 0x12, 0x61, 0x9a, 0x47, 0x05, 0xbd, 0xc1,
-	0x46, 0x45, 0xa6, 0x13, 0x7a, 0xc3, 0x67, 0x44, 0x1c, 0xbb, 0x39, 0x50, 0x8f, 0xbc, 0x39, 0x74,
-	0xd0, 0x62, 0x00, 0x43, 0xf7, 0xd1, 0xe7, 0x84, 0x34, 0x49, 0x77, 0x90, 0x60, 0x74, 0x33, 0x6d,
-	0xa3, 0x05, 0xa1, 0x04, 0x85, 0xee, 0xf0, 0x05, 0x04, 0x36, 0x76, 0x7b, 0xe0, 0x85, 0xcb, 0xdb,
-	0x83, 0x83, 0x70, 0x08, 0x42, 0xc3, 0xfa, 0x12, 0xc2, 0x8a, 0xd3, 0x1f, 0x02, 0x28, 0x1a, 0xd2,
-	0xaf, 0x50, 0xa6, 0x5d, 0xdb, 0xf5, 0x5a, 0x03, 0xf4, 0x87, 0xfb, 0x92, 0x1e, 0xe2, 0x87, 0x63,
-	0x64, 0xee, 0x52, 0x6d, 0x97, 0x74, 0x11, 0xf2, 0x6f, 0xa3, 0xd3, 0xdb, 0xdb, 0xb7, 0xe6, 0xdb,
-	0xdc, 0xa2, 0x6e, 0xa3, 0x2c, 0x23, 0x40, 0x23, 0xb8, 0x1f, 0x10, 0x3f, 0x1a, 0x1f, 0xe1, 0x75,
-	0x21, 0x60, 0xa4, 0xdb, 0x82, 0x49, 0x6d, 0xa0, 0x1c, 0x83, 0xf8, 0x8d, 0xe9, 0x01, 0xa0, 0xfc,
-	0x78, 0x7c, 0x0a, 0xb4, 0x30, 0xc0, 0x64, 0xda, 0xa2, 0x4d, 0xe2, 0xf8, 0x6d, 0xed, 0xc1, 0xd8,
-	0x9c, 0xcd, 0x08, 0x8e, 0xdf, 0x14, 0x03, 0x49, 0x33, 0x0d, 0xfc, 0xd0, 0x24, 0x49, 0x33, 0x8d,
-	0x50, 0xd2, 0x4c, 0x23, 0x94, 0x34, 0xd3, 0xc0, 0x0f, 0x4f, 0x94, 0x34, 0x8a, 0x11, 0x93, 0x16,
-	0xe0, 0xf8, 0xfd, 0xf8, 0x91, 0x89, 0x92, 0x16, 0xe4, 0xf8, 0xdd, 0xbc, 0x85, 0xf2, 0x8c, 0x43,
-	0x1b, 0xf4, 0xa3, 0x00, 0x3a, 0x35, 0x3e, 0xc8, 0xef, 0xfb, 0x40, 0xca, 0xb6, 0x25, 0xa3, 0xea,
-	0xa0, 0x02, 0x4f, 0x1d, 0x65, 0x3d, 0x06, 0xac, 0xd3, 0x31, 0x92, 0xd7, 0x10, 0x61, 0xb9, 0xb6,
-	0x6c, 0x95, 0xaa, 0x01, 0x86, 0xc9, 0xe3, 0xb1, 0xab, 0xc1, 0x1b, 0x3b, 0x72, 0x35, 0xc0, 0x24,
-	0x0a, 0x65, 0xcf, 0x34, 0xf0, 0x13, 0x93, 0x65, 0x8f, 0x3e, 0x27, 0x29, 0x7b, 0xa6, 0x11, 0x91,
-	0x3d, 0xd3, 0xc0, 0x4f, 0x4e, 0x98, 0x3d, 0x0a, 0x93, 0xb3, 0x17, 0x28, 0x3f, 0x7f, 0x10, 0x3e,
-	0x15, 0xbb, 0xfc, 0x60, 0x64, 0xca, 0xe5, 0xe7, 0x8f, 0x51, 0x69, 0x3b, 0xc1, 0x18, 0x7d, 0x3a,
-	0xfe, 0x76, 0xf2, 0x1c, 0x04, 0xb6, 0x13, 0x0c, 0x61, 0xb1, 0x1a, 0x60, 0x08, 0x3f, 0x13, 0xbb,
-	0x1a, 0xbc, 0x71, 0x2d, 0x57, 0x03, 0x4c, 0xf0, 0x5d, 0x54, 0x64, 0x10, 0x61, 0x82, 0x3f, 0x0b,
-	0xa4, 0x33, 0xe3, 0x93, 0xd8, 0xd4, 0x06, 0x5a, 0xbe, 0x1d, 0x30, 0xab, 0xfb, 0x68, 0x31, 0x40,
-	0xa4, 0x53, 0xef, 0x39, 0x80, 0x9e, 0x8d, 0x09, 0xf5, 0x6d, 0xc0, 0x2d, 0xb6, 0xc3, 0x9f, 0xa8,
-	0x37, 0xd0, 0x82, 0xd0, 0x08, 0x85, 0xb9, 0xfe, 0x3c, 0x90, 0xd7, 0xe3, 0xb4, 0x43, 0x36, 0xd1,
-	0x01, 0xac, 0xb6, 0x43, 0x1f, 0xa8, 0x37, 0x11, 0x0e, 0x71, 0x69, 0xd0, 0x2f, 0x00, 0x7a, 0x23,
-	0x36, 0x5a, 0x0a, 0x7b, 0xa1, 0x1d, 0xf5, 0x19, 0x2d, 0x25, 0x6f, 0xe6, 0xc0, 0xf8, 0x7f, 0x31,
-	0x56, 0x29, 0x79, 0x43, 0x98, 0xcf, 0x7f, 0x52, 0x4a, 0xcc, 0x44, 0xf7, 0x45, 0x57, 0xa0, 0xbc,
-	0x14, 0x6b, 0x5f, 0xc0, 0x0c, 0xe6, 0x18, 0xb2, 0x2f, 0xb8, 0x8d, 0x72, 0xfa, 0x02, 0xe7, 0xe5,
-	0x58, 0x9c, 0xcd, 0x08, 0x0e, 0xb7, 0x09, 0x49, 0x33, 0x0d, 0xc0, 0xbc, 0x12, 0x37, 0x69, 0xa6,
-	0x11, 0x4a, 0x1a, 0x98, 0xc4, 0xa4, 0x51, 0xca, 0xab, 0xb1, 0x93, 0x26, 0x62, 0x68, 0xd2, 0x64,
-	0x4e, 0x5f, 0xe0, 0xbc, 0x16, 0x3b, 0x69, 0x41, 0x0e, 0xb7, 0xd1, 0xe9, 0xe2, 0x4f, 0x34, 0x00,
-	0xdd, 0x8a, 0x35, 0x5d, 0xfc, 0x11, 0xcc, 0x49, 0xe4, 0x69, 0x08, 0x46, 0x96, 0x3a, 0xaf, 0x5b,
-	0x02, 0xe9, 0xf5, 0x78, 0xa9, 0xf3, 0x3c, 0x04, 0x52, 0xc7, 0x6c, 0xaa, 0x86, 0x90, 0xdb, 0xb1,
-	0xdd, 0x06, 0x20, 0x7e, 0x97, 0xd2, 0x14, 0xfd, 0x40, 0x35, 0x61, 0xcd, 0x79, 0x46, 0x4f, 0xb1,
-	0x8c, 0xe6, 0x41, 0x01, 0x27, 0xc5, 0xdf, 0x13, 0xc9, 0x74, 0x35, 0x61, 0xc1, 0x3a, 0x38, 0xb9,
-	0x1e, 0x46, 0x69, 0xd0, 0xf8, 0xc7, 0xd6, 0x3f, 0x10, 0x51, 0xa1, 0x9a, 0xb0, 0x60, 0xa9, 0x7f,
-	0xee, 0x64, 0x2a, 0xff, 0xd0, 0xf9, 0x47, 0xa2, 0xca, 0x30, 0x95, 0x7f, 0x6a, 0x14, 0x79, 0xa6,
-	0x81, 0xff, 0x44, 0x44, 0x29, 0x91, 0x67, 0x1a, 0x32, 0xcf, 0x34, 0xf0, 0x9f, 0x89, 0x48, 0x95,
-	0x78, 0xa2, 0xca, 0x3f, 0xaf, 0xfd, 0x85, 0xa8, 0xa6, 0x24, 0x9e, 0x69, 0xa8, 0x47, 0x50, 0x06,
-	0x54, 0xf4, 0x04, 0xf4, 0x57, 0x22, 0x9b, 0xad, 0x26, 0x2c, 0x58, 0x4d, 0x4f, 0x4b, 0x3a, 0xca,
-	0xfa, 0x4c, 0x2a, 0xfc, 0x1b, 0x11, 0xe6, 0xaa, 0x09, 0x0b, 0x1c, 0xb0, 0x93, 0x0e, 0x8b, 0x00,
-	0x8e, 0x39, 0x7f, 0x27, 0xb2, 0x24, 0x8b, 0x00, 0x0e, 0x2a, 0x32, 0xd5, 0x34, 0xf0, 0x3f, 0x88,
-	0x6a, 0x46, 0xa6, 0x7a, 0x17, 0x60, 0x89, 0x6a, 0x1a, 0xf8, 0x9f, 0x44, 0x98, 0x0f, 0x50, 0xc5,
-	0x68, 0xfd, 0xe3, 0xc1, 0xbf, 0x88, 0x4e, 0x61, 0xd1, 0xfa, 0xf3, 0x9d, 0x67, 0x0e, 0x86, 0xfb,
-	0xbf, 0x89, 0x6a, 0x8e, 0x67, 0x0e, 0xa6, 0x33, 0x8b, 0x00, 0x46, 0xf3, 0x7f, 0x88, 0x28, 0xcd,
-	0x22, 0x80, 0xe1, 0x5a, 0x43, 0x79, 0xd0, 0x08, 0x93, 0xf5, 0xbf, 0xa9, 0xf8, 0x2f, 0xce, 0xaa,
-	0x09, 0x0b, 0x42, 0xe5, 0xd3, 0xf4, 0x1a, 0x2a, 0x8a, 0x08, 0x3a, 0x55, 0xfe, 0x97, 0x9a, 0xe8,
-	0xad, 0x59, 0x35, 0x61, 0x15, 0x38, 0x88, 0x4e, 0x91, 0x2d, 0xa4, 0xd2, 0x92, 0x12, 0x66, 0xe7,
-	0xff, 0x53, 0x71, 0x5e, 0x99, 0x55, 0x13, 0x56, 0xde, 0x2f, 0x44, 0x3e, 0x27, 0xaf, 0xa2, 0x05,
-	0x19, 0x40, 0xc3, 0xb9, 0x2b, 0x15, 0xf3, 0x7d, 0x59, 0x35, 0x61, 0x15, 0x45, 0x0c, 0x0d, 0x85,
-	0xd5, 0x16, 0x3c, 0xe3, 0x32, 0xbe, 0x9b, 0x3e, 0xe4, 0xb4, 0xf0, 0x90, 0xcb, 0x41, 0x5d, 0x05,
-	0xdf, 0x13, 0xa5, 0xab, 0x04, 0x75, 0xab, 0xf8, 0xde, 0x28, 0xdd, 0xea, 0xd2, 0x35, 0x94, 0x96,
-	0x52, 0xfa, 0x35, 0xfe, 0x5f, 0xc1, 0xd2, 0x29, 0x94, 0x0f, 0xde, 0xd8, 0xd5, 0x3c, 0x4a, 0x5d,
-	0xb7, 0xf7, 0x3d, 0xe0, 0x01, 0x8b, 0xfc, 0xa8, 0x1e, 0x44, 0xd3, 0x37, 0x6a, 0x4e, 0xdf, 0xc6,
-	0x49, 0xcf, 0x06, 0xbf, 0x9c, 0x4c, 0xfe, 0x40, 0x59, 0x3a, 0x8d, 0x0a, 0xa1, 0xeb, 0xf8, 0x30,
-	0x07, 0xd3, 0xa2, 0x83, 0x33, 0x48, 0x0d, 0xdf, 0xb4, 0x87, 0x79, 0x28, 0x44, 0x7b, 0xd8, 0x1c,
-	0xdd, 0x43, 0x66, 0x60, 0x10, 0xfe, 0xd5, 0x61, 0x98, 0x83, 0xd4, 0xe0, 0x20, 0x46, 0xf4, 0xa0,
-	0x0e, 0x0e, 0x62, 0x44, 0x0f, 0x53, 0xa2, 0x87, 0x35, 0x54, 0x8c, 0xb8, 0xac, 0x0e, 0x73, 0x31,
-	0x2b, 0xba, 0x58, 0x47, 0x07, 0xa3, 0xee, 0xa0, 0xc3, 0x7c, 0xe4, 0xa2, 0x73, 0xc9, 0x2f, 0x97,
-	0xc3, 0x1c, 0x24, 0xef, 0x10, 0xc7, 0x88, 0xa9, 0x98, 0xb9, 0x53, 0x1c, 0x23, 0xfa, 0xc8, 0x47,
-	0x3f, 0x10, 0xe1, 0x96, 0x37, 0xcc, 0x83, 0x32, 0xa0, 0x28, 0xf8, 0xfd, 0x6d, 0x98, 0x87, 0xb9,
-	0xe8, 0x5c, 0xf2, 0xab, 0xd9, 0x30, 0x07, 0x69, 0xd1, 0xc1, 0x3e, 0x5a, 0x88, 0xbc, 0x71, 0x45,
-	0x38, 0xf9, 0xa9, 0xe8, 0x24, 0xee, 0x6b, 0x59, 0x01, 0x7d, 0x13, 0xe1, 0x41, 0xf7, 0xae, 0x08,
-	0xfa, 0x25, 0x91, 0x3e, 0xc1, 0xab, 0x5a, 0xe1, 0x0b, 0xf4, 0xd1, 0x37, 0x06, 0x5c, 0xbf, 0x22,
-	0xf8, 0xe7, 0xe4, 0xe8, 0xc7, 0x7d, 0x77, 0x2b, 0x60, 0x7f, 0x8b, 0x96, 0x06, 0x5f, 0xbd, 0x22,
-	0xc8, 0x3f, 0x91, 0x23, 0x8f, 0xf1, 0x36, 0x37, 0x54, 0x30, 0xf2, 0x05, 0x4c, 0x64, 0x4e, 0x0f,
-	0x6b, 0xe7, 0x50, 0xb3, 0x81, 0xbb, 0x95, 0xe8, 0xa1, 0x30, 0x9a, 0x87, 0xcd, 0xc1, 0x1e, 0x32,
-	0xa3, 0x8d, 0x14, 0xf9, 0x42, 0x24, 0x3a, 0x48, 0x8d, 0x1e, 0xc4, 0x00, 0x0f, 0xea, 0xe8, 0x41,
-	0x0c, 0xf0, 0x30, 0x35, 0xcc, 0x03, 0x74, 0xb1, 0xe0, 0xf5, 0x44, 0x74, 0x31, 0x3b, 0x62, 0x18,
-	0xf2, 0xbd, 0x43, 0xf4, 0x30, 0x37, 0xc4, 0xc3, 0x72, 0x09, 0xcd, 0xf1, 0x43, 0xe0, 0x1c, 0x9a,
-	0x5e, 0xbb, 0x78, 0xb9, 0xba, 0x96, 0x4f, 0x90, 0x1f, 0xd7, 0xad, 0xb5, 0x5f, 0xfc, 0x3c, 0xaf,
-	0xa8, 0xf3, 0x68, 0xf6, 0x6c, 0x75, 0xcd, 0xba, 0x78, 0x61, 0x23, 0x9f, 0x5c, 0xcf, 0xd0, 0xe3,
-	0x6a, 0xbf, 0xd3, 0x72, 0x3b, 0x47, 0xcb, 0x68, 0x5e, 0x3c, 0x78, 0x45, 0x39, 0x40, 0x6a, 0x9a,
-	0x3b, 0xb8, 0xad, 0xac, 0x5f, 0xfe, 0xe5, 0xcf, 0x42, 0xf5, 0xbb, 0xe2, 0xd5, 0x6f, 0xbd, 0xdf,
-	0x58, 0x69, 0x75, 0x7a, 0xf6, 0x5e, 0xa7, 0xe6, 0x78, 0x7f, 0x3d, 0xe1, 0x59, 0xbb, 0x2b, 0x8e,
-	0xdd, 0xac, 0x6d, 0xef, 0xaf, 0x0c, 0xfa, 0x43, 0x8b, 0xfa, 0x0c, 0x7c, 0xf2, 0x55, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xb9, 0x46, 0x32, 0x11, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20160519_a4ab9ec5/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/test.pb.go
deleted file mode 100644
index 1cd6cc66c91..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/test.pb.go
+++ /dev/null
@@ -1,1456 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto3_20180125_92554152/test.proto
-
-/*
-Package proto3_20180125_92554152 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	proto3_20180125_92554152/test.proto
-
-It has these top-level messages:
-
-	SiblingMessage
-	Message
-*/
-package proto3_20180125_92554152
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-type SiblingMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *SiblingMessage) Reset()                    { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string            { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()               {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto3_20180125.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto3_20180125.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,packed,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,packed,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,packed,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,packed,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,packed,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,packed,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,packed,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,packed,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,packed,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,packed,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,packed,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,packed,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto3_20180125.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,packed,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto3_20180125.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20180125.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20180125.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isMessage_OneofUnion interface{ isMessage_OneofUnion() }
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto3_20180125.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto3_20180125.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()           {}
-func (*Message_OneofInt32) isMessage_OneofUnion()          {}
-func (*Message_OneofSint32) isMessage_OneofUnion()         {}
-func (*Message_OneofUint32) isMessage_OneofUnion()         {}
-func (*Message_OneofInt64) isMessage_OneofUnion()          {}
-func (*Message_OneofSint64) isMessage_OneofUnion()         {}
-func (*Message_OneofUint64) isMessage_OneofUnion()         {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()       {}
-func (*Message_OneofFloat) isMessage_OneofUnion()          {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()       {}
-func (*Message_OneofDouble) isMessage_OneofUnion()         {}
-func (*Message_OneofString) isMessage_OneofUnion()         {}
-func (*Message_OneofBytes) isMessage_OneofUnion()          {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()      {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()   {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()    {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-func (*Message_OneofString1) isMessage_OneofUnion()        {}
-func (*Message_OneofString2) isMessage_OneofUnion()        {}
-func (*Message_OneofString3) isMessage_OneofUnion()        {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil {
-		return m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil {
-		return m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil {
-		return m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil {
-		return m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil {
-		return m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil {
-		return m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil {
-		return m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil {
-		return m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil {
-		return m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil {
-		return m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil {
-		return m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil {
-		return m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil {
-		return m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil {
-		return m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil {
-		return m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil {
-		return m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(400<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(401<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(402<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(403<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(404<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(405<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(406<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(407<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(408<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(409<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(410<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(411<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(412<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(413<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(414<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(415<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(416<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(417<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(418<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_OneofString1:
-		b.EncodeVarint(419<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(420<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(421<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 400: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 401: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 402: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 403: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 404: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 405: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 406: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 407: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 408: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 409: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 410: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 411: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 412: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 413: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 414: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 415: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 416: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 417: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 418: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 419: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 420: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 421: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += proto.SizeVarint(400<<3 | proto.WireVarint)
-		n += 1
-	case *Message_OneofInt32:
-		n += proto.SizeVarint(401<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += proto.SizeVarint(402<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += proto.SizeVarint(403<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += proto.SizeVarint(404<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += proto.SizeVarint(405<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += proto.SizeVarint(406<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += proto.SizeVarint(407<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofSfixed32:
-		n += proto.SizeVarint(408<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFloat:
-		n += proto.SizeVarint(409<<3 | proto.WireFixed32)
-		n += 4
-	case *Message_OneofFixed64:
-		n += proto.SizeVarint(410<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofSfixed64:
-		n += proto.SizeVarint(411<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofDouble:
-		n += proto.SizeVarint(412<<3 | proto.WireFixed64)
-		n += 8
-	case *Message_OneofString:
-		n += proto.SizeVarint(413<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += proto.SizeVarint(414<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += proto.SizeVarint(415<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += proto.SizeVarint(416<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += proto.SizeVarint(417<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += proto.SizeVarint(418<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofString1:
-		n += proto.SizeVarint(419<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += proto.SizeVarint(420<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += proto.SizeVarint(421<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Message_ChildMessage struct {
-	F1 string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2 []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3 *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-}
-
-func (m *Message_ChildMessage) Reset()                    { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string            { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()               {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20180125.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20180125.Message")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20180125.Message.ChildMessage")
-	proto.RegisterEnum("google.golang.org.proto3_20180125.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20180125.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-}
-
-func init() { proto.RegisterFile("proto3_20180125_92554152/test.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 1947 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x59, 0x73, 0xdb, 0xc8,
-	0x11, 0xc7, 0x09, 0x52, 0x87, 0x35, 0xe2, 0x09, 0x5a, 0xca, 0x94, 0x9e, 0x10, 0xd9, 0x71, 0x10,
-	0x27, 0x45, 0x99, 0x14, 0x84, 0x38, 0x4e, 0x62, 0x5b, 0xb2, 0xe5, 0xd0, 0x29, 0x3b, 0x71, 0xc1,
-	0xa5, 0x3c, 0xe4, 0x45, 0xa1, 0x24, 0x90, 0xa6, 0x0d, 0x12, 0x8a, 0x48, 0xba, 0xa2, 0xca, 0x83,
-	0xbf, 0x42, 0xee, 0x3b, 0x7b, 0xef, 0xdb, 0xde, 0xf7, 0x7d, 0x7b, 0xcb, 0x7b, 0xdf, 0xe7, 0xa7,
-	0xd9, 0x1a, 0x34, 0xe6, 0x02, 0x40, 0x93, 0x04, 0x6b, 0x1f, 0x5c, 0x25, 0x35, 0xff, 0xd3, 0x3f,
-	0x76, 0xa3, 0xa7, 0x7b, 0x06, 0x16, 0x3a, 0xb4, 0xbb, 0xe7, 0x76, 0xdd, 0xe5, 0xcd, 0xca, 0xb1,
-	0xf2, 0xf1, 0x63, 0xe5, 0xca, 0xca, 0xe6, 0x4f, 0x2a, 0x2b, 0x2b, 0x46, 0x79, 0xa5, 0xb2, 0xd4,
-	0xb5, 0x3b, 0xdd, 0x92, 0xf7, 0xa9, 0xfa, 0xdd, 0x86, 0xeb, 0x36, 0x1c, 0xbb, 0xd4, 0x70, 0x9d,
-	0x5a, 0xbb, 0x51, 0x72, 0xf7, 0x1a, 0xa5, 0xc0, 0xb2, 0x45, 0x07, 0x65, 0x2f, 0x37, 0xb7, 0x9c,
-	0x66, 0xbb, 0x71, 0xd1, 0xee, 0x74, 0x6a, 0x0d, 0x5b, 0xcd, 0xa2, 0x64, 0xbd, 0x8c, 0x15, 0x4d,
-	0xd1, 0x67, 0xac, 0x64, 0xbd, 0xec, 0xfd, 0x5e, 0xc1, 0x49, 0x2d, 0xe5, 0xfd, 0x5e, 0x51, 0x4f,
-	0xa0, 0x64, 0x7d, 0x19, 0xa7, 0x34, 0x45, 0x9f, 0xad, 0x1c, 0x2d, 0x0d, 0x24, 0x94, 0x7c, 0xbf,
-	0x56, 0xb2, 0xbe, 0xbc, 0x78, 0xf3, 0x34, 0x9a, 0xa6, 0x9c, 0x43, 0x28, 0xe3, 0xee, 0x76, 0x9b,
-	0x6e, 0xbb, 0xe6, 0x6c, 0x6e, 0xb9, 0xae, 0x83, 0x77, 0x34, 0x45, 0x3f, 0x60, 0xa5, 0xa9, 0x71,
-	0xcd, 0x75, 0x1d, 0xf5, 0x7b, 0x28, 0xcb, 0x44, 0xcd, 0x76, 0x77, 0xb9, 0x82, 0x6d, 0x4d, 0xd1,
-	0x27, 0x2d, 0xb6, 0xf4, 0x3c, 0x31, 0xaa, 0xdf, 0x47, 0x39, 0x26, 0xeb, 0x80, 0xae, 0xae, 0x29,
-	0x7a, 0xc1, 0x62, 0xab, 0x2f, 0x37, 0x43, 0xc2, 0x1e, 0x08, 0x1b, 0x9a, 0xa2, 0x67, 0xb8, 0x70,
-	0x03, 0x84, 0x01, 0xb0, 0x69, 0xe0, 0x2b, 0x9a, 0xa2, 0xa7, 0x24, 0xb0, 0x69, 0x84, 0xc0, 0xa6,
-	0x81, 0x9b, 0x9a, 0xa2, 0xab, 0x32, 0x38, 0x20, 0xec, 0x81, 0xf0, 0xaa, 0xa6, 0xe8, 0x13, 0x32,
-	0xd8, 0x34, 0xd4, 0x1f, 0xa0, 0x3c, 0x13, 0xd6, 0x9b, 0x7f, 0xb0, 0x77, 0x96, 0x2b, 0xf8, 0x9a,
-	0xa6, 0xe8, 0xd3, 0x16, 0x73, 0x70, 0x0e, 0xcc, 0xea, 0x0f, 0x51, 0x81, 0xc3, 0xa9, 0xd6, 0xd1,
-	0x14, 0x3d, 0x67, 0x31, 0x1f, 0x97, 0x7d, 0xbb, 0x14, 0x50, 0xdd, 0x71, 0x6b, 0x5d, 0xdc, 0xd2,
-	0x14, 0x3d, 0xc9, 0x03, 0x3a, 0x47, 0x8c, 0x61, 0xbc, 0x69, 0xe0, 0xb6, 0xa6, 0xe8, 0x53, 0x01,
-	0xbc, 0x69, 0x44, 0xe0, 0x4d, 0x03, 0xbb, 0x9a, 0xa2, 0xe7, 0x83, 0xf8, 0x40, 0xfc, 0x3b, 0x6e,
-	0x6f, 0xcb, 0xb1, 0xf1, 0xae, 0xa6, 0xe8, 0x0a, 0x8f, 0xff, 0xac, 0x67, 0x95, 0x33, 0xda, 0xdd,
-	0x6b, 0xb6, 0x1b, 0xf8, 0xf7, 0x5e, 0x2d, 0xf2, 0x8c, 0x7a, 0x56, 0x29, 0xa0, 0xad, 0xfd, 0xae,
-	0xdd, 0xc1, 0x7b, 0x9a, 0xa2, 0xa7, 0x79, 0x40, 0x6b, 0xc4, 0xa8, 0xee, 0xa0, 0x22, 0x93, 0x6d,
-	0x5f, 0x69, 0x3a, 0x3b, 0x9b, 0x76, 0xbb, 0xd7, 0xc2, 0x1d, 0x4d, 0xd1, 0xb3, 0x15, 0x63, 0xf8,
-	0xfa, 0x2d, 0x9d, 0x21, 0x8b, 0xd7, 0xdb, 0xbd, 0x96, 0xc5, 0xc2, 0x66, 0x26, 0xb5, 0x85, 0xe6,
-	0x03, 0x94, 0x16, 0x2c, 0xc3, 0x5d, 0x6f, 0xa3, 0xfc, 0x78, 0x54, 0x10, 0xdd, 0x35, 0x07, 0x25,
-	0x16, 0xdd, 0x3b, 0x5b, 0x68, 0x4e, 0x28, 0x3b, 0x6f, 0xfb, 0x42, 0x58, 0x3d, 0x2f, 0xac, 0xd2,
-	0x10, 0x34, 0x7f, 0xd7, 0x7b, 0x01, 0x15, 0x79, 0xb1, 0x32, 0xa3, 0x7a, 0x0d, 0xe1, 0x10, 0x83,
-	0x06, 0x75, 0xdd, 0x0b, 0xaa, 0x3c, 0x3c, 0x86, 0x86, 0x33, 0x1f, 0x20, 0xd1, 0x80, 0x0e, 0xa3,
-	0xcc, 0x9e, 0xbd, 0x6b, 0xd7, 0xba, 0xf6, 0x0e, 0x34, 0x83, 0x5b, 0x8a, 0x96, 0x22, 0xdd, 0x80,
-	0x5a, 0xbd, 0x6e, 0x70, 0x04, 0x65, 0x99, 0x0a, 0x36, 0xef, 0x5b, 0x44, 0x36, 0x69, 0xb1, 0xc5,
-	0xd0, 0x0e, 0x74, 0x94, 0x63, 0x3a, 0xbf, 0x1d, 0xbc, 0x4d, 0x84, 0x05, 0x8b, 0xad, 0xf7, 0xfb,
-	0x81, 0xa8, 0xf4, 0xfb, 0xc1, 0x3b, 0x44, 0x99, 0xe1, 0x4a, 0xbf, 0x21, 0x04, 0xd8, 0xa6, 0x81,
-	0xdf, 0x25, 0xc2, 0x94, 0xc4, 0x36, 0x8d, 0x10, 0xdb, 0x34, 0xf0, 0x7b, 0x44, 0xa8, 0xca, 0xec,
-	0x80, 0xd2, 0x6f, 0x09, 0xef, 0x13, 0xe5, 0x84, 0xcc, 0x36, 0x0d, 0xf5, 0x28, 0xca, 0x33, 0x25,
-	0xdd, 0xe7, 0x1f, 0x10, 0xe9, 0xb4, 0xc5, 0x5c, 0xd0, 0xa6, 0xf0, 0x23, 0x54, 0xe0, 0x7c, 0x2a,
-	0xfe, 0x90, 0x88, 0x73, 0x16, 0xf3, 0xc2, 0xba, 0x82, 0x18, 0x15, 0x74, 0x85, 0x8f, 0x88, 0x34,
-	0xc9, 0xa3, 0x82, 0xb6, 0x10, 0xfa, 0x06, 0xa6, 0x81, 0x3f, 0x26, 0xca, 0xa9, 0xc0, 0x37, 0x30,
-	0x8d, 0x88, 0x6f, 0x60, 0x1a, 0xf8, 0x13, 0x22, 0xce, 0x07, 0xbf, 0x41, 0x20, 0x0b, 0x7e, 0x63,
-	0xf8, 0x94, 0x68, 0x15, 0x9e, 0x05, 0xbf, 0x33, 0x48, 0x99, 0x85, 0xce, 0xf0, 0x99, 0xe2, 0x8d,
-	0x25, 0x9e, 0x59, 0x68, 0x0d, 0x62, 0x54, 0xd0, 0x1a, 0x3e, 0x27, 0xc2, 0x34, 0x8f, 0x0a, 0x7a,
-	0x83, 0x8d, 0x8a, 0x4c, 0x27, 0xf4, 0x86, 0x2f, 0x88, 0x38, 0x76, 0x73, 0xa0, 0x1e, 0x79, 0x73,
-	0x68, 0xa3, 0xf9, 0x00, 0x86, 0xee, 0xa3, 0x2f, 0x09, 0x69, 0x9c, 0xee, 0x20, 0xc1, 0xe8, 0x66,
-	0xda, 0x46, 0x73, 0x42, 0x09, 0x0a, 0xdd, 0xe1, 0x2b, 0x08, 0x6c, 0xe4, 0xf6, 0xc0, 0x0b, 0x97,
-	0xb7, 0x07, 0x07, 0xe1, 0x10, 0x84, 0x86, 0xf5, 0x35, 0x84, 0x15, 0xa7, 0x3f, 0x04, 0x50, 0x34,
-	0xa4, 0xdf, 0xa1, 0x4c, 0xab, 0xb6, 0xeb, 0xb5, 0x06, 0xe8, 0x0f, 0x0f, 0x24, 0x3d, 0xc4, 0x4f,
-	0x47, 0xc8, 0xdc, 0xc5, 0xda, 0x2e, 0xe9, 0x22, 0xe4, 0xdf, 0x7a, 0xbb, 0xbb, 0xb7, 0x6f, 0xcd,
-	0xb6, 0xb8, 0x45, 0xdd, 0x46, 0x59, 0x46, 0x80, 0x46, 0xf0, 0x20, 0x20, 0x7e, 0x36, 0x3a, 0xc2,
-	0xeb, 0x42, 0xc0, 0x48, 0xb7, 0x04, 0x93, 0x5a, 0x47, 0x39, 0x06, 0xf1, 0x1b, 0xd3, 0x43, 0x40,
-	0xf9, 0xf9, 0xe8, 0x14, 0x68, 0x61, 0x80, 0xc9, 0xb4, 0x44, 0x9b, 0xc4, 0xf1, 0xdb, 0xda, 0xc3,
-	0xb1, 0x39, 0x1b, 0x11, 0x1c, 0xbf, 0x29, 0x06, 0x92, 0x66, 0x1a, 0xf8, 0x91, 0x71, 0x92, 0x66,
-	0x1a, 0xa1, 0xa4, 0x99, 0x46, 0x28, 0x69, 0xa6, 0x81, 0x1f, 0x1d, 0x2b, 0x69, 0x14, 0x23, 0x26,
-	0x2d, 0xc0, 0xf1, 0xfb, 0xf1, 0x63, 0x63, 0x25, 0x2d, 0xc8, 0xf1, 0xbb, 0x79, 0x13, 0xe5, 0x19,
-	0x87, 0x36, 0xe8, 0xc7, 0x01, 0x74, 0x72, 0x74, 0x90, 0xdf, 0xf7, 0x81, 0x94, 0x6d, 0x49, 0x46,
-	0xd5, 0x41, 0x05, 0x9e, 0x3a, 0xca, 0x7a, 0x02, 0x58, 0xa7, 0x62, 0x24, 0xaf, 0x2e, 0xc2, 0x72,
-	0x2d, 0xd9, 0x2a, 0x55, 0x03, 0x0c, 0x93, 0x27, 0x63, 0x57, 0x83, 0x37, 0x76, 0xe4, 0x6a, 0x80,
-	0x49, 0x14, 0xca, 0x9e, 0x69, 0xe0, 0xa7, 0xc6, 0xcb, 0x1e, 0x7d, 0x4e, 0x52, 0xf6, 0x4c, 0x23,
-	0x22, 0x7b, 0xa6, 0x81, 0x9f, 0x1e, 0x33, 0x7b, 0x14, 0x26, 0x67, 0x2f, 0x50, 0x7e, 0xfe, 0x20,
-	0x7c, 0x26, 0x76, 0xf9, 0xc1, 0xc8, 0x94, 0xcb, 0xcf, 0x1f, 0xa3, 0xd2, 0x76, 0x82, 0x31, 0xfa,
-	0x6c, 0xfc, 0xed, 0xe4, 0x39, 0x08, 0x6c, 0x27, 0x18, 0xc2, 0x62, 0x35, 0xc0, 0x10, 0x7e, 0x2e,
-	0x76, 0x35, 0x78, 0xe3, 0x5a, 0xae, 0x06, 0x98, 0xe0, 0xbb, 0xa8, 0xc8, 0x20, 0xc2, 0x04, 0x7f,
-	0x1e, 0x48, 0xa7, 0x47, 0x27, 0xb1, 0xa9, 0x0d, 0xb4, 0x7c, 0x2b, 0x60, 0x56, 0xf7, 0xd1, 0x7c,
-	0x80, 0x48, 0xa7, 0xde, 0x0b, 0x00, 0x3d, 0x13, 0x13, 0xea, 0xdb, 0x80, 0x5b, 0x6c, 0x85, 0x3f,
-	0x51, 0xaf, 0xa3, 0x39, 0xa1, 0x11, 0x0a, 0x73, 0xfd, 0x45, 0x20, 0xaf, 0xc5, 0x69, 0x87, 0x6c,
-	0xa2, 0x03, 0x58, 0x6d, 0x85, 0x3e, 0x50, 0x6f, 0x20, 0x1c, 0xe2, 0xd2, 0xa0, 0x5f, 0x02, 0xf4,
-	0x7a, 0x6c, 0xb4, 0x14, 0xf6, 0x5c, 0x2b, 0xea, 0x33, 0x5a, 0x4a, 0xde, 0xcc, 0x81, 0xf1, 0xff,
-	0x72, 0xac, 0x52, 0xf2, 0x86, 0x30, 0x9f, 0xff, 0xa4, 0x94, 0x98, 0x89, 0xee, 0x8b, 0x8e, 0x40,
-	0x79, 0x25, 0xd6, 0xbe, 0x80, 0x19, 0xcc, 0x31, 0x64, 0x5f, 0x70, 0x1b, 0xe5, 0xf4, 0x04, 0xce,
-	0xab, 0xb1, 0x38, 0x1b, 0x11, 0x1c, 0x6e, 0x13, 0x92, 0x66, 0x1a, 0x80, 0x79, 0x2d, 0x6e, 0xd2,
-	0x4c, 0x23, 0x94, 0x34, 0x30, 0x89, 0x49, 0xa3, 0x94, 0xd7, 0x63, 0x27, 0x4d, 0xc4, 0xd0, 0xa4,
-	0xc9, 0x9c, 0x9e, 0xc0, 0x79, 0x23, 0x76, 0xd2, 0x82, 0x1c, 0x6e, 0xa3, 0xd3, 0xc5, 0x9f, 0x68,
-	0x00, 0xba, 0x19, 0x6b, 0xba, 0xf8, 0x23, 0x98, 0x93, 0xc8, 0xd3, 0x10, 0x8c, 0x2c, 0x75, 0x5e,
-	0xb7, 0x04, 0xd2, 0x9b, 0xf1, 0x52, 0xe7, 0x79, 0x08, 0xa4, 0x8e, 0xd9, 0x54, 0x0d, 0x21, 0xb7,
-	0x6d, 0xbb, 0x75, 0x40, 0xfc, 0x29, 0xa5, 0x29, 0xfa, 0x81, 0x6a, 0xc2, 0x9a, 0xf1, 0x8c, 0x9e,
-	0x62, 0x11, 0xcd, 0x82, 0x02, 0x4e, 0x8a, 0x7f, 0x26, 0x92, 0xc9, 0x6a, 0xc2, 0x82, 0x75, 0x70,
-	0x72, 0x3d, 0x8c, 0xd2, 0xa0, 0xf1, 0x8f, 0xad, 0x7f, 0x21, 0xa2, 0x42, 0x35, 0x61, 0xc1, 0x52,
-	0xff, 0xdc, 0xc9, 0x54, 0xfe, 0xa1, 0xf3, 0xaf, 0x44, 0x95, 0x61, 0x2a, 0xff, 0xd4, 0x28, 0xf2,
-	0x4c, 0x03, 0xff, 0x8d, 0x88, 0x52, 0x22, 0xcf, 0x34, 0x64, 0x9e, 0x69, 0xe0, 0xbf, 0x13, 0x91,
-	0x2a, 0xf1, 0x44, 0x95, 0x7f, 0x5e, 0xfb, 0x07, 0x51, 0x4d, 0x48, 0x3c, 0xd3, 0x50, 0x8f, 0xa0,
-	0x0c, 0xa8, 0xe8, 0x09, 0xe8, 0x9f, 0x44, 0x36, 0x5d, 0x4d, 0x58, 0xb0, 0x9a, 0x9e, 0x96, 0x74,
-	0x94, 0xf5, 0x99, 0x54, 0xf8, 0x2f, 0x22, 0xcc, 0x55, 0x13, 0x16, 0x38, 0x60, 0x27, 0x1d, 0x16,
-	0x01, 0x1c, 0x73, 0xfe, 0x4d, 0x64, 0x49, 0x16, 0x01, 0x1c, 0x54, 0x64, 0xaa, 0x69, 0xe0, 0xff,
-	0x10, 0xd5, 0x94, 0x4c, 0xf5, 0x2e, 0xc0, 0x12, 0xd5, 0x34, 0xf0, 0x7f, 0x89, 0x30, 0x1f, 0xa0,
-	0x8a, 0xd1, 0xfa, 0xc7, 0x83, 0xff, 0x11, 0x9d, 0xc2, 0xa2, 0xf5, 0xe7, 0x3b, 0xcf, 0x1c, 0x0c,
-	0xf7, 0xff, 0x13, 0xd5, 0x0c, 0xcf, 0x1c, 0x4c, 0x67, 0x16, 0x01, 0x8c, 0xe6, 0x3b, 0x88, 0x28,
-	0xcd, 0x22, 0x80, 0xe1, 0x5a, 0x43, 0x79, 0xd0, 0x08, 0x93, 0xf5, 0xce, 0x54, 0xfc, 0x17, 0x67,
-	0xd5, 0x84, 0x05, 0xa1, 0xf2, 0x69, 0x7a, 0x15, 0x15, 0x45, 0x04, 0x9d, 0x2a, 0x77, 0xa5, 0xc6,
-	0x7a, 0x6b, 0x56, 0x4d, 0x58, 0x05, 0x0e, 0xa2, 0x53, 0x64, 0x13, 0xa9, 0xb4, 0xa4, 0x84, 0xd9,
-	0x79, 0x77, 0x2a, 0xce, 0x2b, 0xb3, 0x6a, 0xc2, 0xca, 0xfb, 0x85, 0xc8, 0xe7, 0xe4, 0x15, 0x34,
-	0x27, 0x03, 0x68, 0x38, 0xf7, 0xa4, 0x62, 0xbe, 0x2f, 0xab, 0x26, 0xac, 0xa2, 0x88, 0xa1, 0xa1,
-	0xb0, 0xda, 0x82, 0x67, 0x5c, 0xc6, 0xf7, 0xd2, 0x87, 0x9c, 0x16, 0x1e, 0x72, 0x39, 0xa8, 0xab,
-	0xe0, 0xfb, 0xa2, 0x74, 0x95, 0xa0, 0x6e, 0x19, 0xdf, 0x1f, 0xa5, 0x5b, 0x5e, 0xb8, 0x8a, 0xd2,
-	0x52, 0x4a, 0xbf, 0xc5, 0xff, 0x2b, 0x58, 0x38, 0x89, 0xf2, 0xc1, 0x1b, 0xbb, 0x9a, 0x47, 0xa9,
-	0x6b, 0xf6, 0xbe, 0x07, 0x3c, 0x60, 0x91, 0x1f, 0xd5, 0x83, 0x68, 0xf2, 0x7a, 0xcd, 0xe9, 0xd9,
-	0x38, 0xe9, 0xd9, 0xe0, 0x97, 0x13, 0xc9, 0xe3, 0xca, 0xc2, 0x29, 0x54, 0x08, 0x5d, 0xc7, 0x07,
-	0x39, 0x98, 0x14, 0x1d, 0x9c, 0x46, 0x6a, 0xf8, 0xa6, 0x3d, 0xc8, 0x43, 0x21, 0xda, 0xc3, 0xc6,
-	0xf0, 0x1e, 0x32, 0x7d, 0x83, 0xf0, 0xaf, 0x0e, 0x83, 0x1c, 0xa4, 0xfa, 0x07, 0x31, 0xa4, 0x07,
-	0xb5, 0x7f, 0x10, 0x43, 0x7a, 0x98, 0x10, 0x3d, 0xac, 0xa2, 0x62, 0xc4, 0x65, 0x75, 0x90, 0x8b,
-	0x69, 0xd1, 0xc5, 0x1a, 0x3a, 0x18, 0x75, 0x07, 0x1d, 0xe4, 0x23, 0x17, 0x9d, 0x4b, 0x7e, 0xb9,
-	0x1c, 0xe4, 0x20, 0x79, 0x9b, 0x38, 0x86, 0x4c, 0xc5, 0xd4, 0xed, 0xe2, 0x18, 0xd2, 0x47, 0x3e,
-	0xfa, 0x81, 0x08, 0xb7, 0xbc, 0x41, 0x1e, 0x94, 0x3e, 0x45, 0xc1, 0xef, 0x6f, 0x83, 0x3c, 0xcc,
-	0x44, 0xe7, 0x92, 0x5f, 0xcd, 0x06, 0x39, 0x48, 0x8b, 0x0e, 0xf6, 0xd1, 0x5c, 0xe4, 0x8d, 0x2b,
-	0xc2, 0xc9, 0x2f, 0x45, 0x27, 0x71, 0x5f, 0xcb, 0x0a, 0xe8, 0x1b, 0x08, 0xf7, 0xbb, 0x77, 0x45,
-	0xd0, 0x2f, 0x8a, 0xf4, 0x31, 0x5e, 0xd5, 0x0a, 0x5f, 0xa0, 0x87, 0xbe, 0xd3, 0xe7, 0xfa, 0x15,
-	0xc1, 0x3f, 0x2b, 0x47, 0x3f, 0xea, 0xbb, 0x5b, 0x01, 0xfb, 0x47, 0xb4, 0xd0, 0xff, 0xea, 0x15,
-	0x41, 0xfe, 0x85, 0x1c, 0x79, 0x8c, 0xb7, 0xb9, 0xa1, 0x82, 0x91, 0x2f, 0x60, 0x22, 0x73, 0x72,
-	0x50, 0x3b, 0x87, 0x9a, 0x0d, 0xdc, 0xad, 0x44, 0x0f, 0x85, 0xe1, 0x3c, 0x6c, 0xf4, 0xf7, 0x90,
-	0x19, 0x6e, 0xa4, 0xc8, 0x17, 0x22, 0xd1, 0x41, 0x6a, 0xf8, 0x20, 0xfa, 0x78, 0x50, 0x87, 0x0f,
-	0xa2, 0x8f, 0x87, 0x89, 0x41, 0x1e, 0xa0, 0x8b, 0x05, 0xaf, 0x27, 0xa2, 0x8b, 0xe9, 0x21, 0xc3,
-	0x90, 0xef, 0x1d, 0xa2, 0x87, 0x99, 0x01, 0x1e, 0x16, 0x4b, 0x68, 0x86, 0x1f, 0x02, 0x67, 0xd0,
-	0xe4, 0xea, 0x85, 0x4b, 0xd5, 0xd5, 0x7c, 0x82, 0xfc, 0xb8, 0x66, 0xad, 0xfe, 0xe6, 0xd7, 0x79,
-	0x45, 0x9d, 0x45, 0xd3, 0x67, 0xaa, 0xab, 0xd6, 0x85, 0xf3, 0xeb, 0xf9, 0xe4, 0x5a, 0x86, 0x1e,
-	0x57, 0x7b, 0xed, 0xa6, 0xdb, 0x3e, 0x5a, 0x46, 0xb3, 0xe2, 0xc1, 0x2b, 0xca, 0x01, 0x52, 0xd3,
-	0xdc, 0xc1, 0x2d, 0x65, 0xed, 0xd2, 0x6f, 0x7f, 0x15, 0xaa, 0xdf, 0x25, 0xaf, 0x7e, 0xb7, 0x7a,
-	0xf5, 0xa5, 0x66, 0xbb, 0x6b, 0xef, 0xb5, 0x6b, 0x8e, 0xf7, 0xd7, 0x13, 0x9e, 0xb5, 0xb3, 0xe4,
-	0xd8, 0x8d, 0xda, 0xf6, 0xfe, 0x52, 0xbf, 0x3f, 0xb4, 0xd8, 0x9a, 0x82, 0x4f, 0xbe, 0x09, 0x00,
-	0x00, 0xff, 0xff, 0x64, 0xfb, 0xb5, 0x25, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180125_92554152/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/test.pb.go
deleted file mode 100644
index cd2631ade6f..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/test.pb.go
+++ /dev/null
@@ -1,1545 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto3_20180430_b4deda09/test.proto
-
-package proto3_20180430_b4deda09 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09"
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_b39f8dbfc888d45a, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_b39f8dbfc888d45a, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_b39f8dbfc888d45a, []int{0}
-}
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (dst *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(dst, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,enum=google.golang.org.proto3_20180430.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,enum=google.golang.org.proto3_20180430.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,packed,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,packed,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,packed,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,packed,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,packed,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,packed,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,packed,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,packed,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,packed,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,packed,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,packed,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,packed,name=repeated_child_enum,json=repeatedChildEnum,enum=google.golang.org.proto3_20180430.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,packed,name=repeated_sibling_enum,json=repeatedSiblingEnum,enum=google.golang.org.proto3_20180430.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20180430.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=google.golang.org.proto3_20180430.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion           isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_b39f8dbfc888d45a, []int{1}
-}
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (dst *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(dst, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,oneof"`
-}
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,oneof"`
-}
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,oneof"`
-}
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,oneof"`
-}
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,oneof"`
-}
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,oneof"`
-}
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,oneof"`
-}
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,oneof"`
-}
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,enum=google.golang.org.proto3_20180430.Message_ChildEnum,oneof"`
-}
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,oneof"`
-}
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,enum=google.golang.org.proto3_20180430.SiblingEnum,oneof"`
-}
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,oneof"`
-}
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,oneof"`
-}
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,oneof"`
-}
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion()           {}
-func (*Message_OneofInt32) isMessage_OneofUnion()          {}
-func (*Message_OneofSint32) isMessage_OneofUnion()         {}
-func (*Message_OneofUint32) isMessage_OneofUnion()         {}
-func (*Message_OneofInt64) isMessage_OneofUnion()          {}
-func (*Message_OneofSint64) isMessage_OneofUnion()         {}
-func (*Message_OneofUint64) isMessage_OneofUnion()         {}
-func (*Message_OneofFixed32) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed32) isMessage_OneofUnion()       {}
-func (*Message_OneofFloat) isMessage_OneofUnion()          {}
-func (*Message_OneofFixed64) isMessage_OneofUnion()        {}
-func (*Message_OneofSfixed64) isMessage_OneofUnion()       {}
-func (*Message_OneofDouble) isMessage_OneofUnion()         {}
-func (*Message_OneofString) isMessage_OneofUnion()         {}
-func (*Message_OneofBytes) isMessage_OneofUnion()          {}
-func (*Message_OneofChildEnum) isMessage_OneofUnion()      {}
-func (*Message_OneofChildMessage) isMessage_OneofUnion()   {}
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion()    {}
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-func (*Message_OneofString1) isMessage_OneofUnion()        {}
-func (*Message_OneofString2) isMessage_OneofUnion()        {}
-func (*Message_OneofString3) isMessage_OneofUnion()        {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil {
-		return m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil {
-		return m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil {
-		return m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil {
-		return m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil {
-		return m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil {
-		return m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil {
-		return m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil {
-		return m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil {
-		return m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil {
-		return m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil {
-		return m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil {
-		return m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil {
-		return m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil {
-		return m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil {
-		return m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil {
-		return m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(400<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(401<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(402<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(403<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(404<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(405<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(406<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(407<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(408<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(409<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(410<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(411<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(412<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(413<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(414<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(415<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(416<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(417<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(418<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_OneofString1:
-		b.EncodeVarint(419<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(420<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(421<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 400: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 401: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 402: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 403: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 404: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 405: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 406: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 407: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 408: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 409: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 410: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 411: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 412: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 413: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 414: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 415: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 416: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 417: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 418: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 419: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 420: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 421: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofString1:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Message_ChildMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_b39f8dbfc888d45a, []int{1, 0}
-}
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (dst *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(dst, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20180430.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20180430.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto3_20180430.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto3_20180430.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto3_20180430.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto3_20180430.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto3_20180430.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20180430.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20180430.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20180430.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20180430.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20180430.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20180430.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20180430.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto3_20180430.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20180430.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto3_20180430.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20180430.Message.ChildMessage")
-	proto.RegisterEnum("google.golang.org.proto3_20180430.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20180430.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-}
-
-func init() {
-	proto.RegisterFile("proto3_20180430_b4deda09/test.proto", fileDescriptor_test_b39f8dbfc888d45a)
-}
-
-var fileDescriptor_test_b39f8dbfc888d45a = []byte{
-	// 1946 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x57, 0x73, 0xdb, 0xca,
-	0x15, 0xc7, 0x09, 0x52, 0xc5, 0x5a, 0xb1, 0x82, 0x96, 0xb2, 0xa3, 0x27, 0x44, 0x76, 0x1c, 0xc4,
-	0xc9, 0x50, 0x12, 0xb9, 0x83, 0x38, 0x4e, 0x62, 0x5b, 0xb2, 0xe5, 0xd0, 0x19, 0x3b, 0xf1, 0xc0,
-	0xa3, 0x3c, 0xe4, 0x45, 0x21, 0x45, 0x90, 0xa6, 0x0d, 0x12, 0x8a, 0x48, 0x7a, 0xa2, 0xc9, 0x83,
-	0xbf, 0x42, 0x7a, 0xef, 0xe5, 0x2d, 0xbd, 0xf7, 0xee, 0x8c, 0xd3, 0xcb, 0xed, 0xf7, 0xd3, 0xdc,
-	0x59, 0x1c, 0x6c, 0x03, 0x40, 0x93, 0x04, 0xe7, 0x3e, 0x78, 0x46, 0x3a, 0xfc, 0xef, 0xf9, 0xf1,
-	0x1c, 0x9c, 0x3d, 0x67, 0x17, 0x16, 0x3a, 0x77, 0x7c, 0xe2, 0x0d, 0xbd, 0xda, 0x61, 0x75, 0x7b,
-	0xe7, 0xd2, 0x36, 0xa9, 0x6d, 0x1f, 0x36, 0x49, 0xcb, 0x69, 0x35, 0xb6, 0xdf, 0xb1, 0x35, 0x74,
-	0x06, 0xc3, 0x8a, 0xff, 0xa9, 0xfe, 0xc6, 0x8e, 0xe7, 0x75, 0x5c, 0xa7, 0xd2, 0xf1, 0xdc, 0x46,
-	0xbf, 0x53, 0xf1, 0x4e, 0x3a, 0x95, 0xd0, 0xb2, 0x4d, 0x17, 0xe5, 0xef, 0x75, 0x9b, 0x6e, 0xb7,
-	0xdf, 0xb9, 0xe3, 0x0c, 0x06, 0x8d, 0x8e, 0xa3, 0xe7, 0x51, 0xba, 0xbd, 0x83, 0x35, 0x43, 0x33,
-	0x57, 0xec, 0x74, 0x7b, 0xc7, 0xff, 0xbd, 0x8a, 0xd3, 0x46, 0xc6, 0xff, 0xbd, 0xaa, 0x5f, 0x46,
-	0xe9, 0x76, 0x0d, 0x67, 0x0c, 0xcd, 0x5c, 0xad, 0x5e, 0xac, 0x4c, 0x24, 0x54, 0x02, 0xbf, 0x76,
-	0xba, 0x5d, 0xdb, 0x7c, 0x72, 0x0d, 0x2d, 0x33, 0xce, 0x39, 0x94, 0xf3, 0x8e, 0x87, 0x5d, 0xaf,
-	0xdf, 0x70, 0x0f, 0x9b, 0x9e, 0xe7, 0xe2, 0x96, 0xa1, 0x99, 0x67, 0xec, 0x2c, 0x33, 0xee, 0x79,
-	0x9e, 0xab, 0xbf, 0x09, 0xe5, 0xb9, 0xa8, 0xdb, 0x1f, 0xd6, 0xaa, 0xd8, 0x31, 0x34, 0x73, 0xd1,
-	0xe6, 0x4b, 0x6f, 0x51, 0xa3, 0xfe, 0x66, 0x54, 0xe0, 0xb2, 0x01, 0xe8, 0xda, 0x86, 0x66, 0x96,
-	0x6c, 0xbe, 0xfa, 0x5e, 0x37, 0x22, 0x1c, 0x81, 0xb0, 0x63, 0x68, 0x66, 0x4e, 0x08, 0x0f, 0x40,
-	0x18, 0x02, 0x5b, 0x04, 0xdf, 0x37, 0x34, 0x33, 0xa3, 0x80, 0x2d, 0x12, 0x01, 0x5b, 0x04, 0x77,
-	0x0d, 0xcd, 0xd4, 0x55, 0x70, 0x48, 0x38, 0x02, 0xe1, 0x03, 0x43, 0x33, 0x17, 0x54, 0xb0, 0x45,
-	0xf4, 0xb7, 0xa0, 0x22, 0x17, 0xb6, 0xbb, 0x1f, 0x71, 0x5a, 0xb5, 0x2a, 0x7e, 0x68, 0x68, 0xe6,
-	0xb2, 0xcd, 0x1d, 0xdc, 0x04, 0xb3, 0xfe, 0x56, 0x54, 0x12, 0x70, 0xa6, 0x75, 0x0d, 0xcd, 0x2c,
-	0xd8, 0xdc, 0xc7, 0xbd, 0xc0, 0xae, 0x04, 0xd4, 0x76, 0xbd, 0xc6, 0x10, 0xf7, 0x0c, 0xcd, 0x4c,
-	0x8b, 0x80, 0x6e, 0x52, 0x63, 0x14, 0x6f, 0x11, 0xdc, 0x37, 0x34, 0x73, 0x29, 0x84, 0xb7, 0x48,
-	0x0c, 0xde, 0x22, 0xd8, 0x33, 0x34, 0xb3, 0x18, 0xc6, 0x87, 0xe2, 0x6f, 0x79, 0xa3, 0xa6, 0xeb,
-	0xe0, 0x63, 0x43, 0x33, 0x35, 0x11, 0xff, 0x0d, 0xdf, 0xaa, 0x66, 0x74, 0x78, 0xd2, 0xed, 0x77,
-	0xf0, 0x87, 0xfd, 0x5a, 0x14, 0x19, 0xf5, 0xad, 0x4a, 0x40, 0xcd, 0xd3, 0xa1, 0x33, 0xc0, 0x27,
-	0x86, 0x66, 0x66, 0x45, 0x40, 0x7b, 0xd4, 0xa8, 0xb7, 0x50, 0x99, 0xcb, 0x8e, 0xee, 0x77, 0xdd,
-	0xd6, 0xa1, 0xd3, 0x1f, 0xf5, 0xf0, 0xc0, 0xd0, 0xcc, 0x7c, 0x95, 0x4c, 0x5f, 0xbf, 0x95, 0xeb,
-	0x74, 0xf1, 0x7e, 0x7f, 0xd4, 0xb3, 0x79, 0xd8, 0xdc, 0xa4, 0xf7, 0xd0, 0x7a, 0x88, 0xd2, 0x83,
-	0x65, 0x78, 0xe8, 0x6f, 0x94, 0xb7, 0xcf, 0x0a, 0x62, 0xbb, 0xe6, 0xac, 0xc2, 0x62, 0x7b, 0xa7,
-	0x89, 0xd6, 0xa4, 0xb2, 0xf3, 0xb7, 0x2f, 0x84, 0x35, 0xf2, 0xc3, 0xaa, 0x4c, 0x41, 0x0b, 0x76,
-	0xbd, 0x1f, 0x50, 0x59, 0x14, 0x2b, 0x37, 0xea, 0x0f, 0x11, 0x8e, 0x30, 0x58, 0x50, 0x8f, 0xfc,
-	0xa0, 0x76, 0xa6, 0xc7, 0xb0, 0x70, 0xd6, 0x43, 0x24, 0x16, 0xd0, 0x79, 0x94, 0x3b, 0x71, 0x8e,
-	0x9d, 0xc6, 0xd0, 0x69, 0x41, 0x33, 0x78, 0xaa, 0x19, 0x19, 0xda, 0x0d, 0x98, 0xd5, 0xef, 0x06,
-	0x17, 0x50, 0x9e, 0xab, 0x60, 0xf3, 0xfe, 0x8d, 0xca, 0x16, 0x6d, 0xbe, 0x18, 0xda, 0x81, 0x89,
-	0x0a, 0x5c, 0x17, 0xb4, 0x83, 0xbf, 0x53, 0x61, 0xc9, 0xe6, 0xeb, 0x83, 0x7e, 0x20, 0x2b, 0x83,
-	0x7e, 0xf0, 0x0f, 0xaa, 0xcc, 0x09, 0x65, 0xd0, 0x10, 0x42, 0x6c, 0x8b, 0xe0, 0x7f, 0x52, 0x61,
-	0x46, 0x61, 0x5b, 0x24, 0xc2, 0xb6, 0x08, 0xfe, 0x17, 0x15, 0xea, 0x2a, 0x3b, 0xa4, 0x0c, 0x5a,
-	0xc2, 0xbf, 0xa9, 0x72, 0x41, 0x65, 0x5b, 0x44, 0xbf, 0x88, 0x8a, 0x5c, 0xc9, 0xf6, 0xf9, 0x7f,
-	0xa8, 0x74, 0xd9, 0xe6, 0x2e, 0x58, 0x53, 0x78, 0x1b, 0x2a, 0x09, 0x3e, 0x13, 0xff, 0x97, 0x8a,
-	0x0b, 0x36, 0xf7, 0xc2, 0xbb, 0x82, 0x1c, 0x15, 0x74, 0x85, 0xff, 0x51, 0x69, 0x5a, 0x44, 0x05,
-	0x6d, 0x21, 0xf2, 0x0d, 0x2c, 0x82, 0xff, 0x4f, 0x95, 0x4b, 0xa1, 0x6f, 0x60, 0x91, 0x98, 0x6f,
-	0x60, 0x11, 0xfc, 0x1c, 0x15, 0x17, 0xc3, 0xdf, 0x20, 0x94, 0x85, 0xa0, 0x31, 0x3c, 0x4f, 0xb5,
-	0x9a, 0xc8, 0x42, 0xd0, 0x19, 0x94, 0xcc, 0x42, 0x67, 0x78, 0x41, 0xf3, 0xc7, 0x92, 0xc8, 0x2c,
-	0xb4, 0x06, 0x39, 0x2a, 0x68, 0x0d, 0x2f, 0x52, 0x61, 0x56, 0x44, 0x05, 0xbd, 0xc1, 0x41, 0x65,
-	0xae, 0x93, 0x7a, 0xc3, 0x4b, 0x54, 0x9c, 0xb8, 0x39, 0x30, 0x8f, 0xa2, 0x39, 0xf4, 0xd1, 0x7a,
-	0x08, 0xc3, 0xf6, 0xd1, 0xcb, 0x94, 0x34, 0x4f, 0x77, 0x50, 0x60, 0x6c, 0x33, 0x1d, 0xa1, 0x35,
-	0xa9, 0x04, 0xa5, 0xee, 0xf0, 0x0a, 0x04, 0x36, 0x73, 0x7b, 0x10, 0x85, 0x2b, 0xda, 0x83, 0x8b,
-	0x70, 0x04, 0xc2, 0xc2, 0x7a, 0x15, 0xc2, 0x4a, 0xd2, 0x1f, 0x42, 0x28, 0x16, 0xd2, 0x87, 0x50,
-	0xae, 0xd7, 0x38, 0xf6, 0x5b, 0x03, 0xf4, 0x87, 0xef, 0xa4, 0x7d, 0xc4, 0x3b, 0x67, 0xc8, 0xdc,
-	0x9d, 0xc6, 0x31, 0xed, 0x22, 0xf4, 0xdf, 0x7e, 0x7f, 0x78, 0x72, 0x6a, 0xaf, 0xf6, 0x84, 0x45,
-	0x3f, 0x42, 0x79, 0x4e, 0x80, 0x46, 0xf0, 0x5d, 0x40, 0xbc, 0x6b, 0x76, 0x84, 0xdf, 0x85, 0x80,
-	0x91, 0xed, 0x49, 0x26, 0xbd, 0x8d, 0x0a, 0x1c, 0x12, 0x34, 0xa6, 0xef, 0x01, 0xe5, 0xdd, 0xb3,
-	0x53, 0xa0, 0x85, 0x01, 0x26, 0xd7, 0x93, 0x6d, 0x0a, 0x27, 0x68, 0x6b, 0xdf, 0x4f, 0xcc, 0x39,
-	0x88, 0xe1, 0x04, 0x4d, 0x31, 0x94, 0x34, 0x8b, 0xe0, 0x1f, 0xcc, 0x93, 0x34, 0x8b, 0x44, 0x92,
-	0x66, 0x91, 0x48, 0xd2, 0x2c, 0x82, 0x7f, 0x38, 0x57, 0xd2, 0x18, 0x46, 0x4e, 0x5a, 0x88, 0x13,
-	0xf4, 0xe3, 0x1f, 0xcd, 0x95, 0xb4, 0x30, 0x27, 0xe8, 0xe6, 0x5d, 0x54, 0xe4, 0x1c, 0xd6, 0xa0,
-	0x7f, 0x0c, 0xa0, 0x2b, 0xb3, 0x83, 0x82, 0xbe, 0x0f, 0xa4, 0x7c, 0x4f, 0x31, 0xea, 0x2e, 0x2a,
-	0x89, 0xd4, 0x31, 0xd6, 0x4f, 0x80, 0x75, 0x35, 0x41, 0xf2, 0xda, 0x32, 0xac, 0xd0, 0x53, 0xad,
-	0x4a, 0x35, 0xc0, 0x30, 0xf9, 0x69, 0xe2, 0x6a, 0xf0, 0xc7, 0x8e, 0x5a, 0x0d, 0x30, 0x89, 0x22,
-	0xd9, 0xb3, 0x08, 0xfe, 0xd9, 0x7c, 0xd9, 0x63, 0xcf, 0x49, 0xc9, 0x9e, 0x45, 0x62, 0xb2, 0x67,
-	0x11, 0xfc, 0xf3, 0x39, 0xb3, 0xc7, 0x60, 0x6a, 0xf6, 0x42, 0xe5, 0x17, 0x0c, 0xc2, 0x5f, 0x24,
-	0x2e, 0x3f, 0x18, 0x99, 0x6a, 0xf9, 0x05, 0x63, 0x54, 0xd9, 0x4e, 0x30, 0x46, 0x7f, 0x99, 0x7c,
-	0x3b, 0xf9, 0x0e, 0x42, 0xdb, 0x09, 0x86, 0xb0, 0x5c, 0x0d, 0x30, 0x84, 0x7f, 0x95, 0xb8, 0x1a,
-	0xfc, 0x71, 0xad, 0x56, 0x03, 0x4c, 0xf0, 0x63, 0x54, 0xe6, 0x10, 0x69, 0x82, 0xff, 0x1a, 0x48,
-	0xd7, 0x66, 0x27, 0xf1, 0xa9, 0x0d, 0xb4, 0x62, 0x2f, 0x64, 0xd6, 0x4f, 0xd1, 0x7a, 0x88, 0xc8,
-	0xa6, 0xde, 0x6f, 0x00, 0x7a, 0x3d, 0x21, 0x34, 0xb0, 0x01, 0xb7, 0xdc, 0x8b, 0x7e, 0xa2, 0x3f,
-	0x42, 0x6b, 0x52, 0x23, 0x94, 0xe6, 0xfa, 0x6f, 0x81, 0xbc, 0x97, 0xa4, 0x1d, 0xf2, 0x89, 0x0e,
-	0x60, 0xbd, 0x17, 0xf9, 0x40, 0x7f, 0x8c, 0x70, 0x84, 0xcb, 0x82, 0xfe, 0x1d, 0xa0, 0xf7, 0x13,
-	0xa3, 0x95, 0xb0, 0xd7, 0x7a, 0x71, 0x9f, 0xb1, 0x52, 0xf2, 0x67, 0x0e, 0x8c, 0xff, 0xdf, 0x27,
-	0x2a, 0x25, 0x7f, 0x08, 0x8b, 0xf9, 0x4f, 0x4b, 0x89, 0x9b, 0xd8, 0xbe, 0x18, 0x48, 0x94, 0x3f,
-	0x24, 0xda, 0x17, 0x30, 0x83, 0x05, 0x86, 0xee, 0x0b, 0x61, 0x63, 0x9c, 0x91, 0xc4, 0xf9, 0x63,
-	0x22, 0xce, 0x41, 0x0c, 0x47, 0xd8, 0xa4, 0xa4, 0x59, 0x04, 0x30, 0x7f, 0x4a, 0x9a, 0x34, 0x8b,
-	0x44, 0x92, 0x06, 0x26, 0x39, 0x69, 0x8c, 0xf2, 0xe7, 0xc4, 0x49, 0x93, 0x31, 0x2c, 0x69, 0x2a,
-	0x67, 0x24, 0x71, 0xfe, 0x92, 0x38, 0x69, 0x61, 0x8e, 0xb0, 0xb1, 0xe9, 0x12, 0x4c, 0x34, 0x00,
-	0x3d, 0x49, 0x34, 0x5d, 0x82, 0x11, 0x2c, 0x48, 0xf4, 0x69, 0x48, 0x46, 0x9e, 0x3a, 0xbf, 0x5b,
-	0x02, 0xe9, 0xaf, 0xc9, 0x52, 0xe7, 0x7b, 0x08, 0xa5, 0x8e, 0xdb, 0x74, 0x03, 0x21, 0xaf, 0xef,
-	0x78, 0x6d, 0x40, 0x7c, 0x2c, 0x63, 0x68, 0xe6, 0x99, 0x7a, 0xca, 0x5e, 0xf1, 0x8d, 0xbe, 0x62,
-	0x13, 0xad, 0x82, 0x02, 0x4e, 0x8a, 0x1f, 0xa7, 0x92, 0xc5, 0x7a, 0xca, 0x86, 0x75, 0x70, 0x72,
-	0x3d, 0x8f, 0xb2, 0xa0, 0x09, 0x8e, 0xad, 0x9f, 0xa0, 0xa2, 0x52, 0x3d, 0x65, 0xc3, 0xd2, 0xe0,
-	0xdc, 0xc9, 0x55, 0xc1, 0xa1, 0xf3, 0x93, 0x54, 0x95, 0xe3, 0xaa, 0xe0, 0xd4, 0x28, 0xf3, 0x2c,
-	0x82, 0x3f, 0x45, 0x45, 0x19, 0x99, 0x67, 0x11, 0x95, 0x67, 0x11, 0xfc, 0x69, 0x2a, 0xd2, 0x15,
-	0x9e, 0xac, 0x0a, 0xce, 0x6b, 0x9f, 0xa1, 0xaa, 0x05, 0x85, 0x67, 0x11, 0xfd, 0x02, 0xca, 0x81,
-	0x8a, 0x9d, 0x80, 0x3e, 0x4b, 0x65, 0xcb, 0xf5, 0x94, 0x0d, 0xab, 0xd9, 0x69, 0xc9, 0x44, 0xf9,
-	0x80, 0xc9, 0x84, 0x9f, 0xa3, 0xc2, 0x42, 0x3d, 0x65, 0x83, 0x03, 0x7e, 0xd2, 0xe1, 0x11, 0xc0,
-	0x31, 0xe7, 0xf3, 0x54, 0x96, 0xe6, 0x11, 0xc0, 0x41, 0x45, 0xa5, 0x5a, 0x04, 0x7f, 0x81, 0xaa,
-	0x96, 0x54, 0xaa, 0x7f, 0x01, 0x56, 0xa8, 0x16, 0xc1, 0x5f, 0xa4, 0xc2, 0x62, 0x88, 0x2a, 0x47,
-	0x1b, 0x1c, 0x0f, 0xbe, 0x44, 0x75, 0x1a, 0x8f, 0x36, 0x98, 0xef, 0x22, 0x73, 0x30, 0xdc, 0xbf,
-	0x4c, 0x55, 0x2b, 0x22, 0x73, 0x30, 0x9d, 0x79, 0x04, 0x30, 0x9a, 0xbf, 0x42, 0x45, 0x59, 0x1e,
-	0x01, 0x0c, 0xd7, 0x06, 0x2a, 0x82, 0x46, 0x9a, 0xac, 0x5f, 0xcd, 0x24, 0x7f, 0x71, 0x56, 0x4f,
-	0xd9, 0x10, 0xaa, 0x98, 0xa6, 0x0f, 0x50, 0x59, 0x46, 0xb0, 0xa9, 0xf2, 0xb5, 0xcc, 0x5c, 0x6f,
-	0xcd, 0xea, 0x29, 0xbb, 0x24, 0x40, 0x6c, 0x8a, 0x1c, 0x22, 0x9d, 0x95, 0x94, 0x34, 0x3b, 0xbf,
-	0x9e, 0x49, 0xf2, 0xca, 0xac, 0x9e, 0xb2, 0x8b, 0x41, 0x21, 0x8a, 0x39, 0x79, 0x1f, 0xad, 0xa9,
-	0x00, 0x16, 0xce, 0x37, 0x32, 0x09, 0xdf, 0x97, 0xd5, 0x53, 0x76, 0x59, 0xc6, 0xb0, 0x50, 0x78,
-	0x6d, 0xc1, 0x33, 0xde, 0xc1, 0xdf, 0x64, 0x0f, 0x39, 0x2b, 0x3d, 0xe4, 0x9d, 0xb0, 0xae, 0x8a,
-	0xbf, 0x15, 0xa7, 0xab, 0x86, 0x75, 0x35, 0xfc, 0xed, 0x38, 0x5d, 0x6d, 0xe3, 0x01, 0xca, 0x2a,
-	0x29, 0x7d, 0x1d, 0xff, 0xaf, 0x60, 0xe3, 0x0a, 0x2a, 0x86, 0x6f, 0xec, 0x7a, 0x11, 0x65, 0x1e,
-	0x3a, 0xa7, 0x3e, 0xf0, 0x8c, 0x4d, 0x7f, 0xd4, 0xcf, 0xa2, 0xc5, 0x47, 0x0d, 0x77, 0xe4, 0xe0,
-	0xb4, 0x6f, 0x83, 0x5f, 0x2e, 0xa7, 0x2f, 0x69, 0x1b, 0x57, 0x51, 0x29, 0x72, 0x1d, 0x9f, 0xe4,
-	0x60, 0x51, 0x76, 0x70, 0x0d, 0xe9, 0xd1, 0x9b, 0xf6, 0x24, 0x0f, 0xa5, 0x78, 0x0f, 0x07, 0xd3,
-	0x7b, 0xc8, 0x8d, 0x0d, 0x22, 0xb8, 0x3a, 0x4c, 0x72, 0x90, 0x19, 0x1f, 0xc4, 0x94, 0x1e, 0xf4,
-	0xf1, 0x41, 0x4c, 0xe9, 0x61, 0x41, 0xf6, 0xb0, 0x8b, 0xca, 0x31, 0x97, 0xd5, 0x49, 0x2e, 0x96,
-	0x65, 0x17, 0x7b, 0xe8, 0x6c, 0xdc, 0x1d, 0x74, 0x92, 0x8f, 0x42, 0x7c, 0x2e, 0xc5, 0xe5, 0x72,
-	0x92, 0x83, 0xf4, 0x33, 0xe2, 0x98, 0x32, 0x15, 0x4b, 0xcf, 0x8a, 0x63, 0x4a, 0x1f, 0xc5, 0xf8,
-	0x07, 0x22, 0xdd, 0xf2, 0x26, 0x79, 0xd0, 0xc6, 0x14, 0x85, 0xb8, 0xbf, 0x4d, 0xf2, 0xb0, 0x12,
-	0x9f, 0x4b, 0x71, 0x35, 0x9b, 0xe4, 0x20, 0x2b, 0x3b, 0x38, 0x45, 0x6b, 0xb1, 0x37, 0xae, 0x18,
-	0x27, 0xef, 0x95, 0x9d, 0x24, 0x7d, 0x2d, 0x2b, 0xa1, 0x1f, 0x23, 0x3c, 0xee, 0xde, 0x15, 0x43,
-	0xbf, 0x23, 0xd3, 0xe7, 0x78, 0x55, 0x2b, 0x7d, 0x81, 0x11, 0x7a, 0xc3, 0x98, 0xeb, 0x57, 0x0c,
-	0xff, 0x86, 0x1a, 0xfd, 0xac, 0xef, 0x6e, 0x25, 0xec, 0x47, 0xd1, 0xc6, 0xf8, 0xab, 0x57, 0x0c,
-	0xf9, 0x3d, 0x6a, 0xe4, 0x09, 0xde, 0xe6, 0x46, 0x0a, 0x46, 0xbd, 0x80, 0xc9, 0xcc, 0xc5, 0x49,
-	0xed, 0x1c, 0x6a, 0x36, 0x74, 0xb7, 0x92, 0x3d, 0x94, 0xa6, 0xf3, 0x70, 0x30, 0xde, 0x43, 0x6e,
-	0xba, 0x91, 0xa2, 0x5e, 0x88, 0x64, 0x07, 0x99, 0xe9, 0x83, 0x18, 0xe3, 0x41, 0x9f, 0x3e, 0x88,
-	0x31, 0x1e, 0x16, 0x26, 0x79, 0x80, 0x2e, 0x16, 0xbe, 0x9e, 0xc8, 0x2e, 0x96, 0xa7, 0x0c, 0x43,
-	0xbd, 0x77, 0xc8, 0x1e, 0x56, 0x26, 0x78, 0xd8, 0xac, 0xa0, 0x15, 0x71, 0x08, 0x5c, 0x41, 0x8b,
-	0xbb, 0xb7, 0xef, 0xd6, 0x77, 0x8b, 0x29, 0xfa, 0xe3, 0x9e, 0xbd, 0xfb, 0x81, 0xf7, 0x17, 0x35,
-	0x7d, 0x15, 0x2d, 0x5f, 0xaf, 0xef, 0xda, 0xb7, 0x6f, 0xed, 0x17, 0xd3, 0x7b, 0x39, 0x76, 0x5c,
-	0x1d, 0xf5, 0xbb, 0x5e, 0xff, 0xe2, 0x0e, 0x5a, 0x95, 0x0f, 0x5e, 0x71, 0x0e, 0x90, 0x9e, 0x15,
-	0x0e, 0x9e, 0x6a, 0x7b, 0x77, 0x3f, 0xf8, 0xbe, 0x48, 0xfd, 0x6e, 0xf9, 0xf5, 0xdb, 0x1c, 0xb5,
-	0xb7, 0xba, 0xfd, 0xa1, 0x73, 0xd2, 0x6f, 0xb8, 0xfe, 0x5f, 0x4f, 0xf8, 0xd6, 0xc1, 0x96, 0xeb,
-	0x74, 0x1a, 0x47, 0xa7, 0x5b, 0xe3, 0xfe, 0xd0, 0xa2, 0xb9, 0x04, 0x9f, 0xbc, 0x16, 0x00, 0x00,
-	0xff, 0xff, 0xc9, 0x66, 0x05, 0xd3, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180430_b4deda09/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/test.pb.go
deleted file mode 100644
index 97e40899f99..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/test.pb.go
+++ /dev/null
@@ -1,1587 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto3_20180814_aa810b61/test.proto
-
-package proto3_20180814_aa810b61 // import "google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61"
-
-import proto "google.golang.org/protobuf/internal/protolegacy"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_14f9d28b9a7006c3, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_14f9d28b9a7006c3, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2,proto3" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_14f9d28b9a7006c3, []int{0}
-}
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (dst *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(dst, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool,proto3" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32,proto3" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64,proto3" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64,proto3" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32,proto3" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32,proto3" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat,proto3" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64,proto3" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64,proto3" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble,proto3" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString,proto3" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,proto3,enum=google.golang.org.proto3_20180814.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage,proto3" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,proto3,enum=google.golang.org.proto3_20180814.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage,proto3" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,packed,name=repeated_bool,json=repeatedBool,proto3" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,packed,name=repeated_sint32,json=repeatedSint32,proto3" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,packed,name=repeated_sint64,json=repeatedSint64,proto3" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,packed,name=repeated_uint64,json=repeatedUint64,proto3" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,packed,name=repeated_fixed32,json=repeatedFixed32,proto3" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32,proto3" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,packed,name=repeated_float,json=repeatedFloat,proto3" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,packed,name=repeated_fixed64,json=repeatedFixed64,proto3" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64,proto3" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,packed,name=repeated_double,json=repeatedDouble,proto3" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString,proto3" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,packed,name=repeated_child_enum,json=repeatedChildEnum,proto3,enum=google.golang.org.proto3_20180814.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage,proto3" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,packed,name=repeated_sibling_enum,json=repeatedSiblingEnum,proto3,enum=google.golang.org.proto3_20180814.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage,proto3" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool,proto3" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32,proto3" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32,proto3" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32,proto3" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64,proto3" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64,proto3" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"zigzag64,2,opt,name=value,proto3"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64,proto3" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32,proto3" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32,proto3" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat,proto3" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64,proto3" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64,proto3" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble,proto3" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString,proto3" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes,proto3" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum,proto3" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.golang.org.proto3_20180814.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage,proto3" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum,proto3" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.golang.org.proto3_20180814.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage,proto3" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool,proto3" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool,proto3" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool,proto3" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool,proto3" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool,proto3" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool,proto3" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool,proto3" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool,proto3" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion           isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_14f9d28b9a7006c3, []int{1}
-}
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (dst *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(dst, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil {
-		return m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil {
-		return m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil {
-		return m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil {
-		return m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil {
-		return m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil {
-		return m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil {
-		return m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil {
-		return m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil {
-		return m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil {
-		return m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil {
-		return m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil {
-		return m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil {
-		return m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil {
-		return m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil {
-		return m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil {
-		return m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,proto3,oneof"`
-}
-
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,proto3,oneof"`
-}
-
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,proto3,oneof"`
-}
-
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,proto3,oneof"`
-}
-
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,proto3,oneof"`
-}
-
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,proto3,oneof"`
-}
-
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,proto3,oneof"`
-}
-
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,proto3,oneof"`
-}
-
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,proto3,oneof"`
-}
-
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,proto3,oneof"`
-}
-
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,proto3,oneof"`
-}
-
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,proto3,oneof"`
-}
-
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,proto3,oneof"`
-}
-
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,proto3,oneof"`
-}
-
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,proto3,enum=google.golang.org.proto3_20180814.Message_ChildEnum,oneof"`
-}
-
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,proto3,oneof"`
-}
-
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,proto3,enum=google.golang.org.proto3_20180814.SiblingEnum,oneof"`
-}
-
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,proto3,oneof"`
-}
-
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,proto3,oneof"`
-}
-
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,proto3,oneof"`
-}
-
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,proto3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofFloat) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofDouble) isMessage_OneofUnion() {}
-
-func (*Message_OneofString) isMessage_OneofUnion() {}
-
-func (*Message_OneofBytes) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofString1) isMessage_OneofUnion() {}
-
-func (*Message_OneofString2) isMessage_OneofUnion() {}
-
-func (*Message_OneofString3) isMessage_OneofUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Message) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Message_OneofMarshaler, _Message_OneofUnmarshaler, _Message_OneofSizer, []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-func _Message_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(400<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Message_OneofInt32:
-		b.EncodeVarint(401<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		b.EncodeVarint(402<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.OneofSint32))
-	case *Message_OneofUint32:
-		b.EncodeVarint(403<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		b.EncodeVarint(404<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		b.EncodeVarint(405<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.OneofSint64))
-	case *Message_OneofUint64:
-		b.EncodeVarint(406<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		b.EncodeVarint(407<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofFixed32))
-	case *Message_OneofSfixed32:
-		b.EncodeVarint(408<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.OneofSfixed32))
-	case *Message_OneofFloat:
-		b.EncodeVarint(409<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *Message_OneofFixed64:
-		b.EncodeVarint(410<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofFixed64))
-	case *Message_OneofSfixed64:
-		b.EncodeVarint(411<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.OneofSfixed64))
-	case *Message_OneofDouble:
-		b.EncodeVarint(412<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *Message_OneofString:
-		b.EncodeVarint(413<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *Message_OneofBytes:
-		b.EncodeVarint(414<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		b.EncodeVarint(415<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		b.EncodeVarint(416<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofChildMessage); err != nil {
-			return err
-		}
-	case *Message_OneofSiblingEnum:
-		b.EncodeVarint(417<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		b.EncodeVarint(418<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofSiblingMessage); err != nil {
-			return err
-		}
-	case *Message_OneofString1:
-		b.EncodeVarint(419<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString1)
-	case *Message_OneofString2:
-		b.EncodeVarint(420<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString2)
-	case *Message_OneofString3:
-		b.EncodeVarint(421<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString3)
-	case nil:
-	default:
-		return fmt.Errorf("Message.OneofUnion has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Message_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Message)
-	switch tag {
-	case 400: // oneof_union.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofBool{x != 0}
-		return true, err
-	case 401: // oneof_union.oneof_int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt32{int32(x)}
-		return true, err
-	case 402: // oneof_union.oneof_sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.OneofUnion = &Message_OneofSint32{int32(x)}
-		return true, err
-	case 403: // oneof_union.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint32{uint32(x)}
-		return true, err
-	case 404: // oneof_union.oneof_int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofInt64{int64(x)}
-		return true, err
-	case 405: // oneof_union.oneof_sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.OneofUnion = &Message_OneofSint64{int64(x)}
-		return true, err
-	case 406: // oneof_union.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofUint64{x}
-		return true, err
-	case 407: // oneof_union.oneof_fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFixed32{uint32(x)}
-		return true, err
-	case 408: // oneof_union.oneof_sfixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofSfixed32{int32(x)}
-		return true, err
-	case 409: // oneof_union.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofUnion = &Message_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 410: // oneof_union.oneof_fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofFixed64{x}
-		return true, err
-	case 411: // oneof_union.oneof_sfixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofSfixed64{int64(x)}
-		return true, err
-	case 412: // oneof_union.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofUnion = &Message_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 413: // oneof_union.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString{x}
-		return true, err
-	case 414: // oneof_union.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofUnion = &Message_OneofBytes{x}
-		return true, err
-	case 415: // oneof_union.oneof_child_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofChildEnum{Message_ChildEnum(x)}
-		return true, err
-	case 416: // oneof_union.oneof_child_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Message_ChildMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofChildMessage{msg}
-		return true, err
-	case 417: // oneof_union.oneof_sibling_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofUnion = &Message_OneofSiblingEnum{SiblingEnum(x)}
-		return true, err
-	case 418: // oneof_union.oneof_sibling_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(SiblingMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofUnion = &Message_OneofSiblingMessage{msg}
-		return true, err
-	case 419: // oneof_union.oneof_string1
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString1{x}
-		return true, err
-	case 420: // oneof_union.oneof_string2
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString2{x}
-		return true, err
-	case 421: // oneof_union.oneof_string3
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofUnion = &Message_OneofString3{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Message_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Message)
-	// oneof_union
-	switch x := m.OneofUnion.(type) {
-	case *Message_OneofBool:
-		n += 2 // tag and wire
-		n += 1
-	case *Message_OneofInt32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt32))
-	case *Message_OneofSint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64((uint32(x.OneofSint32) << 1) ^ uint32((int32(x.OneofSint32) >> 31))))
-	case *Message_OneofUint32:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *Message_OneofInt64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofInt64))
-	case *Message_OneofSint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(uint64(x.OneofSint64<<1) ^ uint64((int64(x.OneofSint64) >> 63))))
-	case *Message_OneofUint64:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *Message_OneofFixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofSfixed32:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFloat:
-		n += 2 // tag and wire
-		n += 4
-	case *Message_OneofFixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofSfixed64:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofDouble:
-		n += 2 // tag and wire
-		n += 8
-	case *Message_OneofString:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *Message_OneofBytes:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *Message_OneofChildEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofChildEnum))
-	case *Message_OneofChildMessage:
-		s := proto.Size(x.OneofChildMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofSiblingEnum:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(x.OneofSiblingEnum))
-	case *Message_OneofSiblingMessage:
-		s := proto.Size(x.OneofSiblingMessage)
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Message_OneofString1:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString1)))
-		n += len(x.OneofString1)
-	case *Message_OneofString2:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString2)))
-		n += len(x.OneofString2)
-	case *Message_OneofString3:
-		n += 2 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.OneofString3)))
-		n += len(x.OneofString3)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Message_ChildMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2,proto3" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_14f9d28b9a7006c3, []int{1, 0}
-}
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (dst *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(dst, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20180814.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20180814.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto3_20180814.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto3_20180814.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto3_20180814.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto3_20180814.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto3_20180814.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20180814.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20180814.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20180814.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20180814.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20180814.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20180814.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20180814.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto3_20180814.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20180814.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto3_20180814.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20180814.Message.ChildMessage")
-	proto.RegisterEnum("google.golang.org.proto3_20180814.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20180814.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-}
-
-func init() {
-	proto.RegisterFile("proto3_20180814_aa810b61/test.proto", fileDescriptor_test_14f9d28b9a7006c3)
-}
-
-var fileDescriptor_test_14f9d28b9a7006c3 = []byte{
-	// 1946 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x57, 0x73, 0xdb, 0xca,
-	0x15, 0xc7, 0x09, 0x52, 0xc5, 0x5a, 0xb1, 0x82, 0x96, 0xb2, 0xa3, 0x27, 0x44, 0x76, 0x1c, 0xc4,
-	0xc9, 0x50, 0x26, 0x85, 0x41, 0x34, 0x4e, 0x62, 0x5b, 0xb2, 0xe5, 0xd0, 0x19, 0x3b, 0xf1, 0xc0,
-	0xa3, 0x3c, 0xe4, 0x45, 0x21, 0x25, 0x90, 0xa6, 0x0d, 0x12, 0x8a, 0x48, 0x7a, 0xa2, 0xc9, 0x83,
-	0xbf, 0x42, 0x7a, 0x6f, 0xb7, 0xbd, 0xdd, 0xde, 0x7b, 0xf7, 0x1d, 0xdf, 0xde, 0xeb, 0xa7, 0xb9,
-	0xb3, 0x38, 0xd8, 0x06, 0x80, 0x26, 0x09, 0xce, 0x7d, 0xf0, 0x8c, 0x74, 0xf8, 0xdf, 0xf3, 0xe3,
-	0x39, 0x38, 0x7b, 0xce, 0x2e, 0x2c, 0x74, 0x64, 0x6f, 0xdf, 0xed, 0xb9, 0xab, 0xdb, 0x95, 0x13,
-	0xe5, 0xb5, 0x13, 0x6b, 0x65, 0x63, 0xbb, 0x56, 0x5b, 0x2b, 0x9f, 0xa8, 0x9b, 0xe5, 0x95, 0x9e,
-	0xdd, 0xed, 0x95, 0xbc, 0x4f, 0xd5, 0x6f, 0x37, 0x5d, 0xb7, 0xe9, 0xd8, 0xa5, 0xa6, 0xeb, 0xd4,
-	0x3a, 0xcd, 0x92, 0xbb, 0xdf, 0x2c, 0x05, 0x96, 0x2d, 0x3b, 0x28, 0x7b, 0xa5, 0x55, 0x77, 0x5a,
-	0x9d, 0xe6, 0x25, 0xbb, 0xdb, 0xad, 0x35, 0x6d, 0x35, 0x8b, 0x92, 0x8d, 0x32, 0x56, 0x34, 0x45,
-	0x9f, 0xb3, 0x92, 0x8d, 0xb2, 0xf7, 0x7b, 0x05, 0x27, 0xb5, 0x94, 0xf7, 0x7b, 0x45, 0x3d, 0x89,
-	0x92, 0x8d, 0x55, 0x9c, 0xd2, 0x14, 0x7d, 0xbe, 0x72, 0xbc, 0x34, 0x94, 0x50, 0xf2, 0xfd, 0x5a,
-	0xc9, 0xc6, 0xea, 0xf2, 0xad, 0x33, 0x68, 0x96, 0x72, 0x8e, 0xa0, 0x8c, 0xbb, 0xd7, 0x6b, 0xb9,
-	0x9d, 0x9a, 0xb3, 0x5d, 0x77, 0x5d, 0x07, 0xef, 0x6a, 0x8a, 0x7e, 0xc8, 0x4a, 0x53, 0xe3, 0x86,
-	0xeb, 0x3a, 0xea, 0x77, 0x50, 0x96, 0x89, 0x5a, 0x9d, 0xde, 0x6a, 0x05, 0xdb, 0x9a, 0xa2, 0x4f,
-	0x5b, 0x6c, 0xe9, 0x05, 0x62, 0x54, 0xbf, 0x8b, 0x72, 0x4c, 0xd6, 0x05, 0x5d, 0x43, 0x53, 0xf4,
-	0x82, 0xc5, 0x56, 0x5f, 0x69, 0x85, 0x84, 0x7d, 0x10, 0x36, 0x35, 0x45, 0xcf, 0x70, 0xe1, 0x16,
-	0x08, 0x03, 0x60, 0xd3, 0xc0, 0x57, 0x35, 0x45, 0x4f, 0x49, 0x60, 0xd3, 0x08, 0x81, 0x4d, 0x03,
-	0xb7, 0x34, 0x45, 0x57, 0x65, 0x70, 0x40, 0xd8, 0x07, 0xe1, 0x35, 0x4d, 0xd1, 0xa7, 0x64, 0xb0,
-	0x69, 0xa8, 0xdf, 0x43, 0x79, 0x26, 0x6c, 0xb4, 0x7e, 0x6b, 0xef, 0xae, 0x56, 0xf0, 0x75, 0x4d,
-	0xd1, 0x67, 0x2d, 0xe6, 0xe0, 0x3c, 0x98, 0xd5, 0xef, 0xa3, 0x02, 0x87, 0x53, 0xad, 0xa3, 0x29,
-	0x7a, 0xce, 0x62, 0x3e, 0xae, 0xf8, 0x76, 0x29, 0xa0, 0x86, 0xe3, 0xd6, 0x7a, 0xb8, 0xad, 0x29,
-	0x7a, 0x92, 0x07, 0x74, 0x9e, 0x18, 0xc3, 0x78, 0xd3, 0xc0, 0x1d, 0x4d, 0xd1, 0x67, 0x02, 0x78,
-	0xd3, 0x88, 0xc0, 0x9b, 0x06, 0x76, 0x35, 0x45, 0xcf, 0x07, 0xf1, 0x81, 0xf8, 0x77, 0xdd, 0x7e,
-	0xdd, 0xb1, 0xf1, 0x9e, 0xa6, 0xe8, 0x0a, 0x8f, 0xff, 0x9c, 0x67, 0x95, 0x33, 0xda, 0xdb, 0x6f,
-	0x75, 0x9a, 0xf8, 0x37, 0x5e, 0x2d, 0xf2, 0x8c, 0x7a, 0x56, 0x29, 0xa0, 0xfa, 0x41, 0xcf, 0xee,
-	0xe2, 0x7d, 0x4d, 0xd1, 0xd3, 0x3c, 0xa0, 0x0d, 0x62, 0x54, 0x77, 0x51, 0x91, 0xc9, 0x76, 0xae,
-	0xb6, 0x9c, 0xdd, 0x6d, 0xbb, 0xd3, 0x6f, 0xe3, 0xae, 0xa6, 0xe8, 0xd9, 0x8a, 0x31, 0x7a, 0xfd,
-	0x96, 0xce, 0x92, 0xc5, 0x9b, 0x9d, 0x7e, 0xdb, 0x62, 0x61, 0x33, 0x93, 0xda, 0x46, 0x8b, 0x01,
-	0x4a, 0x1b, 0x96, 0xe1, 0x9e, 0xb7, 0x51, 0x7e, 0x38, 0x2e, 0x88, 0xee, 0x9a, 0xc3, 0x12, 0x8b,
-	0xee, 0x9d, 0x3a, 0x5a, 0x10, 0xca, 0xce, 0xdb, 0xbe, 0x10, 0x56, 0xdf, 0x0b, 0xab, 0x34, 0x02,
-	0xcd, 0xdf, 0xf5, 0x5e, 0x40, 0x45, 0x5e, 0xac, 0xcc, 0xa8, 0x5e, 0x47, 0x38, 0xc4, 0xa0, 0x41,
-	0xdd, 0xf0, 0x82, 0x2a, 0x8f, 0x8e, 0xa1, 0xe1, 0x2c, 0x06, 0x48, 0x34, 0xa0, 0xa3, 0x28, 0xb3,
-	0x6f, 0xef, 0xd9, 0xb5, 0x9e, 0xbd, 0x0b, 0xcd, 0xe0, 0xb6, 0xa2, 0xa5, 0x48, 0x37, 0xa0, 0x56,
-	0xaf, 0x1b, 0x1c, 0x43, 0x59, 0xa6, 0x82, 0xcd, 0xfb, 0x26, 0x91, 0x4d, 0x5b, 0x6c, 0x31, 0xb4,
-	0x03, 0x1d, 0xe5, 0x98, 0xce, 0x6f, 0x07, 0x6f, 0x11, 0x61, 0xc1, 0x62, 0xeb, 0xfd, 0x7e, 0x20,
-	0x2a, 0xfd, 0x7e, 0xf0, 0x36, 0x51, 0x66, 0xb8, 0xd2, 0x6f, 0x08, 0x01, 0xb6, 0x69, 0xe0, 0x77,
-	0x88, 0x30, 0x25, 0xb1, 0x4d, 0x23, 0xc4, 0x36, 0x0d, 0xfc, 0x2e, 0x11, 0xaa, 0x32, 0x3b, 0xa0,
-	0xf4, 0x5b, 0xc2, 0x7b, 0x44, 0x39, 0x25, 0xb3, 0x4d, 0x43, 0x3d, 0x8e, 0xf2, 0x4c, 0x49, 0xf7,
-	0xf9, 0xfb, 0x44, 0x3a, 0x6b, 0x31, 0x17, 0xb4, 0x29, 0xfc, 0x00, 0x15, 0x38, 0x9f, 0x8a, 0x3f,
-	0x20, 0xe2, 0x9c, 0xc5, 0xbc, 0xb0, 0xae, 0x20, 0x46, 0x05, 0x5d, 0xe1, 0x43, 0x22, 0x4d, 0xf2,
-	0xa8, 0xa0, 0x2d, 0x84, 0xbe, 0x81, 0x69, 0xe0, 0x8f, 0x88, 0x72, 0x26, 0xf0, 0x0d, 0x4c, 0x23,
-	0xe2, 0x1b, 0x98, 0x06, 0xfe, 0x98, 0x88, 0xf3, 0xc1, 0x6f, 0x10, 0xc8, 0x82, 0xdf, 0x18, 0x3e,
-	0x21, 0x5a, 0x85, 0x67, 0xc1, 0xef, 0x0c, 0x52, 0x66, 0xa1, 0x33, 0x7c, 0xaa, 0x78, 0x63, 0x89,
-	0x67, 0x16, 0x5a, 0x83, 0x18, 0x15, 0xb4, 0x86, 0xcf, 0x88, 0x30, 0xcd, 0xa3, 0x82, 0xde, 0x60,
-	0xa3, 0x22, 0xd3, 0x09, 0xbd, 0xe1, 0x73, 0x22, 0x8e, 0xdd, 0x1c, 0xa8, 0x47, 0xde, 0x1c, 0x3a,
-	0x68, 0x31, 0x80, 0xa1, 0xfb, 0xe8, 0x0b, 0x42, 0x9a, 0xa4, 0x3b, 0x48, 0x30, 0xba, 0x99, 0x76,
-	0xd0, 0x82, 0x50, 0x82, 0x42, 0x77, 0xf8, 0x12, 0x02, 0x1b, 0xbb, 0x3d, 0xf0, 0xc2, 0xe5, 0xed,
-	0xc1, 0x41, 0x38, 0x04, 0xa1, 0x61, 0x7d, 0x05, 0x61, 0xc5, 0xe9, 0x0f, 0x01, 0x14, 0x0d, 0xe9,
-	0xd7, 0x28, 0xd3, 0xae, 0xed, 0x79, 0xad, 0x01, 0xfa, 0xc3, 0xfd, 0x49, 0x0f, 0xf1, 0xa3, 0x31,
-	0x32, 0x77, 0xa9, 0xb6, 0x47, 0xba, 0x08, 0xf9, 0xb7, 0xd9, 0xe9, 0xed, 0x1f, 0x58, 0xf3, 0x6d,
-	0x6e, 0x51, 0x77, 0x50, 0x96, 0x11, 0xa0, 0x11, 0x3c, 0x00, 0x88, 0x1f, 0x8f, 0x8f, 0xf0, 0xba,
-	0x10, 0x30, 0xd2, 0x6d, 0xc1, 0xa4, 0x36, 0x50, 0x8e, 0x41, 0xfc, 0xc6, 0xf4, 0x20, 0x50, 0x7e,
-	0x32, 0x3e, 0x05, 0x5a, 0x18, 0x60, 0x32, 0x6d, 0xd1, 0x26, 0x71, 0xfc, 0xb6, 0xf6, 0x50, 0x6c,
-	0xce, 0x56, 0x04, 0xc7, 0x6f, 0x8a, 0x81, 0xa4, 0x99, 0x06, 0x7e, 0x78, 0x92, 0xa4, 0x99, 0x46,
-	0x28, 0x69, 0xa6, 0x11, 0x4a, 0x9a, 0x69, 0xe0, 0x47, 0x26, 0x4a, 0x1a, 0xc5, 0x88, 0x49, 0x0b,
-	0x70, 0xfc, 0x7e, 0xfc, 0xe8, 0x44, 0x49, 0x0b, 0x72, 0xfc, 0x6e, 0xde, 0x42, 0x79, 0xc6, 0xa1,
-	0x0d, 0xfa, 0x31, 0x00, 0x9d, 0x1a, 0x1f, 0xe4, 0xf7, 0x7d, 0x20, 0x65, 0xdb, 0x92, 0x51, 0x75,
-	0x50, 0x81, 0xa7, 0x8e, 0xb2, 0x1e, 0x07, 0xd6, 0xe9, 0x18, 0xc9, 0x6b, 0x88, 0xb0, 0x5c, 0x5b,
-	0xb6, 0x4a, 0xd5, 0x00, 0xc3, 0xe4, 0x89, 0xd8, 0xd5, 0xe0, 0x8d, 0x1d, 0xb9, 0x1a, 0x60, 0x12,
-	0x85, 0xb2, 0x67, 0x1a, 0xf8, 0xc9, 0xc9, 0xb2, 0x47, 0x9f, 0x93, 0x94, 0x3d, 0xd3, 0x88, 0xc8,
-	0x9e, 0x69, 0xe0, 0xa7, 0x26, 0xcc, 0x1e, 0x85, 0xc9, 0xd9, 0x0b, 0x94, 0x9f, 0x3f, 0x08, 0x9f,
-	0x8e, 0x5d, 0x7e, 0x30, 0x32, 0xe5, 0xf2, 0xf3, 0xc7, 0xa8, 0xb4, 0x9d, 0x60, 0x8c, 0x3e, 0x13,
-	0x7f, 0x3b, 0x79, 0x0e, 0x02, 0xdb, 0x09, 0x86, 0xb0, 0x58, 0x0d, 0x30, 0x84, 0x9f, 0x8d, 0x5d,
-	0x0d, 0xde, 0xb8, 0x96, 0xab, 0x01, 0x26, 0xf8, 0x1e, 0x2a, 0x32, 0x88, 0x30, 0xc1, 0x9f, 0x03,
-	0xd2, 0x99, 0xf1, 0x49, 0x6c, 0x6a, 0x03, 0x2d, 0xdf, 0x0e, 0x98, 0xd5, 0x03, 0xb4, 0x18, 0x20,
-	0xd2, 0xa9, 0xf7, 0x3c, 0x40, 0xcf, 0xc6, 0x84, 0xfa, 0x36, 0xe0, 0x16, 0xdb, 0xe1, 0x4f, 0xd4,
-	0x1b, 0x68, 0x41, 0x68, 0x84, 0xc2, 0x5c, 0x7f, 0x01, 0xc8, 0x1b, 0x71, 0xda, 0x21, 0x9b, 0xe8,
-	0x00, 0x56, 0xdb, 0xa1, 0x0f, 0xd4, 0x9b, 0x08, 0x87, 0xb8, 0x34, 0xe8, 0x17, 0x01, 0xbd, 0x19,
-	0x1b, 0x2d, 0x85, 0xbd, 0xd0, 0x8e, 0xfa, 0x8c, 0x96, 0x92, 0x37, 0x73, 0x60, 0xfc, 0xbf, 0x14,
-	0xab, 0x94, 0xbc, 0x21, 0xcc, 0xe7, 0x3f, 0x29, 0x25, 0x66, 0xa2, 0xfb, 0xa2, 0x2b, 0x50, 0x5e,
-	0x8e, 0xb5, 0x2f, 0x60, 0x06, 0x73, 0x0c, 0xd9, 0x17, 0xdc, 0x46, 0x39, 0x7d, 0x81, 0xf3, 0x4a,
-	0x2c, 0xce, 0x56, 0x04, 0x87, 0xdb, 0x84, 0xa4, 0x99, 0x06, 0x60, 0x5e, 0x8d, 0x9b, 0x34, 0xd3,
-	0x08, 0x25, 0x0d, 0x4c, 0x62, 0xd2, 0x28, 0xe5, 0xb5, 0xd8, 0x49, 0x13, 0x31, 0x34, 0x69, 0x32,
-	0xa7, 0x2f, 0x70, 0x5e, 0x8f, 0x9d, 0xb4, 0x20, 0x87, 0xdb, 0xe8, 0x74, 0xf1, 0x27, 0x1a, 0x80,
-	0x6e, 0xc5, 0x9a, 0x2e, 0xfe, 0x08, 0xe6, 0x24, 0xf2, 0x34, 0x04, 0x23, 0x4b, 0x9d, 0xd7, 0x2d,
-	0x81, 0xf4, 0x46, 0xbc, 0xd4, 0x79, 0x1e, 0x02, 0xa9, 0x63, 0x36, 0x55, 0x43, 0xc8, 0xed, 0xd8,
-	0x6e, 0x03, 0x10, 0xbf, 0x4f, 0x69, 0x8a, 0x7e, 0xa8, 0x9a, 0xb0, 0xe6, 0x3c, 0xa3, 0xa7, 0x58,
-	0x46, 0xf3, 0xa0, 0x80, 0x93, 0xe2, 0x1f, 0x88, 0x64, 0xba, 0x9a, 0xb0, 0x60, 0x1d, 0x9c, 0x5c,
-	0x8f, 0xa2, 0x34, 0x68, 0xfc, 0x63, 0xeb, 0x1f, 0x89, 0xa8, 0x50, 0x4d, 0x58, 0xb0, 0xd4, 0x3f,
-	0x77, 0x32, 0x95, 0x7f, 0xe8, 0xfc, 0x13, 0x51, 0x65, 0x98, 0xca, 0x3f, 0x35, 0x8a, 0x3c, 0xd3,
-	0xc0, 0x7f, 0x26, 0xa2, 0x94, 0xc8, 0x33, 0x0d, 0x99, 0x67, 0x1a, 0xf8, 0x2f, 0x44, 0xa4, 0x4a,
-	0x3c, 0x51, 0xe5, 0x9f, 0xd7, 0xfe, 0x4a, 0x54, 0x53, 0x12, 0xcf, 0x34, 0xd4, 0x63, 0x28, 0x03,
-	0x2a, 0x7a, 0x02, 0xfa, 0x1b, 0x91, 0xcd, 0x56, 0x13, 0x16, 0xac, 0xa6, 0xa7, 0x25, 0x1d, 0x65,
-	0x7d, 0x26, 0x15, 0xfe, 0x9d, 0x08, 0x73, 0xd5, 0x84, 0x05, 0x0e, 0xd8, 0x49, 0x87, 0x45, 0x00,
-	0xc7, 0x9c, 0x7f, 0x10, 0x59, 0x92, 0x45, 0x00, 0x07, 0x15, 0x99, 0x6a, 0x1a, 0xf8, 0x9f, 0x44,
-	0x35, 0x23, 0x53, 0xbd, 0x0b, 0xb0, 0x44, 0x35, 0x0d, 0xfc, 0x2f, 0x22, 0xcc, 0x07, 0xa8, 0x62,
-	0xb4, 0xfe, 0xf1, 0xe0, 0xdf, 0x44, 0xa7, 0xb0, 0x68, 0xfd, 0xf9, 0xce, 0x33, 0x07, 0xc3, 0xfd,
-	0x3f, 0x44, 0x35, 0xc7, 0x33, 0x07, 0xd3, 0x99, 0x45, 0x00, 0xa3, 0xf9, 0xbf, 0x44, 0x94, 0x66,
-	0x11, 0xc0, 0x70, 0xad, 0xa1, 0x3c, 0x68, 0x84, 0xc9, 0xfa, 0xbf, 0x54, 0xfc, 0x17, 0x67, 0xd5,
-	0x84, 0x05, 0xa1, 0xf2, 0x69, 0x7a, 0x0d, 0x15, 0x45, 0x04, 0x9d, 0x2a, 0xff, 0x4f, 0x4d, 0xf4,
-	0xd6, 0xac, 0x9a, 0xb0, 0x0a, 0x1c, 0x44, 0xa7, 0xc8, 0x36, 0x52, 0x69, 0x49, 0x09, 0xb3, 0xf3,
-	0xae, 0x54, 0x9c, 0x57, 0x66, 0xd5, 0x84, 0x95, 0xf7, 0x0b, 0x91, 0xcf, 0xc9, 0xab, 0x68, 0x41,
-	0x06, 0xd0, 0x70, 0xee, 0x4e, 0xc5, 0x7c, 0x5f, 0x56, 0x4d, 0x58, 0x45, 0x11, 0x43, 0x43, 0x61,
-	0xb5, 0x05, 0xcf, 0xb8, 0x8c, 0xef, 0xa1, 0x0f, 0x39, 0x2d, 0x3c, 0xe4, 0x72, 0x50, 0x57, 0xc1,
-	0xf7, 0x46, 0xe9, 0x2a, 0x41, 0xdd, 0x2a, 0xbe, 0x2f, 0x4a, 0xb7, 0xba, 0x74, 0x0d, 0xa5, 0xa5,
-	0x94, 0x7e, 0x83, 0xff, 0x57, 0xb0, 0x74, 0x0a, 0xe5, 0x83, 0x37, 0x76, 0x35, 0x8f, 0x52, 0xd7,
-	0xed, 0x03, 0x0f, 0x78, 0xc8, 0x22, 0x3f, 0xaa, 0x87, 0xd1, 0xf4, 0x8d, 0x9a, 0xd3, 0xb7, 0x71,
-	0xd2, 0xb3, 0xc1, 0x2f, 0x27, 0x93, 0x6b, 0xca, 0xd2, 0x69, 0x54, 0x08, 0x5d, 0xc7, 0x87, 0x39,
-	0x98, 0x16, 0x1d, 0x9c, 0x41, 0x6a, 0xf8, 0xa6, 0x3d, 0xcc, 0x43, 0x21, 0xda, 0xc3, 0xd6, 0xe8,
-	0x1e, 0x32, 0x03, 0x83, 0xf0, 0xaf, 0x0e, 0xc3, 0x1c, 0xa4, 0x06, 0x07, 0x31, 0xa2, 0x07, 0x75,
-	0x70, 0x10, 0x23, 0x7a, 0x98, 0x12, 0x3d, 0xac, 0xa3, 0x62, 0xc4, 0x65, 0x75, 0x98, 0x8b, 0x59,
-	0xd1, 0xc5, 0x06, 0x3a, 0x1c, 0x75, 0x07, 0x1d, 0xe6, 0x23, 0x17, 0x9d, 0x4b, 0x7e, 0xb9, 0x1c,
-	0xe6, 0x20, 0x79, 0x87, 0x38, 0x46, 0x4c, 0xc5, 0xcc, 0x9d, 0xe2, 0x18, 0xd1, 0x47, 0x3e, 0xfa,
-	0x81, 0x08, 0xb7, 0xbc, 0x61, 0x1e, 0x94, 0x01, 0x45, 0xc1, 0xef, 0x6f, 0xc3, 0x3c, 0xcc, 0x45,
-	0xe7, 0x92, 0x5f, 0xcd, 0x86, 0x39, 0x48, 0x8b, 0x0e, 0x0e, 0xd0, 0x42, 0xe4, 0x8d, 0x2b, 0xc2,
-	0xc9, 0xcf, 0x44, 0x27, 0x71, 0x5f, 0xcb, 0x0a, 0xe8, 0x9b, 0x08, 0x0f, 0xba, 0x77, 0x45, 0xd0,
-	0x2f, 0x89, 0xf4, 0x09, 0x5e, 0xd5, 0x0a, 0x5f, 0xa0, 0x8f, 0xbe, 0x35, 0xe0, 0xfa, 0x15, 0xc1,
-	0x3f, 0x27, 0x47, 0x3f, 0xee, 0xbb, 0x5b, 0x01, 0xfb, 0x3b, 0xb4, 0x34, 0xf8, 0xea, 0x15, 0x41,
-	0xfe, 0xa9, 0x1c, 0x79, 0x8c, 0xb7, 0xb9, 0xa1, 0x82, 0x91, 0x2f, 0x60, 0x22, 0x73, 0x7a, 0x58,
-	0x3b, 0x87, 0x9a, 0x0d, 0xdc, 0xad, 0x44, 0x0f, 0x85, 0xd1, 0x3c, 0x6c, 0x0d, 0xf6, 0x90, 0x19,
-	0x6d, 0xa4, 0xc8, 0x17, 0x22, 0xd1, 0x41, 0x6a, 0xf4, 0x20, 0x06, 0x78, 0x50, 0x47, 0x0f, 0x62,
-	0x80, 0x87, 0xa9, 0x61, 0x1e, 0xa0, 0x8b, 0x05, 0xaf, 0x27, 0xa2, 0x8b, 0xd9, 0x11, 0xc3, 0x90,
-	0xef, 0x1d, 0xa2, 0x87, 0xb9, 0x21, 0x1e, 0x96, 0x4b, 0x68, 0x8e, 0x1f, 0x02, 0xe7, 0xd0, 0xf4,
-	0xfa, 0xc5, 0xcb, 0xd5, 0xf5, 0x7c, 0x82, 0xfc, 0xb8, 0x61, 0xad, 0xff, 0xf2, 0x17, 0x79, 0x45,
-	0x9d, 0x47, 0xb3, 0x67, 0xab, 0xeb, 0xd6, 0xc5, 0x0b, 0x9b, 0xf9, 0xe4, 0x46, 0x86, 0x1e, 0x57,
-	0xfb, 0x9d, 0x96, 0xdb, 0x39, 0x5e, 0x46, 0xf3, 0xe2, 0xc1, 0x2b, 0xca, 0x01, 0x52, 0xd3, 0xdc,
-	0xc1, 0x6d, 0x65, 0xe3, 0xf2, 0xaf, 0x7e, 0x1e, 0xaa, 0xdf, 0x15, 0xaf, 0x7e, 0xeb, 0xfd, 0xc6,
-	0x4a, 0xab, 0xd3, 0xb3, 0xf7, 0x3b, 0x35, 0xc7, 0xfb, 0xeb, 0x09, 0xcf, 0xda, 0x5d, 0x71, 0xec,
-	0x66, 0x6d, 0xe7, 0x60, 0x65, 0xd0, 0x1f, 0x5a, 0xd4, 0x67, 0xe0, 0x93, 0xaf, 0x03, 0x00, 0x00,
-	0xff, 0xff, 0xe8, 0x29, 0x22, 0xf1, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20180814_aa810b61/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/test.pb.go
deleted file mode 100644
index 250836c4f04..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/test.pb.go
+++ /dev/null
@@ -1,1262 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: proto3_20190205_c823c79e/test.proto
-
-package proto3_20190205_c823c79e
-
-import (
-	fmt "fmt"
-	math "math"
-
-	proto "google.golang.org/protobuf/internal/protolegacy"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-type SiblingEnum int32
-
-const (
-	SiblingEnum_ALPHA   SiblingEnum = 0
-	SiblingEnum_BRAVO   SiblingEnum = 10
-	SiblingEnum_CHARLIE SiblingEnum = 200
-)
-
-var SiblingEnum_name = map[int32]string{
-	0:   "ALPHA",
-	10:  "BRAVO",
-	200: "CHARLIE",
-}
-
-var SiblingEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   10,
-	"CHARLIE": 200,
-}
-
-func (x SiblingEnum) String() string {
-	return proto.EnumName(SiblingEnum_name, int32(x))
-}
-
-func (SiblingEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_95cd555ff3d1bc43, []int{0}
-}
-
-type Message_ChildEnum int32
-
-const (
-	Message_ALPHA   Message_ChildEnum = 0
-	Message_BRAVO   Message_ChildEnum = 1
-	Message_CHARLIE Message_ChildEnum = 2
-)
-
-var Message_ChildEnum_name = map[int32]string{
-	0: "ALPHA",
-	1: "BRAVO",
-	2: "CHARLIE",
-}
-
-var Message_ChildEnum_value = map[string]int32{
-	"ALPHA":   0,
-	"BRAVO":   1,
-	"CHARLIE": 2,
-}
-
-func (x Message_ChildEnum) String() string {
-	return proto.EnumName(Message_ChildEnum_name, int32(x))
-}
-
-func (Message_ChildEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_95cd555ff3d1bc43, []int{1, 0}
-}
-
-type SiblingMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2,proto3" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SiblingMessage) Reset()         { *m = SiblingMessage{} }
-func (m *SiblingMessage) String() string { return proto.CompactTextString(m) }
-func (*SiblingMessage) ProtoMessage()    {}
-func (*SiblingMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_95cd555ff3d1bc43, []int{0}
-}
-
-func (m *SiblingMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SiblingMessage.Unmarshal(m, b)
-}
-func (m *SiblingMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SiblingMessage.Marshal(b, m, deterministic)
-}
-func (m *SiblingMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SiblingMessage.Merge(m, src)
-}
-func (m *SiblingMessage) XXX_Size() int {
-	return xxx_messageInfo_SiblingMessage.Size(m)
-}
-func (m *SiblingMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_SiblingMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SiblingMessage proto.InternalMessageInfo
-
-func (m *SiblingMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *SiblingMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *SiblingMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-type Message struct {
-	// Optional fields.
-	OptionalBool           bool                  `protobuf:"varint,100,opt,name=optional_bool,json=optionalBool,proto3" json:"optional_bool,omitempty"`
-	OptionalInt32          int32                 `protobuf:"varint,101,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
-	OptionalSint32         int32                 `protobuf:"zigzag32,102,opt,name=optional_sint32,json=optionalSint32,proto3" json:"optional_sint32,omitempty"`
-	OptionalUint32         uint32                `protobuf:"varint,103,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
-	OptionalInt64          int64                 `protobuf:"varint,104,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
-	OptionalSint64         int64                 `protobuf:"zigzag64,105,opt,name=optional_sint64,json=optionalSint64,proto3" json:"optional_sint64,omitempty"`
-	OptionalUint64         uint64                `protobuf:"varint,106,opt,name=optional_uint64,json=optionalUint64,proto3" json:"optional_uint64,omitempty"`
-	OptionalFixed32        uint32                `protobuf:"fixed32,107,opt,name=optional_fixed32,json=optionalFixed32,proto3" json:"optional_fixed32,omitempty"`
-	OptionalSfixed32       int32                 `protobuf:"fixed32,108,opt,name=optional_sfixed32,json=optionalSfixed32,proto3" json:"optional_sfixed32,omitempty"`
-	OptionalFloat          float32               `protobuf:"fixed32,109,opt,name=optional_float,json=optionalFloat,proto3" json:"optional_float,omitempty"`
-	OptionalFixed64        uint64                `protobuf:"fixed64,110,opt,name=optional_fixed64,json=optionalFixed64,proto3" json:"optional_fixed64,omitempty"`
-	OptionalSfixed64       int64                 `protobuf:"fixed64,111,opt,name=optional_sfixed64,json=optionalSfixed64,proto3" json:"optional_sfixed64,omitempty"`
-	OptionalDouble         float64               `protobuf:"fixed64,112,opt,name=optional_double,json=optionalDouble,proto3" json:"optional_double,omitempty"`
-	OptionalString         string                `protobuf:"bytes,113,opt,name=optional_string,json=optionalString,proto3" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                `protobuf:"bytes,114,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalChildEnum      Message_ChildEnum     `protobuf:"varint,115,opt,name=optional_child_enum,json=optionalChildEnum,proto3,enum=google.golang.org.proto3_20190205.Message_ChildEnum" json:"optional_child_enum,omitempty"`
-	OptionalChildMessage   *Message_ChildMessage `protobuf:"bytes,116,opt,name=optional_child_message,json=optionalChildMessage,proto3" json:"optional_child_message,omitempty"`
-	OptionalSiblingEnum    SiblingEnum           `protobuf:"varint,117,opt,name=optional_sibling_enum,json=optionalSiblingEnum,proto3,enum=google.golang.org.proto3_20190205.SiblingEnum" json:"optional_sibling_enum,omitempty"`
-	OptionalSiblingMessage *SiblingMessage       `protobuf:"bytes,118,opt,name=optional_sibling_message,json=optionalSiblingMessage,proto3" json:"optional_sibling_message,omitempty"`
-	// Repeated fields.
-	RepeatedBool           []bool                  `protobuf:"varint,200,rep,packed,name=repeated_bool,json=repeatedBool,proto3" json:"repeated_bool,omitempty"`
-	RepeatedInt32          []int32                 `protobuf:"varint,201,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
-	RepeatedSint32         []int32                 `protobuf:"zigzag32,202,rep,packed,name=repeated_sint32,json=repeatedSint32,proto3" json:"repeated_sint32,omitempty"`
-	RepeatedUint32         []uint32                `protobuf:"varint,203,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
-	RepeatedInt64          []int64                 `protobuf:"varint,204,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
-	RepeatedSint64         []int64                 `protobuf:"zigzag64,205,rep,packed,name=repeated_sint64,json=repeatedSint64,proto3" json:"repeated_sint64,omitempty"`
-	RepeatedUint64         []uint64                `protobuf:"varint,206,rep,packed,name=repeated_uint64,json=repeatedUint64,proto3" json:"repeated_uint64,omitempty"`
-	RepeatedFixed32        []uint32                `protobuf:"fixed32,207,rep,packed,name=repeated_fixed32,json=repeatedFixed32,proto3" json:"repeated_fixed32,omitempty"`
-	RepeatedSfixed32       []int32                 `protobuf:"fixed32,208,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32,proto3" json:"repeated_sfixed32,omitempty"`
-	RepeatedFloat          []float32               `protobuf:"fixed32,209,rep,packed,name=repeated_float,json=repeatedFloat,proto3" json:"repeated_float,omitempty"`
-	RepeatedFixed64        []uint64                `protobuf:"fixed64,210,rep,packed,name=repeated_fixed64,json=repeatedFixed64,proto3" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed64       []int64                 `protobuf:"fixed64,211,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64,proto3" json:"repeated_sfixed64,omitempty"`
-	RepeatedDouble         []float64               `protobuf:"fixed64,212,rep,packed,name=repeated_double,json=repeatedDouble,proto3" json:"repeated_double,omitempty"`
-	RepeatedString         []string                `protobuf:"bytes,213,rep,name=repeated_string,json=repeatedString,proto3" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                `protobuf:"bytes,214,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedChildEnum      []Message_ChildEnum     `protobuf:"varint,215,rep,packed,name=repeated_child_enum,json=repeatedChildEnum,proto3,enum=google.golang.org.proto3_20190205.Message_ChildEnum" json:"repeated_child_enum,omitempty"`
-	RepeatedChildMessage   []*Message_ChildMessage `protobuf:"bytes,216,rep,name=repeated_child_message,json=repeatedChildMessage,proto3" json:"repeated_child_message,omitempty"`
-	RepeatedSiblingEnum    []SiblingEnum           `protobuf:"varint,217,rep,packed,name=repeated_sibling_enum,json=repeatedSiblingEnum,proto3,enum=google.golang.org.proto3_20190205.SiblingEnum" json:"repeated_sibling_enum,omitempty"`
-	RepeatedSiblingMessage []*SiblingMessage       `protobuf:"bytes,218,rep,name=repeated_sibling_message,json=repeatedSiblingMessage,proto3" json:"repeated_sibling_message,omitempty"`
-	// Map fields.
-	MapBoolBool           map[bool]bool                  `protobuf:"bytes,300,rep,name=map_bool_bool,json=mapBoolBool,proto3" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolInt32          map[bool]int32                 `protobuf:"bytes,301,rep,name=map_bool_int32,json=mapBoolInt32,proto3" json:"map_bool_int32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolSint32         map[bool]int32                 `protobuf:"bytes,302,rep,name=map_bool_sint32,json=mapBoolSint32,proto3" json:"map_bool_sint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"`
-	MapBoolUint32         map[bool]uint32                `protobuf:"bytes,303,rep,name=map_bool_uint32,json=mapBoolUint32,proto3" json:"map_bool_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolInt64          map[bool]int64                 `protobuf:"bytes,304,rep,name=map_bool_int64,json=mapBoolInt64,proto3" json:"map_bool_int64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolSint64         map[bool]int64                 `protobuf:"bytes,305,rep,name=map_bool_sint64,json=mapBoolSint64,proto3" json:"map_bool_sint64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"zigzag64,2,opt,name=value,proto3"`
-	MapBoolUint64         map[bool]uint64                `protobuf:"bytes,306,rep,name=map_bool_uint64,json=mapBoolUint64,proto3" json:"map_bool_uint64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapBoolFixed32        map[bool]uint32                `protobuf:"bytes,307,rep,name=map_bool_fixed32,json=mapBoolFixed32,proto3" json:"map_bool_fixed32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolSfixed32       map[bool]int32                 `protobuf:"bytes,308,rep,name=map_bool_sfixed32,json=mapBoolSfixed32,proto3" json:"map_bool_sfixed32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolFloat          map[bool]float32               `protobuf:"bytes,309,rep,name=map_bool_float,json=mapBoolFloat,proto3" json:"map_bool_float,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapBoolFixed64        map[bool]uint64                `protobuf:"bytes,310,rep,name=map_bool_fixed64,json=mapBoolFixed64,proto3" json:"map_bool_fixed64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolSfixed64       map[bool]int64                 `protobuf:"bytes,311,rep,name=map_bool_sfixed64,json=mapBoolSfixed64,proto3" json:"map_bool_sfixed64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolDouble         map[bool]float64               `protobuf:"bytes,312,rep,name=map_bool_double,json=mapBoolDouble,proto3" json:"map_bool_double,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolString         map[bool]string                `protobuf:"bytes,313,rep,name=map_bool_string,json=mapBoolString,proto3" json:"map_bool_string,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolBytes          map[bool][]byte                `protobuf:"bytes,314,rep,name=map_bool_bytes,json=mapBoolBytes,proto3" json:"map_bool_bytes,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolChildEnum      map[bool]Message_ChildEnum     `protobuf:"bytes,315,rep,name=map_bool_child_enum,json=mapBoolChildEnum,proto3" json:"map_bool_child_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.golang.org.proto3_20190205.Message_ChildEnum"`
-	MapBoolChildMessage   map[bool]*Message_ChildMessage `protobuf:"bytes,316,rep,name=map_bool_child_message,json=mapBoolChildMessage,proto3" json:"map_bool_child_message,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapBoolSiblingEnum    map[bool]SiblingEnum           `protobuf:"bytes,317,rep,name=map_bool_sibling_enum,json=mapBoolSiblingEnum,proto3" json:"map_bool_sibling_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=google.golang.org.proto3_20190205.SiblingEnum"`
-	MapBoolSiblingMessage map[bool]*SiblingMessage       `protobuf:"bytes,318,rep,name=map_bool_sibling_message,json=mapBoolSiblingMessage,proto3" json:"map_bool_sibling_message,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapInt32Bool          map[int32]bool                 `protobuf:"bytes,319,rep,name=map_int32_bool,json=mapInt32Bool,proto3" json:"map_int32_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapSint32Bool         map[int32]bool                 `protobuf:"bytes,320,rep,name=map_sint32_bool,json=mapSint32Bool,proto3" json:"map_sint32_bool,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint32Bool         map[uint32]bool                `protobuf:"bytes,321,rep,name=map_uint32_bool,json=mapUint32Bool,proto3" json:"map_uint32_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapInt64Bool          map[int64]bool                 `protobuf:"bytes,322,rep,name=map_int64_bool,json=mapInt64Bool,proto3" json:"map_int64_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapSint64Bool         map[int64]bool                 `protobuf:"bytes,323,rep,name=map_sint64_bool,json=mapSint64Bool,proto3" json:"map_sint64_bool,omitempty" protobuf_key:"zigzag64,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint64Bool         map[uint64]bool                `protobuf:"bytes,324,rep,name=map_uint64_bool,json=mapUint64Bool,proto3" json:"map_uint64_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapFixed32Bool        map[uint32]bool                `protobuf:"bytes,325,rep,name=map_fixed32_bool,json=mapFixed32Bool,proto3" json:"map_fixed32_bool,omitempty" protobuf_key:"fixed32,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapStringBool         map[string]bool                `protobuf:"bytes,326,rep,name=map_string_bool,json=mapStringBool,proto3" json:"map_string_bool,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	// Oneof fields.
-	//
-	// Types that are valid to be assigned to OneofUnion:
-	//	*Message_OneofBool
-	//	*Message_OneofInt32
-	//	*Message_OneofSint32
-	//	*Message_OneofUint32
-	//	*Message_OneofInt64
-	//	*Message_OneofSint64
-	//	*Message_OneofUint64
-	//	*Message_OneofFixed32
-	//	*Message_OneofSfixed32
-	//	*Message_OneofFloat
-	//	*Message_OneofFixed64
-	//	*Message_OneofSfixed64
-	//	*Message_OneofDouble
-	//	*Message_OneofString
-	//	*Message_OneofBytes
-	//	*Message_OneofChildEnum
-	//	*Message_OneofChildMessage
-	//	*Message_OneofSiblingEnum
-	//	*Message_OneofSiblingMessage
-	//	*Message_OneofString1
-	//	*Message_OneofString2
-	//	*Message_OneofString3
-	OneofUnion           isMessage_OneofUnion `protobuf_oneof:"oneof_union"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_95cd555ff3d1bc43, []int{1}
-}
-
-func (m *Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message.Unmarshal(m, b)
-}
-func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message.Marshal(b, m, deterministic)
-}
-func (m *Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message.Merge(m, src)
-}
-func (m *Message) XXX_Size() int {
-	return xxx_messageInfo_Message.Size(m)
-}
-func (m *Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message proto.InternalMessageInfo
-
-func (m *Message) GetOptionalBool() bool {
-	if m != nil {
-		return m.OptionalBool
-	}
-	return false
-}
-
-func (m *Message) GetOptionalInt32() int32 {
-	if m != nil {
-		return m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint32() int32 {
-	if m != nil {
-		return m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint32() uint32 {
-	if m != nil {
-		return m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalInt64() int64 {
-	if m != nil {
-		return m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSint64() int64 {
-	if m != nil {
-		return m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalUint64() uint64 {
-	if m != nil {
-		return m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed32() uint32 {
-	if m != nil {
-		return m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed32() int32 {
-	if m != nil {
-		return m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFloat() float32 {
-	if m != nil {
-		return m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalFixed64() uint64 {
-	if m != nil {
-		return m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalSfixed64() int64 {
-	if m != nil {
-		return m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalDouble() float64 {
-	if m != nil {
-		return m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOptionalString() string {
-	if m != nil {
-		return m.OptionalString
-	}
-	return ""
-}
-
-func (m *Message) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalChildEnum() Message_ChildEnum {
-	if m != nil {
-		return m.OptionalChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOptionalChildMessage() *Message_ChildMessage {
-	if m != nil {
-		return m.OptionalChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOptionalSiblingEnum() SiblingEnum {
-	if m != nil {
-		return m.OptionalSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOptionalSiblingMessage() *SiblingMessage {
-	if m != nil {
-		return m.OptionalSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildEnum() []Message_ChildEnum {
-	if m != nil {
-		return m.RepeatedChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedChildMessage() []*Message_ChildMessage {
-	if m != nil {
-		return m.RepeatedChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingEnum() []SiblingEnum {
-	if m != nil {
-		return m.RepeatedSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetRepeatedSiblingMessage() []*SiblingMessage {
-	if m != nil {
-		return m.RepeatedSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolInt32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolUint32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolInt64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolInt64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSint64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolUint64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolUint64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed32() map[bool]uint32 {
-	if m != nil {
-		return m.MapBoolFixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed32() map[bool]int32 {
-	if m != nil {
-		return m.MapBoolSfixed32
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFloat() map[bool]float32 {
-	if m != nil {
-		return m.MapBoolFloat
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolFixed64() map[bool]uint64 {
-	if m != nil {
-		return m.MapBoolFixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSfixed64() map[bool]int64 {
-	if m != nil {
-		return m.MapBoolSfixed64
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolDouble() map[bool]float64 {
-	if m != nil {
-		return m.MapBoolDouble
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolString() map[bool]string {
-	if m != nil {
-		return m.MapBoolString
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolBytes() map[bool][]byte {
-	if m != nil {
-		return m.MapBoolBytes
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildEnum() map[bool]Message_ChildEnum {
-	if m != nil {
-		return m.MapBoolChildEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolChildMessage() map[bool]*Message_ChildMessage {
-	if m != nil {
-		return m.MapBoolChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingEnum() map[bool]SiblingEnum {
-	if m != nil {
-		return m.MapBoolSiblingEnum
-	}
-	return nil
-}
-
-func (m *Message) GetMapBoolSiblingMessage() map[bool]*SiblingMessage {
-	if m != nil {
-		return m.MapBoolSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapInt32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint32Bool() map[int32]bool {
-	if m != nil {
-		return m.MapSint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapUint32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapInt64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapInt64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapSint64Bool() map[int64]bool {
-	if m != nil {
-		return m.MapSint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapUint64Bool() map[uint64]bool {
-	if m != nil {
-		return m.MapUint64Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapFixed32Bool() map[uint32]bool {
-	if m != nil {
-		return m.MapFixed32Bool
-	}
-	return nil
-}
-
-func (m *Message) GetMapStringBool() map[string]bool {
-	if m != nil {
-		return m.MapStringBool
-	}
-	return nil
-}
-
-type isMessage_OneofUnion interface {
-	isMessage_OneofUnion()
-}
-
-type Message_OneofBool struct {
-	OneofBool bool `protobuf:"varint,400,opt,name=oneof_bool,json=oneofBool,proto3,oneof"`
-}
-
-type Message_OneofInt32 struct {
-	OneofInt32 int32 `protobuf:"varint,401,opt,name=oneof_int32,json=oneofInt32,proto3,oneof"`
-}
-
-type Message_OneofSint32 struct {
-	OneofSint32 int32 `protobuf:"zigzag32,402,opt,name=oneof_sint32,json=oneofSint32,proto3,oneof"`
-}
-
-type Message_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,403,opt,name=oneof_uint32,json=oneofUint32,proto3,oneof"`
-}
-
-type Message_OneofInt64 struct {
-	OneofInt64 int64 `protobuf:"varint,404,opt,name=oneof_int64,json=oneofInt64,proto3,oneof"`
-}
-
-type Message_OneofSint64 struct {
-	OneofSint64 int64 `protobuf:"zigzag64,405,opt,name=oneof_sint64,json=oneofSint64,proto3,oneof"`
-}
-
-type Message_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,406,opt,name=oneof_uint64,json=oneofUint64,proto3,oneof"`
-}
-
-type Message_OneofFixed32 struct {
-	OneofFixed32 uint32 `protobuf:"fixed32,407,opt,name=oneof_fixed32,json=oneofFixed32,proto3,oneof"`
-}
-
-type Message_OneofSfixed32 struct {
-	OneofSfixed32 int32 `protobuf:"fixed32,408,opt,name=oneof_sfixed32,json=oneofSfixed32,proto3,oneof"`
-}
-
-type Message_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,409,opt,name=oneof_float,json=oneofFloat,proto3,oneof"`
-}
-
-type Message_OneofFixed64 struct {
-	OneofFixed64 uint64 `protobuf:"fixed64,410,opt,name=oneof_fixed64,json=oneofFixed64,proto3,oneof"`
-}
-
-type Message_OneofSfixed64 struct {
-	OneofSfixed64 int64 `protobuf:"fixed64,411,opt,name=oneof_sfixed64,json=oneofSfixed64,proto3,oneof"`
-}
-
-type Message_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,412,opt,name=oneof_double,json=oneofDouble,proto3,oneof"`
-}
-
-type Message_OneofString struct {
-	OneofString string `protobuf:"bytes,413,opt,name=oneof_string,json=oneofString,proto3,oneof"`
-}
-
-type Message_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,414,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-
-type Message_OneofChildEnum struct {
-	OneofChildEnum Message_ChildEnum `protobuf:"varint,415,opt,name=oneof_child_enum,json=oneofChildEnum,proto3,enum=google.golang.org.proto3_20190205.Message_ChildEnum,oneof"`
-}
-
-type Message_OneofChildMessage struct {
-	OneofChildMessage *Message_ChildMessage `protobuf:"bytes,416,opt,name=oneof_child_message,json=oneofChildMessage,proto3,oneof"`
-}
-
-type Message_OneofSiblingEnum struct {
-	OneofSiblingEnum SiblingEnum `protobuf:"varint,417,opt,name=oneof_sibling_enum,json=oneofSiblingEnum,proto3,enum=google.golang.org.proto3_20190205.SiblingEnum,oneof"`
-}
-
-type Message_OneofSiblingMessage struct {
-	OneofSiblingMessage *SiblingMessage `protobuf:"bytes,418,opt,name=oneof_sibling_message,json=oneofSiblingMessage,proto3,oneof"`
-}
-
-type Message_OneofString1 struct {
-	OneofString1 string `protobuf:"bytes,419,opt,name=oneof_string1,json=oneofString1,proto3,oneof"`
-}
-
-type Message_OneofString2 struct {
-	OneofString2 string `protobuf:"bytes,420,opt,name=oneof_string2,json=oneofString2,proto3,oneof"`
-}
-
-type Message_OneofString3 struct {
-	OneofString3 string `protobuf:"bytes,421,opt,name=oneof_string3,json=oneofString3,proto3,oneof"`
-}
-
-func (*Message_OneofBool) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint32) isMessage_OneofUnion() {}
-
-func (*Message_OneofInt64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofUint64) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed32) isMessage_OneofUnion() {}
-
-func (*Message_OneofFloat) isMessage_OneofUnion() {}
-
-func (*Message_OneofFixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofSfixed64) isMessage_OneofUnion() {}
-
-func (*Message_OneofDouble) isMessage_OneofUnion() {}
-
-func (*Message_OneofString) isMessage_OneofUnion() {}
-
-func (*Message_OneofBytes) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofChildMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingEnum) isMessage_OneofUnion() {}
-
-func (*Message_OneofSiblingMessage) isMessage_OneofUnion() {}
-
-func (*Message_OneofString1) isMessage_OneofUnion() {}
-
-func (*Message_OneofString2) isMessage_OneofUnion() {}
-
-func (*Message_OneofString3) isMessage_OneofUnion() {}
-
-func (m *Message) GetOneofUnion() isMessage_OneofUnion {
-	if m != nil {
-		return m.OneofUnion
-	}
-	return nil
-}
-
-func (m *Message) GetOneofBool() bool {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *Message) GetOneofInt32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt32); ok {
-		return x.OneofInt32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint32); ok {
-		return x.OneofSint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofInt64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofInt64); ok {
-		return x.OneofInt64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSint64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSint64); ok {
-		return x.OneofSint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed32() uint32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed32); ok {
-		return x.OneofFixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed32() int32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed32); ok {
-		return x.OneofSfixed32
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *Message) GetOneofFixed64() uint64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofFixed64); ok {
-		return x.OneofFixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofSfixed64() int64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSfixed64); ok {
-		return x.OneofSfixed64
-	}
-	return 0
-}
-
-func (m *Message) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofUnion().(*Message_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *Message) GetOneofString() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *Message) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofUnion().(*Message_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *Message) GetOneofChildEnum() Message_ChildEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildEnum); ok {
-		return x.OneofChildEnum
-	}
-	return Message_ALPHA
-}
-
-func (m *Message) GetOneofChildMessage() *Message_ChildMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofChildMessage); ok {
-		return x.OneofChildMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofSiblingEnum() SiblingEnum {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingEnum); ok {
-		return x.OneofSiblingEnum
-	}
-	return SiblingEnum_ALPHA
-}
-
-func (m *Message) GetOneofSiblingMessage() *SiblingMessage {
-	if x, ok := m.GetOneofUnion().(*Message_OneofSiblingMessage); ok {
-		return x.OneofSiblingMessage
-	}
-	return nil
-}
-
-func (m *Message) GetOneofString1() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString1); ok {
-		return x.OneofString1
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString2() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString2); ok {
-		return x.OneofString2
-	}
-	return ""
-}
-
-func (m *Message) GetOneofString3() string {
-	if x, ok := m.GetOneofUnion().(*Message_OneofString3); ok {
-		return x.OneofString3
-	}
-	return ""
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Message) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*Message_OneofBool)(nil),
-		(*Message_OneofInt32)(nil),
-		(*Message_OneofSint32)(nil),
-		(*Message_OneofUint32)(nil),
-		(*Message_OneofInt64)(nil),
-		(*Message_OneofSint64)(nil),
-		(*Message_OneofUint64)(nil),
-		(*Message_OneofFixed32)(nil),
-		(*Message_OneofSfixed32)(nil),
-		(*Message_OneofFloat)(nil),
-		(*Message_OneofFixed64)(nil),
-		(*Message_OneofSfixed64)(nil),
-		(*Message_OneofDouble)(nil),
-		(*Message_OneofString)(nil),
-		(*Message_OneofBytes)(nil),
-		(*Message_OneofChildEnum)(nil),
-		(*Message_OneofChildMessage)(nil),
-		(*Message_OneofSiblingEnum)(nil),
-		(*Message_OneofSiblingMessage)(nil),
-		(*Message_OneofString1)(nil),
-		(*Message_OneofString2)(nil),
-		(*Message_OneofString3)(nil),
-	}
-}
-
-type Message_ChildMessage struct {
-	F1                   string   `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2                   []string `protobuf:"bytes,2,rep,name=f2,proto3" json:"f2,omitempty"`
-	F3                   *Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Message_ChildMessage) Reset()         { *m = Message_ChildMessage{} }
-func (m *Message_ChildMessage) String() string { return proto.CompactTextString(m) }
-func (*Message_ChildMessage) ProtoMessage()    {}
-func (*Message_ChildMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_95cd555ff3d1bc43, []int{1, 0}
-}
-
-func (m *Message_ChildMessage) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Message_ChildMessage.Unmarshal(m, b)
-}
-func (m *Message_ChildMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Message_ChildMessage.Marshal(b, m, deterministic)
-}
-func (m *Message_ChildMessage) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Message_ChildMessage.Merge(m, src)
-}
-func (m *Message_ChildMessage) XXX_Size() int {
-	return xxx_messageInfo_Message_ChildMessage.Size(m)
-}
-func (m *Message_ChildMessage) XXX_DiscardUnknown() {
-	xxx_messageInfo_Message_ChildMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Message_ChildMessage proto.InternalMessageInfo
-
-func (m *Message_ChildMessage) GetF1() string {
-	if m != nil {
-		return m.F1
-	}
-	return ""
-}
-
-func (m *Message_ChildMessage) GetF2() []string {
-	if m != nil {
-		return m.F2
-	}
-	return nil
-}
-
-func (m *Message_ChildMessage) GetF3() *Message {
-	if m != nil {
-		return m.F3
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("google.golang.org.proto3_20190205.SiblingEnum", SiblingEnum_name, SiblingEnum_value)
-	proto.RegisterEnum("google.golang.org.proto3_20190205.Message_ChildEnum", Message_ChildEnum_name, Message_ChildEnum_value)
-	proto.RegisterType((*SiblingMessage)(nil), "google.golang.org.proto3_20190205.SiblingMessage")
-	proto.RegisterType((*Message)(nil), "google.golang.org.proto3_20190205.Message")
-	proto.RegisterMapType((map[bool]bool)(nil), "google.golang.org.proto3_20190205.Message.MapBoolBoolEntry")
-	proto.RegisterMapType((map[bool][]byte)(nil), "google.golang.org.proto3_20190205.Message.MapBoolBytesEntry")
-	proto.RegisterMapType((map[bool]Message_ChildEnum)(nil), "google.golang.org.proto3_20190205.Message.MapBoolChildEnumEntry")
-	proto.RegisterMapType((map[bool]*Message_ChildMessage)(nil), "google.golang.org.proto3_20190205.Message.MapBoolChildMessageEntry")
-	proto.RegisterMapType((map[bool]float64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolDoubleEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolFixed32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolFixed64Entry")
-	proto.RegisterMapType((map[bool]float32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolFloatEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolInt32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolInt64Entry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSfixed32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSfixed64Entry")
-	proto.RegisterMapType((map[bool]SiblingEnum)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSiblingEnumEntry")
-	proto.RegisterMapType((map[bool]*SiblingMessage)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSiblingMessageEntry")
-	proto.RegisterMapType((map[bool]int32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSint32Entry")
-	proto.RegisterMapType((map[bool]int64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolSint64Entry")
-	proto.RegisterMapType((map[bool]string)(nil), "google.golang.org.proto3_20190205.Message.MapBoolStringEntry")
-	proto.RegisterMapType((map[bool]uint32)(nil), "google.golang.org.proto3_20190205.Message.MapBoolUint32Entry")
-	proto.RegisterMapType((map[bool]uint64)(nil), "google.golang.org.proto3_20190205.Message.MapBoolUint64Entry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20190205.Message.MapFixed32BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20190205.Message.MapInt32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20190205.Message.MapInt64BoolEntry")
-	proto.RegisterMapType((map[int32]bool)(nil), "google.golang.org.proto3_20190205.Message.MapSint32BoolEntry")
-	proto.RegisterMapType((map[int64]bool)(nil), "google.golang.org.proto3_20190205.Message.MapSint64BoolEntry")
-	proto.RegisterMapType((map[string]bool)(nil), "google.golang.org.proto3_20190205.Message.MapStringBoolEntry")
-	proto.RegisterMapType((map[uint32]bool)(nil), "google.golang.org.proto3_20190205.Message.MapUint32BoolEntry")
-	proto.RegisterMapType((map[uint64]bool)(nil), "google.golang.org.proto3_20190205.Message.MapUint64BoolEntry")
-	proto.RegisterType((*Message_ChildMessage)(nil), "google.golang.org.proto3_20190205.Message.ChildMessage")
-}
-
-func init() {
-	proto.RegisterFile("proto3_20190205_c823c79e/test.proto", fileDescriptor_95cd555ff3d1bc43)
-}
-
-var fileDescriptor_95cd555ff3d1bc43 = []byte{
-	// 1947 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x9a, 0x59, 0x73, 0xdb, 0xc8,
-	0x11, 0xc7, 0x09, 0x52, 0x87, 0x35, 0xe2, 0x09, 0x5a, 0xca, 0x94, 0x9e, 0x10, 0xd9, 0x71, 0x10,
-	0x27, 0x45, 0x59, 0x24, 0x02, 0x1f, 0x49, 0x6c, 0x4b, 0xb6, 0x1c, 0x3a, 0x65, 0x27, 0x2e, 0xb8,
-	0x94, 0x87, 0xbc, 0x28, 0x94, 0x04, 0xd2, 0xb4, 0x41, 0x42, 0x11, 0x49, 0x57, 0x54, 0x79, 0xf0,
-	0x57, 0xc8, 0x7d, 0xef, 0xbd, 0xfb, 0xb6, 0xf7, 0x7d, 0xdf, 0xde, 0xf2, 0xde, 0xf7, 0xf9, 0x69,
-	0xb6, 0x06, 0x8d, 0xb9, 0x00, 0xd0, 0x24, 0xc1, 0xda, 0x07, 0x57, 0x49, 0xcd, 0xff, 0xf4, 0x8f,
-	0xdd, 0xe8, 0xe9, 0x9e, 0x81, 0x85, 0x0e, 0xec, 0xec, 0xba, 0x5d, 0xb7, 0xb2, 0x51, 0x3e, 0xb2,
-	0x7c, 0xfc, 0x48, 0xf9, 0xc8, 0x4f, 0x37, 0xb6, 0x8e, 0x95, 0x2b, 0x5b, 0x47, 0x8f, 0xdb, 0x4b,
-	0x5d, 0xbb, 0xd3, 0x2d, 0x79, 0x9f, 0xaa, 0xdf, 0x6f, 0xb8, 0x6e, 0xc3, 0xb1, 0x4b, 0x0d, 0xd7,
-	0xa9, 0xb5, 0x1b, 0x25, 0x77, 0xb7, 0x51, 0x0a, 0x2c, 0x5b, 0x74, 0x50, 0xf6, 0x72, 0x73, 0xd3,
-	0x69, 0xb6, 0x1b, 0x17, 0xed, 0x4e, 0xa7, 0xd6, 0xb0, 0xd5, 0x2c, 0x4a, 0xd6, 0x97, 0xb1, 0xa2,
-	0x29, 0xfa, 0x8c, 0x95, 0xac, 0x2f, 0x7b, 0xbf, 0x97, 0x71, 0x52, 0x4b, 0x79, 0xbf, 0x97, 0xd5,
-	0x13, 0x28, 0x59, 0xaf, 0xe0, 0x94, 0xa6, 0xe8, 0xb3, 0xe5, 0xc3, 0xa5, 0x81, 0x84, 0x92, 0xef,
-	0xd7, 0x4a, 0xd6, 0x2b, 0x8b, 0x37, 0x4f, 0xa3, 0x69, 0xca, 0x39, 0x80, 0x32, 0xee, 0x4e, 0xb7,
-	0xe9, 0xb6, 0x6b, 0xce, 0xc6, 0xa6, 0xeb, 0x3a, 0x78, 0x5b, 0x53, 0xf4, 0x7d, 0x56, 0x9a, 0x1a,
-	0x57, 0x5d, 0xd7, 0x51, 0x7f, 0x80, 0xb2, 0x4c, 0xd4, 0x6c, 0x77, 0x2b, 0x65, 0x6c, 0x6b, 0x8a,
-	0x3e, 0x69, 0xb1, 0xa5, 0xe7, 0x89, 0x51, 0xfd, 0x21, 0xca, 0x31, 0x59, 0x07, 0x74, 0x75, 0x4d,
-	0xd1, 0x0b, 0x16, 0x5b, 0x7d, 0xb9, 0x19, 0x12, 0xf6, 0x40, 0xd8, 0xd0, 0x14, 0x3d, 0xc3, 0x85,
-	0xeb, 0x20, 0x0c, 0x80, 0x4d, 0x03, 0x5f, 0xd1, 0x14, 0x3d, 0x25, 0x81, 0x4d, 0x23, 0x04, 0x36,
-	0x0d, 0xdc, 0xd4, 0x14, 0x5d, 0x95, 0xc1, 0x01, 0x61, 0x0f, 0x84, 0x57, 0x35, 0x45, 0x9f, 0x90,
-	0xc1, 0xa6, 0xa1, 0xfe, 0x08, 0xe5, 0x99, 0xb0, 0xde, 0xfc, 0xa3, 0xbd, 0x5d, 0x29, 0xe3, 0x6b,
-	0x9a, 0xa2, 0x4f, 0x5b, 0xcc, 0xc1, 0x39, 0x30, 0xab, 0x3f, 0x46, 0x05, 0x0e, 0xa7, 0x5a, 0x47,
-	0x53, 0xf4, 0x9c, 0xc5, 0x7c, 0x5c, 0xf6, 0xed, 0x52, 0x40, 0x75, 0xc7, 0xad, 0x75, 0x71, 0x4b,
-	0x53, 0xf4, 0x24, 0x0f, 0xe8, 0x1c, 0x31, 0x86, 0xf1, 0xa6, 0x81, 0xdb, 0x9a, 0xa2, 0x4f, 0x05,
-	0xf0, 0xa6, 0x11, 0x81, 0x37, 0x0d, 0xec, 0x6a, 0x8a, 0x9e, 0x0f, 0xe2, 0x03, 0xf1, 0x6f, 0xbb,
-	0xbd, 0x4d, 0xc7, 0xc6, 0x3b, 0x9a, 0xa2, 0x2b, 0x3c, 0xfe, 0xb3, 0x9e, 0x55, 0xce, 0x68, 0x77,
-	0xb7, 0xd9, 0x6e, 0xe0, 0x3f, 0x78, 0xb5, 0xc8, 0x33, 0xea, 0x59, 0xa5, 0x80, 0x36, 0xf7, 0xba,
-	0x76, 0x07, 0xef, 0x6a, 0x8a, 0x9e, 0xe6, 0x01, 0xad, 0x12, 0xa3, 0xba, 0x8d, 0x8a, 0x4c, 0xb6,
-	0x75, 0xa5, 0xe9, 0x6c, 0x6f, 0xd8, 0xed, 0x5e, 0x0b, 0x77, 0x34, 0x45, 0xcf, 0x96, 0x8d, 0xe1,
-	0xeb, 0xb7, 0x74, 0x86, 0x2c, 0x5e, 0x6b, 0xf7, 0x5a, 0x16, 0x0b, 0x9b, 0x99, 0xd4, 0x16, 0x9a,
-	0x0f, 0x50, 0x5a, 0xb0, 0x0c, 0x77, 0xbd, 0x8d, 0x72, 0x74, 0x54, 0x10, 0xdd, 0x35, 0xfb, 0x25,
-	0x16, 0xdd, 0x3b, 0x9b, 0x68, 0x4e, 0x28, 0x3b, 0x6f, 0xfb, 0x42, 0x58, 0x3d, 0x2f, 0xac, 0xd2,
-	0x10, 0x34, 0x7f, 0xd7, 0x7b, 0x01, 0x15, 0x79, 0xb1, 0x32, 0xa3, 0x7a, 0x0d, 0xe1, 0x10, 0x83,
-	0x06, 0x75, 0xdd, 0x0b, 0x6a, 0x79, 0x78, 0x0c, 0x0d, 0x67, 0x3e, 0x40, 0xa2, 0x01, 0x1d, 0x44,
-	0x99, 0x5d, 0x7b, 0xc7, 0xae, 0x75, 0xed, 0x6d, 0x68, 0x06, 0xb7, 0x14, 0x2d, 0x45, 0xba, 0x01,
-	0xb5, 0x7a, 0xdd, 0xe0, 0x10, 0xca, 0x32, 0x15, 0x6c, 0xde, 0xb7, 0x89, 0x6c, 0xd2, 0x62, 0x8b,
-	0xa1, 0x1d, 0xe8, 0x28, 0xc7, 0x74, 0x7e, 0x3b, 0x78, 0x87, 0x08, 0x0b, 0x16, 0x5b, 0xef, 0xf7,
-	0x03, 0x51, 0xe9, 0xf7, 0x83, 0x77, 0x89, 0x32, 0xc3, 0x95, 0x7e, 0x43, 0x08, 0xb0, 0x4d, 0x03,
-	0xbf, 0x47, 0x84, 0x29, 0x89, 0x6d, 0x1a, 0x21, 0xb6, 0x69, 0xe0, 0xf7, 0x89, 0x50, 0x95, 0xd9,
-	0x01, 0xa5, 0xdf, 0x12, 0x3e, 0x20, 0xca, 0x09, 0x99, 0x6d, 0x1a, 0xea, 0x61, 0x94, 0x67, 0x4a,
-	0xba, 0xcf, 0x3f, 0x24, 0xd2, 0x69, 0x8b, 0xb9, 0xa0, 0x4d, 0xe1, 0x27, 0xa8, 0xc0, 0xf9, 0x54,
-	0xfc, 0x11, 0x11, 0xe7, 0x2c, 0xe6, 0x85, 0x75, 0x05, 0x31, 0x2a, 0xe8, 0x0a, 0x1f, 0x13, 0x69,
-	0x92, 0x47, 0x05, 0x6d, 0x21, 0xf4, 0x0d, 0x4c, 0x03, 0x7f, 0x42, 0x94, 0x53, 0x81, 0x6f, 0x60,
-	0x1a, 0x11, 0xdf, 0xc0, 0x34, 0xf0, 0xa7, 0x44, 0x9c, 0x0f, 0x7e, 0x83, 0x40, 0x16, 0xfc, 0xc6,
-	0xf0, 0x19, 0xd1, 0x2a, 0x3c, 0x0b, 0x7e, 0x67, 0x90, 0x32, 0x0b, 0x9d, 0xe1, 0x73, 0xc5, 0x1b,
-	0x4b, 0x3c, 0xb3, 0xd0, 0x1a, 0xc4, 0xa8, 0xa0, 0x35, 0x7c, 0x41, 0x84, 0x69, 0x1e, 0x15, 0xf4,
-	0x06, 0x1b, 0x15, 0x99, 0x4e, 0xe8, 0x0d, 0x5f, 0x12, 0x71, 0xec, 0xe6, 0x40, 0x3d, 0xf2, 0xe6,
-	0xd0, 0x46, 0xf3, 0x01, 0x0c, 0xdd, 0x47, 0x5f, 0x11, 0xd2, 0x38, 0xdd, 0x41, 0x82, 0xd1, 0xcd,
-	0xb4, 0x85, 0xe6, 0x84, 0x12, 0x14, 0xba, 0xc3, 0xd7, 0x10, 0xd8, 0xc8, 0xed, 0x81, 0x17, 0x2e,
-	0x6f, 0x0f, 0x0e, 0xc2, 0x21, 0x08, 0x0d, 0xeb, 0x1b, 0x08, 0x2b, 0x4e, 0x7f, 0x08, 0xa0, 0x68,
-	0x48, 0xbf, 0x47, 0x99, 0x56, 0x6d, 0xc7, 0x6b, 0x0d, 0xd0, 0x1f, 0x1e, 0x4c, 0x7a, 0x88, 0x9f,
-	0x8d, 0x90, 0xb9, 0x8b, 0xb5, 0x1d, 0xd2, 0x45, 0xc8, 0xbf, 0xb5, 0x76, 0x77, 0x77, 0xcf, 0x9a,
-	0x6d, 0x71, 0x8b, 0xba, 0x85, 0xb2, 0x8c, 0x00, 0x8d, 0xe0, 0x21, 0x40, 0xfc, 0x7c, 0x74, 0x84,
-	0xd7, 0x85, 0x80, 0x91, 0x6e, 0x09, 0x26, 0xb5, 0x8e, 0x72, 0x0c, 0xe2, 0x37, 0xa6, 0x87, 0x81,
-	0xf2, 0x8b, 0xd1, 0x29, 0xd0, 0xc2, 0x00, 0x93, 0x69, 0x89, 0x36, 0x89, 0xe3, 0xb7, 0xb5, 0x47,
-	0x62, 0x73, 0xd6, 0x23, 0x38, 0x7e, 0x53, 0x0c, 0x24, 0xcd, 0x34, 0xf0, 0xa3, 0xe3, 0x24, 0xcd,
-	0x34, 0x42, 0x49, 0x33, 0x8d, 0x50, 0xd2, 0x4c, 0x03, 0x3f, 0x36, 0x56, 0xd2, 0x28, 0x46, 0x4c,
-	0x5a, 0x80, 0xe3, 0xf7, 0xe3, 0xc7, 0xc7, 0x4a, 0x5a, 0x90, 0xe3, 0x77, 0xf3, 0x26, 0xca, 0x33,
-	0x0e, 0x6d, 0xd0, 0x4f, 0x00, 0xe8, 0xe4, 0xe8, 0x20, 0xbf, 0xef, 0x03, 0x29, 0xdb, 0x92, 0x8c,
-	0xaa, 0x83, 0x0a, 0x3c, 0x75, 0x94, 0xf5, 0x24, 0xb0, 0x4e, 0xc5, 0x48, 0x5e, 0x5d, 0x84, 0xe5,
-	0x5a, 0xb2, 0x55, 0xaa, 0x06, 0x18, 0x26, 0x4f, 0xc5, 0xae, 0x06, 0x6f, 0xec, 0xc8, 0xd5, 0x00,
-	0x93, 0x28, 0x94, 0x3d, 0xd3, 0xc0, 0x4f, 0x8f, 0x97, 0x3d, 0xfa, 0x9c, 0xa4, 0xec, 0x99, 0x46,
-	0x44, 0xf6, 0x4c, 0x03, 0x3f, 0x33, 0x66, 0xf6, 0x28, 0x4c, 0xce, 0x5e, 0xa0, 0xfc, 0xfc, 0x41,
-	0xf8, 0x6c, 0xec, 0xf2, 0x83, 0x91, 0x29, 0x97, 0x9f, 0x3f, 0x46, 0xa5, 0xed, 0x04, 0x63, 0xf4,
-	0xb9, 0xf8, 0xdb, 0xc9, 0x73, 0x10, 0xd8, 0x4e, 0x30, 0x84, 0xc5, 0x6a, 0x80, 0x21, 0xfc, 0x7c,
-	0xec, 0x6a, 0xf0, 0xc6, 0xb5, 0x5c, 0x0d, 0x30, 0xc1, 0x77, 0x50, 0x91, 0x41, 0x84, 0x09, 0xfe,
-	0x02, 0x90, 0x4e, 0x8f, 0x4e, 0x62, 0x53, 0x1b, 0x68, 0xf9, 0x56, 0xc0, 0xac, 0xee, 0xa1, 0xf9,
-	0x00, 0x91, 0x4e, 0xbd, 0x17, 0x01, 0x7a, 0x26, 0x26, 0xd4, 0xb7, 0x01, 0xb7, 0xd8, 0x0a, 0x7f,
-	0xa2, 0x5e, 0x47, 0x73, 0x42, 0x23, 0x14, 0xe6, 0xfa, 0x4b, 0x40, 0x5e, 0x8d, 0xd3, 0x0e, 0xd9,
-	0x44, 0x07, 0xb0, 0xda, 0x0a, 0x7d, 0xa0, 0xde, 0x40, 0x38, 0xc4, 0xa5, 0x41, 0xbf, 0x0c, 0xe8,
-	0xb5, 0xd8, 0x68, 0x29, 0xec, 0xb9, 0x56, 0xd4, 0x67, 0xb4, 0x94, 0xbc, 0x99, 0x03, 0xe3, 0xff,
-	0x95, 0x58, 0xa5, 0xe4, 0x0d, 0x61, 0x3e, 0xff, 0x49, 0x29, 0x31, 0x13, 0xdd, 0x17, 0x1d, 0x81,
-	0xf2, 0x6a, 0xac, 0x7d, 0x01, 0x33, 0x98, 0x63, 0xc8, 0xbe, 0xe0, 0x36, 0xca, 0xe9, 0x09, 0x9c,
-	0xd7, 0x62, 0x71, 0xd6, 0x23, 0x38, 0xdc, 0x26, 0x24, 0xcd, 0x34, 0x00, 0xf3, 0x7a, 0xdc, 0xa4,
-	0x99, 0x46, 0x28, 0x69, 0x60, 0x12, 0x93, 0x46, 0x29, 0x6f, 0xc4, 0x4e, 0x9a, 0x88, 0xa1, 0x49,
-	0x93, 0x39, 0x3d, 0x81, 0xf3, 0x66, 0xec, 0xa4, 0x05, 0x39, 0xdc, 0x46, 0xa7, 0x8b, 0x3f, 0xd1,
-	0x00, 0x74, 0x33, 0xd6, 0x74, 0xf1, 0x47, 0x30, 0x27, 0x91, 0xa7, 0x21, 0x18, 0x59, 0xea, 0xbc,
-	0x6e, 0x09, 0xa4, 0xb7, 0xe2, 0xa5, 0xce, 0xf3, 0x10, 0x48, 0x1d, 0xb3, 0xa9, 0x1a, 0x42, 0x6e,
-	0xdb, 0x76, 0xeb, 0x80, 0xf8, 0x73, 0x4a, 0x53, 0xf4, 0x7d, 0xd5, 0x84, 0x35, 0xe3, 0x19, 0x3d,
-	0xc5, 0x22, 0x9a, 0x05, 0x05, 0x9c, 0x14, 0xff, 0x42, 0x24, 0x93, 0xd5, 0x84, 0x05, 0xeb, 0xe0,
-	0xe4, 0x7a, 0x10, 0xa5, 0x41, 0xe3, 0x1f, 0x5b, 0xff, 0x4a, 0x44, 0x85, 0x6a, 0xc2, 0x82, 0xa5,
-	0xfe, 0xb9, 0x93, 0xa9, 0xfc, 0x43, 0xe7, 0xdf, 0x88, 0x2a, 0xc3, 0x54, 0xfe, 0xa9, 0x51, 0xe4,
-	0x99, 0x06, 0xfe, 0x3b, 0x11, 0xa5, 0x44, 0x9e, 0x69, 0xc8, 0x3c, 0xd3, 0xc0, 0xff, 0x20, 0x22,
-	0x55, 0xe2, 0x89, 0x2a, 0xff, 0xbc, 0xf6, 0x4f, 0xa2, 0x9a, 0x90, 0x78, 0xa6, 0xa1, 0x1e, 0x42,
-	0x19, 0x50, 0xd1, 0x13, 0xd0, 0xbf, 0x88, 0x6c, 0xba, 0x9a, 0xb0, 0x60, 0x35, 0x3d, 0x2d, 0xe9,
-	0x28, 0xeb, 0x33, 0xa9, 0xf0, 0xdf, 0x44, 0x98, 0xab, 0x26, 0x2c, 0x70, 0xc0, 0x4e, 0x3a, 0x2c,
-	0x02, 0x38, 0xe6, 0xfc, 0x87, 0xc8, 0x92, 0x2c, 0x02, 0x38, 0xa8, 0xc8, 0x54, 0xd3, 0xc0, 0xff,
-	0x25, 0xaa, 0x29, 0x99, 0xea, 0x5d, 0x80, 0x25, 0xaa, 0x69, 0xe0, 0xff, 0x11, 0x61, 0x3e, 0x40,
-	0x15, 0xa3, 0xf5, 0x8f, 0x07, 0xff, 0x27, 0x3a, 0x85, 0x45, 0xeb, 0xcf, 0x77, 0x9e, 0x39, 0x18,
-	0xee, 0x77, 0x10, 0xd5, 0x0c, 0xcf, 0x1c, 0x4c, 0x67, 0x16, 0x01, 0x8c, 0xe6, 0x3b, 0x89, 0x28,
-	0xcd, 0x22, 0x80, 0xe1, 0x5a, 0x43, 0x79, 0xd0, 0x08, 0x93, 0xf5, 0xae, 0x54, 0xfc, 0x17, 0x67,
-	0xd5, 0x84, 0x05, 0xa1, 0xf2, 0x69, 0x7a, 0x15, 0x15, 0x45, 0x04, 0x9d, 0x2a, 0x77, 0xa7, 0xc6,
-	0x7a, 0x6b, 0x56, 0x4d, 0x58, 0x05, 0x0e, 0xa2, 0x53, 0x64, 0x03, 0xa9, 0xb4, 0xa4, 0x84, 0xd9,
-	0x79, 0x4f, 0x2a, 0xce, 0x2b, 0xb3, 0x6a, 0xc2, 0xca, 0xfb, 0x85, 0xc8, 0xe7, 0xe4, 0x15, 0x34,
-	0x27, 0x03, 0x68, 0x38, 0xf7, 0xa6, 0x62, 0xbe, 0x2f, 0xab, 0x26, 0xac, 0xa2, 0x88, 0xa1, 0xa1,
-	0xb0, 0xda, 0x82, 0x67, 0xbc, 0x8c, 0xef, 0xa3, 0x0f, 0x39, 0x2d, 0x3c, 0xe4, 0xe5, 0xa0, 0xae,
-	0x8c, 0xef, 0x8f, 0xd2, 0x95, 0x83, 0xba, 0x0a, 0x7e, 0x20, 0x4a, 0x57, 0x59, 0xb8, 0x8a, 0xd2,
-	0x52, 0x4a, 0xbf, 0xc3, 0xff, 0x2b, 0x58, 0x38, 0x89, 0xf2, 0xc1, 0x1b, 0xbb, 0x9a, 0x47, 0xa9,
-	0x6b, 0xf6, 0x9e, 0x07, 0xdc, 0x67, 0x91, 0x1f, 0xd5, 0xfd, 0x68, 0xf2, 0x7a, 0xcd, 0xe9, 0xd9,
-	0x38, 0xe9, 0xd9, 0xe0, 0x97, 0x13, 0xc9, 0x63, 0xca, 0xc2, 0x29, 0x54, 0x08, 0x5d, 0xc7, 0x07,
-	0x39, 0x98, 0x14, 0x1d, 0x9c, 0x46, 0x6a, 0xf8, 0xa6, 0x3d, 0xc8, 0x43, 0x21, 0xda, 0xc3, 0xfa,
-	0xf0, 0x1e, 0x32, 0x7d, 0x83, 0xf0, 0xaf, 0x0e, 0x83, 0x1c, 0xa4, 0xfa, 0x07, 0x31, 0xa4, 0x07,
-	0xb5, 0x7f, 0x10, 0x43, 0x7a, 0x98, 0x10, 0x3d, 0xac, 0xa0, 0x62, 0xc4, 0x65, 0x75, 0x90, 0x8b,
-	0x69, 0xd1, 0xc5, 0x2a, 0xda, 0x1f, 0x75, 0x07, 0x1d, 0xe4, 0x23, 0x17, 0x9d, 0x4b, 0x7e, 0xb9,
-	0x1c, 0xe4, 0x20, 0x79, 0x9b, 0x38, 0x86, 0x4c, 0xc5, 0xd4, 0xed, 0xe2, 0x18, 0xd2, 0x47, 0x3e,
-	0xfa, 0x81, 0x08, 0xb7, 0xbc, 0x41, 0x1e, 0x94, 0x3e, 0x45, 0xc1, 0xef, 0x6f, 0x83, 0x3c, 0xcc,
-	0x44, 0xe7, 0x92, 0x5f, 0xcd, 0x06, 0x39, 0x48, 0x8b, 0x0e, 0xf6, 0xd0, 0x5c, 0xe4, 0x8d, 0x2b,
-	0xc2, 0xc9, 0xaf, 0x44, 0x27, 0x71, 0x5f, 0xcb, 0x0a, 0xe8, 0x1b, 0x08, 0xf7, 0xbb, 0x77, 0x45,
-	0xd0, 0x2f, 0x8a, 0xf4, 0x31, 0x5e, 0xd5, 0x0a, 0x5f, 0xa0, 0x87, 0xbe, 0xd7, 0xe7, 0xfa, 0x15,
-	0xc1, 0x3f, 0x2b, 0x47, 0x3f, 0xea, 0xbb, 0x5b, 0x01, 0xfb, 0x27, 0xb4, 0xd0, 0xff, 0xea, 0x15,
-	0x41, 0xfe, 0xa5, 0x1c, 0x79, 0x8c, 0xb7, 0xb9, 0xa1, 0x82, 0x91, 0x2f, 0x60, 0x22, 0x73, 0x72,
-	0x50, 0x3b, 0x87, 0x9a, 0x0d, 0xdc, 0xad, 0x44, 0x0f, 0x85, 0xe1, 0x3c, 0xac, 0xf7, 0xf7, 0x90,
-	0x19, 0x6e, 0xa4, 0xc8, 0x17, 0x22, 0xd1, 0x41, 0x6a, 0xf8, 0x20, 0xfa, 0x78, 0x50, 0x87, 0x0f,
-	0xa2, 0x8f, 0x87, 0x89, 0x41, 0x1e, 0xa0, 0x8b, 0x05, 0xaf, 0x27, 0xa2, 0x8b, 0xe9, 0x21, 0xc3,
-	0x90, 0xef, 0x1d, 0xa2, 0x87, 0x99, 0x01, 0x1e, 0x16, 0x4b, 0x68, 0x86, 0x1f, 0x02, 0x67, 0xd0,
-	0xe4, 0xca, 0x85, 0x4b, 0xd5, 0x95, 0x7c, 0x82, 0xfc, 0xb8, 0x6a, 0xad, 0xfc, 0xf6, 0x37, 0x79,
-	0x45, 0x9d, 0x45, 0xd3, 0x67, 0xaa, 0x2b, 0xd6, 0x85, 0xf3, 0x6b, 0xf9, 0xe4, 0x6a, 0x86, 0x1e,
-	0x57, 0x7b, 0xed, 0xa6, 0xdb, 0x3e, 0xbc, 0x8c, 0x66, 0xc5, 0x83, 0x57, 0x94, 0x03, 0xa4, 0xa6,
-	0xb9, 0x83, 0x5b, 0xca, 0xea, 0xa5, 0xdf, 0xfd, 0x3a, 0x54, 0xbf, 0x4b, 0x5e, 0xfd, 0x6e, 0xf6,
-	0xea, 0x4b, 0xcd, 0x76, 0xd7, 0xde, 0x6d, 0xd7, 0x1c, 0xef, 0xaf, 0x27, 0x3c, 0x6b, 0x67, 0xc9,
-	0xb1, 0x1b, 0xb5, 0xad, 0xbd, 0xa5, 0x7e, 0x7f, 0x68, 0xb1, 0x39, 0x05, 0x9f, 0x7c, 0x1b, 0x00,
-	0x00, 0xff, 0xff, 0x57, 0xd9, 0x0f, 0xc0, 0x8b, 0x21, 0x00, 0x00,
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/proto3_20190205_c823c79e/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/legacy/ya.make
deleted file mode 100644
index fde6c74551f..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/legacy/ya.make
+++ /dev/null
@@ -1,23 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(legacy.pb.go)
-
-END()
-
-RECURSE(
-    bug1052
-    proto2_20160225_2fc053c5
-    proto2_20160519_a4ab9ec5
-    proto2_20180125_92554152
-    proto2_20180430_b4deda09
-    proto2_20180814_aa810b61
-    proto2_20190205_c823c79e
-    proto3_20160225_2fc053c5
-    proto3_20160519_a4ab9ec5
-    proto3_20180125_92554152
-    proto3_20180430_b4deda09
-    proto3_20180814_aa810b61
-    proto3_20190205_c823c79e
-)
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/message_set.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/message_set.pb.go
deleted file mode 100644
index 2769be53b25..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/message_set.pb.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/messageset/messagesetpb/message_set.proto
-
-package messagesetpb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type MessageSet struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *MessageSet) Reset() {
-	*x = MessageSet{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MessageSet) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MessageSet) ProtoMessage() {}
-
-func (x *MessageSet) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MessageSet.ProtoReflect.Descriptor instead.
-func (*MessageSet) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescGZIP(), []int{0}
-}
-
-type MessageSetContainer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MessageSet *MessageSet `protobuf:"bytes,1,opt,name=message_set,json=messageSet" json:"message_set,omitempty"`
-}
-
-func (x *MessageSetContainer) Reset() {
-	*x = MessageSetContainer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MessageSetContainer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MessageSetContainer) ProtoMessage() {}
-
-func (x *MessageSetContainer) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MessageSetContainer.ProtoReflect.Descriptor instead.
-func (*MessageSetContainer) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *MessageSetContainer) GetMessageSet() *MessageSet {
-	if x != nil {
-		return x.MessageSet
-	}
-	return nil
-}
-
-var File_internal_testprotos_messageset_messagesetpb_message_set_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDesc = []byte{
-	0x0a, 0x3d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74,
-	0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x70, 0x62, 0x2f, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x18, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x22, 0x1a, 0x0a, 0x0a, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x2a, 0x08, 0x08, 0x04, 0x10, 0xff, 0xff, 0xff, 0xff,
-	0x07, 0x3a, 0x02, 0x08, 0x01, 0x22, 0x5c, 0x0a, 0x13, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x0b,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x52, 0x0a, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x53, 0x65, 0x74, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
-	0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74,
-	0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x70, 0x62,
-}
-
-var (
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescOnce sync.Once
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescData = file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDesc
-)
-
-func file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescData)
-	})
-	return file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDescData
-}
-
-var file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_internal_testprotos_messageset_messagesetpb_message_set_proto_goTypes = []interface{}{
-	(*MessageSet)(nil),          // 0: goproto.proto.messageset.MessageSet
-	(*MessageSetContainer)(nil), // 1: goproto.proto.messageset.MessageSetContainer
-}
-var file_internal_testprotos_messageset_messagesetpb_message_set_proto_depIdxs = []int32{
-	0, // 0: goproto.proto.messageset.MessageSetContainer.message_set:type_name -> goproto.proto.messageset.MessageSet
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_messageset_messagesetpb_message_set_proto_init() }
-func file_internal_testprotos_messageset_messagesetpb_message_set_proto_init() {
-	if File_internal_testprotos_messageset_messagesetpb_message_set_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageSet); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageSetContainer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_messageset_messagesetpb_message_set_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_messageset_messagesetpb_message_set_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_messageset_messagesetpb_message_set_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_messageset_messagesetpb_message_set_proto = out.File
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_rawDesc = nil
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_goTypes = nil
-	file_internal_testprotos_messageset_messagesetpb_message_set_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/ya.make
deleted file mode 100644
index f42f20ea11b..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(message_set.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/msetextpb.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
deleted file mode 100644
index c9d2025930f..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
+++ /dev/null
@@ -1,425 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/messageset/msetextpb/msetextpb.proto
-
-package msetextpb
-
-import (
-	messagesetpb "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Ext1 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ext1Field1 *int32 `protobuf:"varint,1,opt,name=ext1_field1,json=ext1Field1" json:"ext1_field1,omitempty"`
-	Ext1Field2 *int32 `protobuf:"varint,2,opt,name=ext1_field2,json=ext1Field2" json:"ext1_field2,omitempty"`
-}
-
-func (x *Ext1) Reset() {
-	*x = Ext1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Ext1) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Ext1) ProtoMessage() {}
-
-func (x *Ext1) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Ext1.ProtoReflect.Descriptor instead.
-func (*Ext1) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Ext1) GetExt1Field1() int32 {
-	if x != nil && x.Ext1Field1 != nil {
-		return *x.Ext1Field1
-	}
-	return 0
-}
-
-func (x *Ext1) GetExt1Field2() int32 {
-	if x != nil && x.Ext1Field2 != nil {
-		return *x.Ext1Field2
-	}
-	return 0
-}
-
-type Ext2 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ext2Field1 *int32 `protobuf:"varint,1,opt,name=ext2_field1,json=ext2Field1" json:"ext2_field1,omitempty"`
-}
-
-func (x *Ext2) Reset() {
-	*x = Ext2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Ext2) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Ext2) ProtoMessage() {}
-
-func (x *Ext2) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Ext2.ProtoReflect.Descriptor instead.
-func (*Ext2) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Ext2) GetExt2Field1() int32 {
-	if x != nil && x.Ext2Field1 != nil {
-		return *x.Ext2Field1
-	}
-	return 0
-}
-
-type ExtRequired struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RequiredField1 *int32 `protobuf:"varint,1,req,name=required_field1,json=requiredField1" json:"required_field1,omitempty"`
-}
-
-func (x *ExtRequired) Reset() {
-	*x = ExtRequired{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExtRequired) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExtRequired) ProtoMessage() {}
-
-func (x *ExtRequired) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExtRequired.ProtoReflect.Descriptor instead.
-func (*ExtRequired) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ExtRequired) GetRequiredField1() int32 {
-	if x != nil && x.RequiredField1 != nil {
-		return *x.RequiredField1
-	}
-	return 0
-}
-
-type ExtLargeNumber struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ExtLargeNumber) Reset() {
-	*x = ExtLargeNumber{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExtLargeNumber) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExtLargeNumber) ProtoMessage() {}
-
-func (x *ExtLargeNumber) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExtLargeNumber.ProtoReflect.Descriptor instead.
-func (*ExtLargeNumber) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{3}
-}
-
-var file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*messagesetpb.MessageSet)(nil),
-		ExtensionType: (*Ext1)(nil),
-		Field:         1000,
-		Name:          "goproto.proto.messageset.Ext1.message_set_extension",
-		Tag:           "bytes,1000,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/messageset/msetextpb/msetextpb.proto",
-	},
-	{
-		ExtendedType:  (*messagesetpb.MessageSet)(nil),
-		ExtensionType: (*Ext2)(nil),
-		Field:         1001,
-		Name:          "goproto.proto.messageset.Ext2.message_set_extension",
-		Tag:           "bytes,1001,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/messageset/msetextpb/msetextpb.proto",
-	},
-	{
-		ExtendedType:  (*messagesetpb.MessageSet)(nil),
-		ExtensionType: (*ExtRequired)(nil),
-		Field:         1002,
-		Name:          "goproto.proto.messageset.ExtRequired.message_set_extension",
-		Tag:           "bytes,1002,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/messageset/msetextpb/msetextpb.proto",
-	},
-	{
-		ExtendedType:  (*messagesetpb.MessageSet)(nil),
-		ExtensionType: (*ExtLargeNumber)(nil),
-		Field:         536870912,
-		Name:          "goproto.proto.messageset.ExtLargeNumber.message_set_extension",
-		Tag:           "bytes,536870912,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/messageset/msetextpb/msetextpb.proto",
-	},
-}
-
-// Extension fields to messagesetpb.MessageSet.
-var (
-	// optional goproto.proto.messageset.Ext1 message_set_extension = 1000;
-	E_Ext1_MessageSetExtension = &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes[0]
-	// optional goproto.proto.messageset.Ext2 message_set_extension = 1001;
-	E_Ext2_MessageSetExtension = &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes[1]
-	// optional goproto.proto.messageset.ExtRequired message_set_extension = 1002;
-	E_ExtRequired_MessageSetExtension = &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes[2]
-	// optional goproto.proto.messageset.ExtLargeNumber message_set_extension = 536870912;
-	E_ExtLargeNumber_MessageSetExtension = &file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes[3] // 1<<29
-)
-
-var File_internal_testprotos_messageset_msetextpb_msetextpb_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDesc = []byte{
-	0x0a, 0x38, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74,
-	0x2f, 0x6d, 0x73, 0x65, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62, 0x2f, 0x6d, 0x73, 0x65, 0x74, 0x65,
-	0x78, 0x74, 0x70, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x18, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x73, 0x65, 0x74, 0x1a, 0x3d, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74,
-	0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x73, 0x65, 0x74, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x70,
-	0x62, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x01, 0x0a, 0x04, 0x45, 0x78, 0x74, 0x31, 0x12, 0x1f, 0x0a, 0x0b,
-	0x65, 0x78, 0x74, 0x31, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x31, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x12, 0x1f, 0x0a,
-	0x0b, 0x65, 0x78, 0x74, 0x31, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x31, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x32, 0x79,
-	0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73,
-	0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0xe8, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x2e,
-	0x45, 0x78, 0x74, 0x31, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xa2, 0x01, 0x0a, 0x04, 0x45, 0x78,
-	0x74, 0x32, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x78, 0x74, 0x32, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x32, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x31, 0x32, 0x79, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73,
-	0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53,
-	0x65, 0x74, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x73, 0x65, 0x74, 0x2e, 0x45, 0x78, 0x74, 0x32, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xb9,
-	0x01, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x27,
-	0x0a, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x31, 0x18, 0x01, 0x20, 0x02, 0x28, 0x05, 0x52, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x32, 0x80, 0x01, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x12, 0x24, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x65, 0x74, 0x2e, 0x45, 0x78, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65,
-	0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x99, 0x01, 0x0a, 0x0e, 0x45,
-	0x78, 0x74, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x32, 0x86, 0x01,
-	0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73,
-	0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x80, 0x80,
-	0x80, 0x80, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73,
-	0x65, 0x74, 0x2e, 0x45, 0x78, 0x74, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x73, 0x65, 0x74, 0x2f, 0x6d, 0x73, 0x65, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62,
-}
-
-var (
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescOnce sync.Once
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescData = file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDesc
-)
-
-func file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescData)
-	})
-	return file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDescData
-}
-
-var file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_internal_testprotos_messageset_msetextpb_msetextpb_proto_goTypes = []interface{}{
-	(*Ext1)(nil),                    // 0: goproto.proto.messageset.Ext1
-	(*Ext2)(nil),                    // 1: goproto.proto.messageset.Ext2
-	(*ExtRequired)(nil),             // 2: goproto.proto.messageset.ExtRequired
-	(*ExtLargeNumber)(nil),          // 3: goproto.proto.messageset.ExtLargeNumber
-	(*messagesetpb.MessageSet)(nil), // 4: goproto.proto.messageset.MessageSet
-}
-var file_internal_testprotos_messageset_msetextpb_msetextpb_proto_depIdxs = []int32{
-	4, // 0: goproto.proto.messageset.Ext1.message_set_extension:extendee -> goproto.proto.messageset.MessageSet
-	4, // 1: goproto.proto.messageset.Ext2.message_set_extension:extendee -> goproto.proto.messageset.MessageSet
-	4, // 2: goproto.proto.messageset.ExtRequired.message_set_extension:extendee -> goproto.proto.messageset.MessageSet
-	4, // 3: goproto.proto.messageset.ExtLargeNumber.message_set_extension:extendee -> goproto.proto.messageset.MessageSet
-	0, // 4: goproto.proto.messageset.Ext1.message_set_extension:type_name -> goproto.proto.messageset.Ext1
-	1, // 5: goproto.proto.messageset.Ext2.message_set_extension:type_name -> goproto.proto.messageset.Ext2
-	2, // 6: goproto.proto.messageset.ExtRequired.message_set_extension:type_name -> goproto.proto.messageset.ExtRequired
-	3, // 7: goproto.proto.messageset.ExtLargeNumber.message_set_extension:type_name -> goproto.proto.messageset.ExtLargeNumber
-	8, // [8:8] is the sub-list for method output_type
-	8, // [8:8] is the sub-list for method input_type
-	4, // [4:8] is the sub-list for extension type_name
-	0, // [0:4] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_messageset_msetextpb_msetextpb_proto_init() }
-func file_internal_testprotos_messageset_msetextpb_msetextpb_proto_init() {
-	if File_internal_testprotos_messageset_msetextpb_msetextpb_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Ext1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Ext2); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExtRequired); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExtLargeNumber); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   4,
-			NumExtensions: 4,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_messageset_msetextpb_msetextpb_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_messageset_msetextpb_msetextpb_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_messageset_msetextpb_msetextpb_proto_msgTypes,
-		ExtensionInfos:    file_internal_testprotos_messageset_msetextpb_msetextpb_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_messageset_msetextpb_msetextpb_proto = out.File
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_rawDesc = nil
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_goTypes = nil
-	file_internal_testprotos_messageset_msetextpb_msetextpb_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/ya.make
deleted file mode 100644
index cc42f77f28b..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/messageset/msetextpb/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(msetextpb.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/news/news.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/news/news.pb.go
deleted file mode 100644
index bb728a69af0..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/news/news.pb.go
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/news/news.proto
-
-package news
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Article_Status int32
-
-const (
-	Article_DRAFT     Article_Status = 0
-	Article_PUBLISHED Article_Status = 1
-	Article_REVOKED   Article_Status = 2
-)
-
-// Enum value maps for Article_Status.
-var (
-	Article_Status_name = map[int32]string{
-		0: "DRAFT",
-		1: "PUBLISHED",
-		2: "REVOKED",
-	}
-	Article_Status_value = map[string]int32{
-		"DRAFT":     0,
-		"PUBLISHED": 1,
-		"REVOKED":   2,
-	}
-)
-
-func (x Article_Status) Enum() *Article_Status {
-	p := new(Article_Status)
-	*p = x
-	return p
-}
-
-func (x Article_Status) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Article_Status) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_news_news_proto_enumTypes[0].Descriptor()
-}
-
-func (Article_Status) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_news_news_proto_enumTypes[0]
-}
-
-func (x Article_Status) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Article_Status.Descriptor instead.
-func (Article_Status) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_news_news_proto_rawDescGZIP(), []int{0, 0}
-}
-
-type Article struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Author      string                 `protobuf:"bytes,1,opt,name=author,proto3" json:"author,omitempty"`
-	Date        *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=date,proto3" json:"date,omitempty"`
-	Title       string                 `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
-	Content     string                 `protobuf:"bytes,4,opt,name=content,proto3" json:"content,omitempty"`
-	Status      Article_Status         `protobuf:"varint,8,opt,name=status,proto3,enum=google.golang.org.Article_Status" json:"status,omitempty"`
-	Tags        []string               `protobuf:"bytes,7,rep,name=tags,proto3" json:"tags,omitempty"`
-	Attachments []*anypb.Any           `protobuf:"bytes,6,rep,name=attachments,proto3" json:"attachments,omitempty"`
-}
-
-func (x *Article) Reset() {
-	*x = Article{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_news_news_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Article) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Article) ProtoMessage() {}
-
-func (x *Article) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_news_news_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Article.ProtoReflect.Descriptor instead.
-func (*Article) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_news_news_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Article) GetAuthor() string {
-	if x != nil {
-		return x.Author
-	}
-	return ""
-}
-
-func (x *Article) GetDate() *timestamppb.Timestamp {
-	if x != nil {
-		return x.Date
-	}
-	return nil
-}
-
-func (x *Article) GetTitle() string {
-	if x != nil {
-		return x.Title
-	}
-	return ""
-}
-
-func (x *Article) GetContent() string {
-	if x != nil {
-		return x.Content
-	}
-	return ""
-}
-
-func (x *Article) GetStatus() Article_Status {
-	if x != nil {
-		return x.Status
-	}
-	return Article_DRAFT
-}
-
-func (x *Article) GetTags() []string {
-	if x != nil {
-		return x.Tags
-	}
-	return nil
-}
-
-func (x *Article) GetAttachments() []*anypb.Any {
-	if x != nil {
-		return x.Attachments
-	}
-	return nil
-}
-
-type BinaryAttachment struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
-}
-
-func (x *BinaryAttachment) Reset() {
-	*x = BinaryAttachment{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_news_news_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BinaryAttachment) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BinaryAttachment) ProtoMessage() {}
-
-func (x *BinaryAttachment) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_news_news_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BinaryAttachment.ProtoReflect.Descriptor instead.
-func (*BinaryAttachment) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_news_news_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *BinaryAttachment) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *BinaryAttachment) GetData() []byte {
-	if x != nil {
-		return x.Data
-	}
-	return nil
-}
-
-type KeyValueAttachment struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Data map[string]string `protobuf:"bytes,2,rep,name=data,proto3" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *KeyValueAttachment) Reset() {
-	*x = KeyValueAttachment{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_news_news_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *KeyValueAttachment) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*KeyValueAttachment) ProtoMessage() {}
-
-func (x *KeyValueAttachment) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_news_news_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use KeyValueAttachment.ProtoReflect.Descriptor instead.
-func (*KeyValueAttachment) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_news_news_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *KeyValueAttachment) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *KeyValueAttachment) GetData() map[string]string {
-	if x != nil {
-		return x.Data
-	}
-	return nil
-}
-
-var File_internal_testprotos_news_news_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_news_news_proto_rawDesc = []byte{
-	0x0a, 0x23, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6e, 0x65, 0x77, 0x73, 0x2f, 0x6e, 0x65, 0x77, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
-	0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb9, 0x02, 0x0a, 0x07, 0x41, 0x72, 0x74, 0x69, 0x63, 0x6c, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x12, 0x2e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x41, 0x72, 0x74,
-	0x69, 0x63, 0x6c, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63,
-	0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
-	0x6e, 0x79, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22,
-	0x2f, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x09, 0x0a, 0x05, 0x44, 0x52, 0x41,
-	0x46, 0x54, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x53, 0x48, 0x45,
-	0x44, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x56, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0x02,
-	0x22, 0x3a, 0x0a, 0x10, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68,
-	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xa6, 0x01, 0x0a,
-	0x12, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d,
-	0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x43, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67,
-	0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09,
-	0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73,
-	0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6e, 0x65, 0x77, 0x73, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_internal_testprotos_news_news_proto_rawDescOnce sync.Once
-	file_internal_testprotos_news_news_proto_rawDescData = file_internal_testprotos_news_news_proto_rawDesc
-)
-
-func file_internal_testprotos_news_news_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_news_news_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_news_news_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_news_news_proto_rawDescData)
-	})
-	return file_internal_testprotos_news_news_proto_rawDescData
-}
-
-var file_internal_testprotos_news_news_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_internal_testprotos_news_news_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_internal_testprotos_news_news_proto_goTypes = []interface{}{
-	(Article_Status)(0),           // 0: google.golang.org.Article.Status
-	(*Article)(nil),               // 1: google.golang.org.Article
-	(*BinaryAttachment)(nil),      // 2: google.golang.org.BinaryAttachment
-	(*KeyValueAttachment)(nil),    // 3: google.golang.org.KeyValueAttachment
-	nil,                           // 4: google.golang.org.KeyValueAttachment.DataEntry
-	(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
-	(*anypb.Any)(nil),             // 6: google.protobuf.Any
-}
-var file_internal_testprotos_news_news_proto_depIdxs = []int32{
-	5, // 0: google.golang.org.Article.date:type_name -> google.protobuf.Timestamp
-	0, // 1: google.golang.org.Article.status:type_name -> google.golang.org.Article.Status
-	6, // 2: google.golang.org.Article.attachments:type_name -> google.protobuf.Any
-	4, // 3: google.golang.org.KeyValueAttachment.data:type_name -> google.golang.org.KeyValueAttachment.DataEntry
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_news_news_proto_init() }
-func file_internal_testprotos_news_news_proto_init() {
-	if File_internal_testprotos_news_news_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_news_news_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Article); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_news_news_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BinaryAttachment); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_news_news_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeyValueAttachment); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_news_news_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_news_news_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_news_news_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_news_news_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_news_news_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_news_news_proto = out.File
-	file_internal_testprotos_news_news_proto_rawDesc = nil
-	file_internal_testprotos_news_news_proto_goTypes = nil
-	file_internal_testprotos_news_news_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/news/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/news/ya.make
deleted file mode 100644
index 193c7d9c299..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/news/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(news.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/order/order.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/order/order.pb.go
deleted file mode 100644
index b62ef951994..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/order/order.pb.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Messages in this file are used to test wire encoding order.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/order/order.proto
-
-package order
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Message struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-
-	Field_2 *string `protobuf:"bytes,2,opt,name=field_2,json=field2" json:"field_2,omitempty"`
-	Field_1 *string `protobuf:"bytes,1,opt,name=field_1,json=field1" json:"field_1,omitempty"`
-	// Types that are assignable to Oneof_1:
-	//
-	//	*Message_Field_10
-	Oneof_1  isMessage_Oneof_1 `protobuf_oneof:"oneof_1"`
-	Field_20 *string           `protobuf:"bytes,20,opt,name=field_20,json=field20" json:"field_20,omitempty"`
-}
-
-func (x *Message) Reset() {
-	*x = Message{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_order_order_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message) ProtoMessage() {}
-
-func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_order_order_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message.ProtoReflect.Descriptor instead.
-func (*Message) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_order_order_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Message) GetField_2() string {
-	if x != nil && x.Field_2 != nil {
-		return *x.Field_2
-	}
-	return ""
-}
-
-func (x *Message) GetField_1() string {
-	if x != nil && x.Field_1 != nil {
-		return *x.Field_1
-	}
-	return ""
-}
-
-func (m *Message) GetOneof_1() isMessage_Oneof_1 {
-	if m != nil {
-		return m.Oneof_1
-	}
-	return nil
-}
-
-func (x *Message) GetField_10() string {
-	if x, ok := x.GetOneof_1().(*Message_Field_10); ok {
-		return x.Field_10
-	}
-	return ""
-}
-
-func (x *Message) GetField_20() string {
-	if x != nil && x.Field_20 != nil {
-		return *x.Field_20
-	}
-	return ""
-}
-
-type isMessage_Oneof_1 interface {
-	isMessage_Oneof_1()
-}
-
-type Message_Field_10 struct {
-	Field_10 string `protobuf:"bytes,10,opt,name=field_10,json=field10,oneof"`
-}
-
-func (*Message_Field_10) isMessage_Oneof_1() {}
-
-var file_internal_testprotos_order_order_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*Message)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         30,
-		Name:          "goproto.proto.order.field_30",
-		Tag:           "bytes,30,opt,name=field_30",
-		Filename:      "internal/testprotos/order/order.proto",
-	},
-	{
-		ExtendedType:  (*Message)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         31,
-		Name:          "goproto.proto.order.field_31",
-		Tag:           "bytes,31,opt,name=field_31",
-		Filename:      "internal/testprotos/order/order.proto",
-	},
-	{
-		ExtendedType:  (*Message)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         32,
-		Name:          "goproto.proto.order.field_32",
-		Tag:           "bytes,32,opt,name=field_32",
-		Filename:      "internal/testprotos/order/order.proto",
-	},
-}
-
-// Extension fields to Message.
-var (
-	// optional string field_30 = 30;
-	E_Field_30 = &file_internal_testprotos_order_order_proto_extTypes[0]
-	// optional string field_31 = 31;
-	E_Field_31 = &file_internal_testprotos_order_order_proto_extTypes[1]
-	// optional string field_32 = 32;
-	E_Field_32 = &file_internal_testprotos_order_order_proto_extTypes[2]
-)
-
-var File_internal_testprotos_order_order_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_order_order_proto_rawDesc = []byte{
-	0x0a, 0x25, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2f, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x84, 0x01, 0x0a,
-	0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x5f, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x32, 0x12, 0x17, 0x0a, 0x07, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x31, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x12, 0x1b, 0x0a, 0x08, 0x66, 0x69,
-	0x65, 0x6c, 0x64, 0x5f, 0x31, 0x30, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07,
-	0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x30, 0x12, 0x19, 0x0a, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x5f, 0x32, 0x30, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x32, 0x30, 0x2a, 0x04, 0x08, 0x1e, 0x10, 0x29, 0x42, 0x09, 0x0a, 0x07, 0x6f, 0x6e, 0x65, 0x6f,
-	0x66, 0x5f, 0x31, 0x3a, 0x37, 0x0a, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x33, 0x30, 0x12,
-	0x1c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x1e, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x33, 0x30, 0x3a, 0x37, 0x0a, 0x08,
-	0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x33, 0x31, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69,
-	0x65, 0x6c, 0x64, 0x33, 0x31, 0x3a, 0x37, 0x0a, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x33,
-	0x32, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18,
-	0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x33, 0x32, 0x42, 0x36,
-	0x5a, 0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
-	0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
-	0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72,
-}
-
-var (
-	file_internal_testprotos_order_order_proto_rawDescOnce sync.Once
-	file_internal_testprotos_order_order_proto_rawDescData = file_internal_testprotos_order_order_proto_rawDesc
-)
-
-func file_internal_testprotos_order_order_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_order_order_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_order_order_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_order_order_proto_rawDescData)
-	})
-	return file_internal_testprotos_order_order_proto_rawDescData
-}
-
-var file_internal_testprotos_order_order_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_order_order_proto_goTypes = []interface{}{
-	(*Message)(nil), // 0: goproto.proto.order.Message
-}
-var file_internal_testprotos_order_order_proto_depIdxs = []int32{
-	0, // 0: goproto.proto.order.field_30:extendee -> goproto.proto.order.Message
-	0, // 1: goproto.proto.order.field_31:extendee -> goproto.proto.order.Message
-	0, // 2: goproto.proto.order.field_32:extendee -> goproto.proto.order.Message
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	0, // [0:3] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_order_order_proto_init() }
-func file_internal_testprotos_order_order_proto_init() {
-	if File_internal_testprotos_order_order_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_order_order_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_internal_testprotos_order_order_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*Message_Field_10)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_order_order_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 3,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_order_order_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_order_order_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_order_order_proto_msgTypes,
-		ExtensionInfos:    file_internal_testprotos_order_order_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_order_order_proto = out.File
-	file_internal_testprotos_order_order_proto_rawDesc = nil
-	file_internal_testprotos_order_order_proto_goTypes = nil
-	file_internal_testprotos_order_order_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/order/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/order/ya.make
deleted file mode 100644
index c8c543e5a10..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/order/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(order.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/registry/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/registry/test.pb.go
deleted file mode 100644
index c2613c70108..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/registry/test.pb.go
+++ /dev/null
@@ -1,573 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Different proto type definitions for testing the Types registry.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/registry/test.proto
-
-package registry
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Enum1 int32
-
-const (
-	Enum1_ONE Enum1 = 1
-)
-
-// Enum value maps for Enum1.
-var (
-	Enum1_name = map[int32]string{
-		1: "ONE",
-	}
-	Enum1_value = map[string]int32{
-		"ONE": 1,
-	}
-)
-
-func (x Enum1) Enum() *Enum1 {
-	p := new(Enum1)
-	*p = x
-	return p
-}
-
-func (x Enum1) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum1) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_registry_test_proto_enumTypes[0].Descriptor()
-}
-
-func (Enum1) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_registry_test_proto_enumTypes[0]
-}
-
-func (x Enum1) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enum1) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enum1(num)
-	return nil
-}
-
-// Deprecated: Use Enum1.Descriptor instead.
-func (Enum1) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{0}
-}
-
-type Enum2 int32
-
-const (
-	Enum2_UNO Enum2 = 1
-)
-
-// Enum value maps for Enum2.
-var (
-	Enum2_name = map[int32]string{
-		1: "UNO",
-	}
-	Enum2_value = map[string]int32{
-		"UNO": 1,
-	}
-)
-
-func (x Enum2) Enum() *Enum2 {
-	p := new(Enum2)
-	*p = x
-	return p
-}
-
-func (x Enum2) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum2) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_registry_test_proto_enumTypes[1].Descriptor()
-}
-
-func (Enum2) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_registry_test_proto_enumTypes[1]
-}
-
-func (x Enum2) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enum2) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enum2(num)
-	return nil
-}
-
-// Deprecated: Use Enum2.Descriptor instead.
-func (Enum2) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{1}
-}
-
-type Enum3 int32
-
-const (
-	Enum3_YI Enum3 = 1
-)
-
-// Enum value maps for Enum3.
-var (
-	Enum3_name = map[int32]string{
-		1: "YI",
-	}
-	Enum3_value = map[string]int32{
-		"YI": 1,
-	}
-)
-
-func (x Enum3) Enum() *Enum3 {
-	p := new(Enum3)
-	*p = x
-	return p
-}
-
-func (x Enum3) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum3) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_registry_test_proto_enumTypes[2].Descriptor()
-}
-
-func (Enum3) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_registry_test_proto_enumTypes[2]
-}
-
-func (x Enum3) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enum3) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enum3(num)
-	return nil
-}
-
-// Deprecated: Use Enum3.Descriptor instead.
-func (Enum3) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{2}
-}
-
-type Message1 struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *Message1) Reset() {
-	*x = Message1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_registry_test_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message1) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message1) ProtoMessage() {}
-
-func (x *Message1) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_registry_test_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message1.ProtoReflect.Descriptor instead.
-func (*Message1) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{0}
-}
-
-type Message2 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *Message2) Reset() {
-	*x = Message2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_registry_test_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message2) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message2) ProtoMessage() {}
-
-func (x *Message2) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_registry_test_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message2.ProtoReflect.Descriptor instead.
-func (*Message2) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{1}
-}
-
-type Message3 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *Message3) Reset() {
-	*x = Message3{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_registry_test_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message3) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message3) ProtoMessage() {}
-
-func (x *Message3) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_registry_test_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message3.ProtoReflect.Descriptor instead.
-func (*Message3) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{2}
-}
-
-type Message4 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BoolField *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
-}
-
-func (x *Message4) Reset() {
-	*x = Message4{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_registry_test_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message4) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message4) ProtoMessage() {}
-
-func (x *Message4) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_registry_test_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message4.ProtoReflect.Descriptor instead.
-func (*Message4) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_registry_test_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Message4) GetBoolField() bool {
-	if x != nil && x.BoolField != nil {
-		return *x.BoolField
-	}
-	return false
-}
-
-var file_internal_testprotos_registry_test_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         11,
-		Name:          "testprotos.string_field",
-		Tag:           "bytes,11,opt,name=string_field",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*Enum1)(nil),
-		Field:         12,
-		Name:          "testprotos.enum_field",
-		Tag:           "varint,12,opt,name=enum_field,enum=testprotos.Enum1",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*Message2)(nil),
-		Field:         13,
-		Name:          "testprotos.message_field",
-		Tag:           "bytes,13,opt,name=message_field",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*Message2)(nil),
-		Field:         21,
-		Name:          "testprotos.Message4.message_field",
-		Tag:           "bytes,21,opt,name=message_field",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*Enum1)(nil),
-		Field:         22,
-		Name:          "testprotos.Message4.enum_field",
-		Tag:           "varint,22,opt,name=enum_field,enum=testprotos.Enum1",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-	{
-		ExtendedType:  (*Message1)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         23,
-		Name:          "testprotos.Message4.string_field",
-		Tag:           "bytes,23,opt,name=string_field",
-		Filename:      "internal/testprotos/registry/test.proto",
-	},
-}
-
-// Extension fields to Message1.
-var (
-	// optional string string_field = 11;
-	E_StringField = &file_internal_testprotos_registry_test_proto_extTypes[0]
-	// optional testprotos.Enum1 enum_field = 12;
-	E_EnumField = &file_internal_testprotos_registry_test_proto_extTypes[1]
-	// optional testprotos.Message2 message_field = 13;
-	E_MessageField = &file_internal_testprotos_registry_test_proto_extTypes[2]
-	// optional testprotos.Message2 message_field = 21;
-	E_Message4_MessageField = &file_internal_testprotos_registry_test_proto_extTypes[3]
-	// optional testprotos.Enum1 enum_field = 22;
-	E_Message4_EnumField = &file_internal_testprotos_registry_test_proto_extTypes[4]
-	// optional string string_field = 23;
-	E_Message4_StringField = &file_internal_testprotos_registry_test_proto_extTypes[5]
-)
-
-var File_internal_testprotos_registry_test_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_registry_test_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x22, 0x14, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x31, 0x2a, 0x08, 0x08, 0x0a, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x0a, 0x0a, 0x08, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x22, 0x0a, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x33, 0x22, 0xfb, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x34,
-	0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x1e,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x32,
-	0x4f, 0x0a, 0x0d, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64,
-	0x12, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x32, 0x52, 0x0c, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x32, 0x46, 0x0a, 0x0a, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x31, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x31, 0x52, 0x09, 0x65,
-	0x6e, 0x75, 0x6d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x37, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x18, 0x17,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x2a, 0x10, 0x0a, 0x05, 0x45, 0x6e, 0x75, 0x6d, 0x31, 0x12, 0x07, 0x0a, 0x03, 0x4f, 0x4e,
-	0x45, 0x10, 0x01, 0x2a, 0x10, 0x0a, 0x05, 0x45, 0x6e, 0x75, 0x6d, 0x32, 0x12, 0x07, 0x0a, 0x03,
-	0x55, 0x4e, 0x4f, 0x10, 0x01, 0x2a, 0x0f, 0x0a, 0x05, 0x45, 0x6e, 0x75, 0x6d, 0x33, 0x12, 0x06,
-	0x0a, 0x02, 0x59, 0x49, 0x10, 0x01, 0x3a, 0x37, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a,
-	0x46, 0x0a, 0x0a, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x31, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x31, 0x52, 0x09, 0x65, 0x6e,
-	0x75, 0x6d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x4f, 0x0a, 0x0d, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x52, 0x0c, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
-	0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73,
-	0x74, 0x72, 0x79,
-}
-
-var (
-	file_internal_testprotos_registry_test_proto_rawDescOnce sync.Once
-	file_internal_testprotos_registry_test_proto_rawDescData = file_internal_testprotos_registry_test_proto_rawDesc
-)
-
-func file_internal_testprotos_registry_test_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_registry_test_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_registry_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_registry_test_proto_rawDescData)
-	})
-	return file_internal_testprotos_registry_test_proto_rawDescData
-}
-
-var file_internal_testprotos_registry_test_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_internal_testprotos_registry_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_internal_testprotos_registry_test_proto_goTypes = []interface{}{
-	(Enum1)(0),       // 0: testprotos.Enum1
-	(Enum2)(0),       // 1: testprotos.Enum2
-	(Enum3)(0),       // 2: testprotos.Enum3
-	(*Message1)(nil), // 3: testprotos.Message1
-	(*Message2)(nil), // 4: testprotos.Message2
-	(*Message3)(nil), // 5: testprotos.Message3
-	(*Message4)(nil), // 6: testprotos.Message4
-}
-var file_internal_testprotos_registry_test_proto_depIdxs = []int32{
-	3,  // 0: testprotos.string_field:extendee -> testprotos.Message1
-	3,  // 1: testprotos.enum_field:extendee -> testprotos.Message1
-	3,  // 2: testprotos.message_field:extendee -> testprotos.Message1
-	3,  // 3: testprotos.Message4.message_field:extendee -> testprotos.Message1
-	3,  // 4: testprotos.Message4.enum_field:extendee -> testprotos.Message1
-	3,  // 5: testprotos.Message4.string_field:extendee -> testprotos.Message1
-	0,  // 6: testprotos.enum_field:type_name -> testprotos.Enum1
-	4,  // 7: testprotos.message_field:type_name -> testprotos.Message2
-	4,  // 8: testprotos.Message4.message_field:type_name -> testprotos.Message2
-	0,  // 9: testprotos.Message4.enum_field:type_name -> testprotos.Enum1
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	6,  // [6:10] is the sub-list for extension type_name
-	0,  // [0:6] is the sub-list for extension extendee
-	0,  // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_registry_test_proto_init() }
-func file_internal_testprotos_registry_test_proto_init() {
-	if File_internal_testprotos_registry_test_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_registry_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_registry_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message2); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_registry_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message3); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_registry_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message4); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_registry_test_proto_rawDesc,
-			NumEnums:      3,
-			NumMessages:   4,
-			NumExtensions: 6,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_registry_test_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_registry_test_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_registry_test_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_registry_test_proto_msgTypes,
-		ExtensionInfos:    file_internal_testprotos_registry_test_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_registry_test_proto = out.File
-	file_internal_testprotos_registry_test_proto_rawDesc = nil
-	file_internal_testprotos_registry_test_proto_goTypes = nil
-	file_internal_testprotos_registry_test_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/registry/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/registry/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/registry/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/required/required.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/required/required.pb.go
deleted file mode 100644
index 065fcbf5ed5..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/required/required.pb.go
+++ /dev/null
@@ -1,1121 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/required/required.proto
-
-package required
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Int32 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *int32 `protobuf:"varint,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Int32) Reset() {
-	*x = Int32{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Int32) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Int32) ProtoMessage() {}
-
-func (x *Int32) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Int32.ProtoReflect.Descriptor instead.
-func (*Int32) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Int32) GetV() int32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Int64 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *int64 `protobuf:"varint,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Int64) Reset() {
-	*x = Int64{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Int64) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Int64) ProtoMessage() {}
-
-func (x *Int64) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Int64.ProtoReflect.Descriptor instead.
-func (*Int64) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Int64) GetV() int64 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Uint32 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *uint32 `protobuf:"varint,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Uint32) Reset() {
-	*x = Uint32{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Uint32) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Uint32) ProtoMessage() {}
-
-func (x *Uint32) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Uint32.ProtoReflect.Descriptor instead.
-func (*Uint32) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Uint32) GetV() uint32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Uint64 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *uint64 `protobuf:"varint,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Uint64) Reset() {
-	*x = Uint64{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Uint64) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Uint64) ProtoMessage() {}
-
-func (x *Uint64) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Uint64.ProtoReflect.Descriptor instead.
-func (*Uint64) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Uint64) GetV() uint64 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Sint32 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *int32 `protobuf:"zigzag32,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Sint32) Reset() {
-	*x = Sint32{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Sint32) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Sint32) ProtoMessage() {}
-
-func (x *Sint32) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Sint32.ProtoReflect.Descriptor instead.
-func (*Sint32) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Sint32) GetV() int32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Sint64 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *int64 `protobuf:"zigzag64,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Sint64) Reset() {
-	*x = Sint64{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Sint64) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Sint64) ProtoMessage() {}
-
-func (x *Sint64) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Sint64.ProtoReflect.Descriptor instead.
-func (*Sint64) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Sint64) GetV() int64 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Fixed32 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *uint32 `protobuf:"fixed32,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Fixed32) Reset() {
-	*x = Fixed32{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Fixed32) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Fixed32) ProtoMessage() {}
-
-func (x *Fixed32) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Fixed32.ProtoReflect.Descriptor instead.
-func (*Fixed32) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *Fixed32) GetV() uint32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Fixed64 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *uint64 `protobuf:"fixed64,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Fixed64) Reset() {
-	*x = Fixed64{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Fixed64) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Fixed64) ProtoMessage() {}
-
-func (x *Fixed64) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Fixed64.ProtoReflect.Descriptor instead.
-func (*Fixed64) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *Fixed64) GetV() uint64 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Float struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *float32 `protobuf:"fixed32,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Float) Reset() {
-	*x = Float{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Float) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Float) ProtoMessage() {}
-
-func (x *Float) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Float.ProtoReflect.Descriptor instead.
-func (*Float) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *Float) GetV() float32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Double struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *float64 `protobuf:"fixed64,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Double) Reset() {
-	*x = Double{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Double) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Double) ProtoMessage() {}
-
-func (x *Double) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Double.ProtoReflect.Descriptor instead.
-func (*Double) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *Double) GetV() float64 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-type Bool struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *bool `protobuf:"varint,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Bool) Reset() {
-	*x = Bool{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Bool) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Bool) ProtoMessage() {}
-
-func (x *Bool) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Bool.ProtoReflect.Descriptor instead.
-func (*Bool) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *Bool) GetV() bool {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return false
-}
-
-type String struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *string `protobuf:"bytes,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *String) Reset() {
-	*x = String{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *String) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*String) ProtoMessage() {}
-
-func (x *String) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use String.ProtoReflect.Descriptor instead.
-func (*String) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *String) GetV() string {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return ""
-}
-
-type Bytes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V []byte `protobuf:"bytes,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Bytes) Reset() {
-	*x = Bytes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Bytes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Bytes) ProtoMessage() {}
-
-func (x *Bytes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Bytes.ProtoReflect.Descriptor instead.
-func (*Bytes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *Bytes) GetV() []byte {
-	if x != nil {
-		return x.V
-	}
-	return nil
-}
-
-type Message struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *Message_M `protobuf:"bytes,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *Message) Reset() {
-	*x = Message{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message) ProtoMessage() {}
-
-func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message.ProtoReflect.Descriptor instead.
-func (*Message) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *Message) GetV() *Message_M {
-	if x != nil {
-		return x.V
-	}
-	return nil
-}
-
-type Group struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Group *Group_Group `protobuf:"group,1,req,name=Group,json=group" json:"group,omitempty"`
-}
-
-func (x *Group) Reset() {
-	*x = Group{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Group) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Group) ProtoMessage() {}
-
-func (x *Group) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Group.ProtoReflect.Descriptor instead.
-func (*Group) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *Group) GetGroup() *Group_Group {
-	if x != nil {
-		return x.Group
-	}
-	return nil
-}
-
-type Message_M struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *Message_M) Reset() {
-	*x = Message_M{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Message_M) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Message_M) ProtoMessage() {}
-
-func (x *Message_M) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Message_M.ProtoReflect.Descriptor instead.
-func (*Message_M) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{13, 0}
-}
-
-type Group_Group struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *int32 `protobuf:"varint,1,opt,name=v" json:"v,omitempty"`
-}
-
-func (x *Group_Group) Reset() {
-	*x = Group_Group{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_required_required_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Group_Group) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Group_Group) ProtoMessage() {}
-
-func (x *Group_Group) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_required_required_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Group_Group.ProtoReflect.Descriptor instead.
-func (*Group_Group) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_required_required_proto_rawDescGZIP(), []int{14, 0}
-}
-
-func (x *Group_Group) GetV() int32 {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return 0
-}
-
-var File_internal_testprotos_required_required_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_required_required_proto_rawDesc = []byte{
-	0x0a, 0x2b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2f, 0x72,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x22, 0x15, 0x0a, 0x05, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x05, 0x52, 0x01, 0x76,
-	0x22, 0x15, 0x0a, 0x05, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01,
-	0x20, 0x02, 0x28, 0x03, 0x52, 0x01, 0x76, 0x22, 0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x0d, 0x52, 0x01, 0x76, 0x22,
-	0x16, 0x0a, 0x06, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01,
-	0x20, 0x02, 0x28, 0x04, 0x52, 0x01, 0x76, 0x22, 0x16, 0x0a, 0x06, 0x53, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x11, 0x52, 0x01, 0x76, 0x22,
-	0x16, 0x0a, 0x06, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01,
-	0x20, 0x02, 0x28, 0x12, 0x52, 0x01, 0x76, 0x22, 0x17, 0x0a, 0x07, 0x46, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x07, 0x52, 0x01, 0x76,
-	0x22, 0x17, 0x0a, 0x07, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x0c, 0x0a, 0x01, 0x76,
-	0x18, 0x01, 0x20, 0x02, 0x28, 0x06, 0x52, 0x01, 0x76, 0x22, 0x15, 0x0a, 0x05, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x02, 0x52, 0x01, 0x76,
-	0x22, 0x16, 0x0a, 0x06, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18,
-	0x01, 0x20, 0x02, 0x28, 0x01, 0x52, 0x01, 0x76, 0x22, 0x14, 0x0a, 0x04, 0x42, 0x6f, 0x6f, 0x6c,
-	0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x08, 0x52, 0x01, 0x76, 0x22, 0x16,
-	0x0a, 0x06, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20,
-	0x02, 0x28, 0x09, 0x52, 0x01, 0x76, 0x22, 0x15, 0x0a, 0x05, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12,
-	0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x0c, 0x52, 0x01, 0x76, 0x22, 0x43, 0x0a,
-	0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x33, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20,
-	0x02, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x52, 0x01, 0x76, 0x1a, 0x03, 0x0a,
-	0x01, 0x4d, 0x22, 0x5d, 0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x3d, 0x0a, 0x05, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x02, 0x28, 0x0a, 0x32, 0x27, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x72,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x15, 0x0a, 0x05, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
-	0x76, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61,
-	0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x73, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-}
-
-var (
-	file_internal_testprotos_required_required_proto_rawDescOnce sync.Once
-	file_internal_testprotos_required_required_proto_rawDescData = file_internal_testprotos_required_required_proto_rawDesc
-)
-
-func file_internal_testprotos_required_required_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_required_required_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_required_required_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_required_required_proto_rawDescData)
-	})
-	return file_internal_testprotos_required_required_proto_rawDescData
-}
-
-var file_internal_testprotos_required_required_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
-var file_internal_testprotos_required_required_proto_goTypes = []interface{}{
-	(*Int32)(nil),       // 0: goproto.proto.testrequired.Int32
-	(*Int64)(nil),       // 1: goproto.proto.testrequired.Int64
-	(*Uint32)(nil),      // 2: goproto.proto.testrequired.Uint32
-	(*Uint64)(nil),      // 3: goproto.proto.testrequired.Uint64
-	(*Sint32)(nil),      // 4: goproto.proto.testrequired.Sint32
-	(*Sint64)(nil),      // 5: goproto.proto.testrequired.Sint64
-	(*Fixed32)(nil),     // 6: goproto.proto.testrequired.Fixed32
-	(*Fixed64)(nil),     // 7: goproto.proto.testrequired.Fixed64
-	(*Float)(nil),       // 8: goproto.proto.testrequired.Float
-	(*Double)(nil),      // 9: goproto.proto.testrequired.Double
-	(*Bool)(nil),        // 10: goproto.proto.testrequired.Bool
-	(*String)(nil),      // 11: goproto.proto.testrequired.String
-	(*Bytes)(nil),       // 12: goproto.proto.testrequired.Bytes
-	(*Message)(nil),     // 13: goproto.proto.testrequired.Message
-	(*Group)(nil),       // 14: goproto.proto.testrequired.Group
-	(*Message_M)(nil),   // 15: goproto.proto.testrequired.Message.M
-	(*Group_Group)(nil), // 16: goproto.proto.testrequired.Group.Group
-}
-var file_internal_testprotos_required_required_proto_depIdxs = []int32{
-	15, // 0: goproto.proto.testrequired.Message.v:type_name -> goproto.proto.testrequired.Message.M
-	16, // 1: goproto.proto.testrequired.Group.group:type_name -> goproto.proto.testrequired.Group.Group
-	2,  // [2:2] is the sub-list for method output_type
-	2,  // [2:2] is the sub-list for method input_type
-	2,  // [2:2] is the sub-list for extension type_name
-	2,  // [2:2] is the sub-list for extension extendee
-	0,  // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_required_required_proto_init() }
-func file_internal_testprotos_required_required_proto_init() {
-	if File_internal_testprotos_required_required_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_required_required_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Int32); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Int64); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Uint32); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Uint64); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Sint32); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Sint64); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Fixed32); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Fixed64); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Float); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Double); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Bool); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*String); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Bytes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Group); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message_M); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_required_required_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Group_Group); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_required_required_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   17,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_required_required_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_required_required_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_required_required_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_required_required_proto = out.File
-	file_internal_testprotos_required_required_proto_rawDesc = nil
-	file_internal_testprotos_required_required_proto_goTypes = nil
-	file_internal_testprotos_required_required_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/required/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/required/ya.make
deleted file mode 100644
index b04255bfa6e..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/required/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(required.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/ext.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test/ext.pb.go
deleted file mode 100644
index 194b4c5279d..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/ext.pb.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test/ext.proto
-
-package test
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-)
-
-var file_internal_testprotos_test_ext_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         2000,
-		Name:          "goproto.proto.test.foreign_int32_extension",
-		Tag:           "varint,2000,opt,name=foreign_int32_extension",
-		Filename:      "internal/testprotos/test/ext.proto",
-	},
-}
-
-// Extension fields to TestAllExtensions.
-var (
-	// optional int32 foreign_int32_extension = 2000;
-	E_ForeignInt32Extension = &file_internal_testprotos_test_ext_proto_extTypes[0]
-)
-
-var File_internal_testprotos_test_ext_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test_ext_proto_rawDesc = []byte{
-	0x0a, 0x22, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x65, 0x78, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x5e, 0x0a,
-	0x17, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xd0, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x35, 0x5a,
-	0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
-	0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
-	0x74, 0x65, 0x73, 0x74,
-}
-
-var file_internal_testprotos_test_ext_proto_goTypes = []interface{}{
-	(*TestAllExtensions)(nil), // 0: goproto.proto.test.TestAllExtensions
-}
-var file_internal_testprotos_test_ext_proto_depIdxs = []int32{
-	0, // 0: goproto.proto.test.foreign_int32_extension:extendee -> goproto.proto.test.TestAllExtensions
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	0, // [0:1] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test_ext_proto_init() }
-func file_internal_testprotos_test_ext_proto_init() {
-	if File_internal_testprotos_test_ext_proto != nil {
-		return
-	}
-	file_internal_testprotos_test_test_proto_init()
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test_ext_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   0,
-			NumExtensions: 1,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test_ext_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test_ext_proto_depIdxs,
-		ExtensionInfos:    file_internal_testprotos_test_ext_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_test_ext_proto = out.File
-	file_internal_testprotos_test_ext_proto_rawDesc = nil
-	file_internal_testprotos_test_ext_proto_goTypes = nil
-	file_internal_testprotos_test_ext_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test/test.pb.go
deleted file mode 100644
index a828a515dc1..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/test.pb.go
+++ /dev/null
@@ -1,5413 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test/test.proto
-
-package test
-
-import (
-	enums "google.golang.org/protobuf/internal/testprotos/enums"
-	proto "google.golang.org/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type ForeignEnum int32
-
-const (
-	ForeignEnum_FOREIGN_FOO ForeignEnum = 4
-	ForeignEnum_FOREIGN_BAR ForeignEnum = 5
-	ForeignEnum_FOREIGN_BAZ ForeignEnum = 6
-)
-
-// Enum value maps for ForeignEnum.
-var (
-	ForeignEnum_name = map[int32]string{
-		4: "FOREIGN_FOO",
-		5: "FOREIGN_BAR",
-		6: "FOREIGN_BAZ",
-	}
-	ForeignEnum_value = map[string]int32{
-		"FOREIGN_FOO": 4,
-		"FOREIGN_BAR": 5,
-		"FOREIGN_BAZ": 6,
-	}
-)
-
-func (x ForeignEnum) Enum() *ForeignEnum {
-	p := new(ForeignEnum)
-	*p = x
-	return p
-}
-
-func (x ForeignEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ForeignEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test_test_proto_enumTypes[0].Descriptor()
-}
-
-func (ForeignEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test_test_proto_enumTypes[0]
-}
-
-func (x ForeignEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *ForeignEnum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = ForeignEnum(num)
-	return nil
-}
-
-// Deprecated: Use ForeignEnum.Descriptor instead.
-func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0}
-}
-
-type TestReservedEnumFields int32
-
-const (
-	TestReservedEnumFields_RESERVED_ENUM TestReservedEnumFields = 0
-)
-
-// Enum value maps for TestReservedEnumFields.
-var (
-	TestReservedEnumFields_name = map[int32]string{
-		0: "RESERVED_ENUM",
-	}
-	TestReservedEnumFields_value = map[string]int32{
-		"RESERVED_ENUM": 0,
-	}
-)
-
-func (x TestReservedEnumFields) Enum() *TestReservedEnumFields {
-	p := new(TestReservedEnumFields)
-	*p = x
-	return p
-}
-
-func (x TestReservedEnumFields) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TestReservedEnumFields) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test_test_proto_enumTypes[1].Descriptor()
-}
-
-func (TestReservedEnumFields) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test_test_proto_enumTypes[1]
-}
-
-func (x TestReservedEnumFields) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *TestReservedEnumFields) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = TestReservedEnumFields(num)
-	return nil
-}
-
-// Deprecated: Use TestReservedEnumFields.Descriptor instead.
-func (TestReservedEnumFields) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{1}
-}
-
-type TestAllTypes_NestedEnum int32
-
-const (
-	TestAllTypes_FOO TestAllTypes_NestedEnum = 0
-	TestAllTypes_BAR TestAllTypes_NestedEnum = 1
-	TestAllTypes_BAZ TestAllTypes_NestedEnum = 2
-	TestAllTypes_NEG TestAllTypes_NestedEnum = -1 // Intentionally negative.
-)
-
-// Enum value maps for TestAllTypes_NestedEnum.
-var (
-	TestAllTypes_NestedEnum_name = map[int32]string{
-		0:  "FOO",
-		1:  "BAR",
-		2:  "BAZ",
-		-1: "NEG",
-	}
-	TestAllTypes_NestedEnum_value = map[string]int32{
-		"FOO": 0,
-		"BAR": 1,
-		"BAZ": 2,
-		"NEG": -1,
-	}
-)
-
-func (x TestAllTypes_NestedEnum) Enum() *TestAllTypes_NestedEnum {
-	p := new(TestAllTypes_NestedEnum)
-	*p = x
-	return p
-}
-
-func (x TestAllTypes_NestedEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TestAllTypes_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test_test_proto_enumTypes[2].Descriptor()
-}
-
-func (TestAllTypes_NestedEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test_test_proto_enumTypes[2]
-}
-
-func (x TestAllTypes_NestedEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *TestAllTypes_NestedEnum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = TestAllTypes_NestedEnum(num)
-	return nil
-}
-
-// Deprecated: Use TestAllTypes_NestedEnum.Descriptor instead.
-func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0, 0}
-}
-
-// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-type TestDeprecatedMessage_DeprecatedEnum int32
-
-const (
-	// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-	TestDeprecatedMessage_DEPRECATED TestDeprecatedMessage_DeprecatedEnum = 0
-)
-
-// Enum value maps for TestDeprecatedMessage_DeprecatedEnum.
-var (
-	TestDeprecatedMessage_DeprecatedEnum_name = map[int32]string{
-		0: "DEPRECATED",
-	}
-	TestDeprecatedMessage_DeprecatedEnum_value = map[string]int32{
-		"DEPRECATED": 0,
-	}
-)
-
-func (x TestDeprecatedMessage_DeprecatedEnum) Enum() *TestDeprecatedMessage_DeprecatedEnum {
-	p := new(TestDeprecatedMessage_DeprecatedEnum)
-	*p = x
-	return p
-}
-
-func (x TestDeprecatedMessage_DeprecatedEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TestDeprecatedMessage_DeprecatedEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test_test_proto_enumTypes[3].Descriptor()
-}
-
-func (TestDeprecatedMessage_DeprecatedEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test_test_proto_enumTypes[3]
-}
-
-func (x TestDeprecatedMessage_DeprecatedEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *TestDeprecatedMessage_DeprecatedEnum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = TestDeprecatedMessage_DeprecatedEnum(num)
-	return nil
-}
-
-// Deprecated: Use TestDeprecatedMessage_DeprecatedEnum.Descriptor instead.
-func (TestDeprecatedMessage_DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{1, 0}
-}
-
-type TestAllTypes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptionalInt32          *int32                                 `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalInt64          *int64                                 `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalUint32         *uint32                                `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalUint64         *uint64                                `protobuf:"varint,4,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalSint32         *int32                                 `protobuf:"zigzag32,5,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalSint64         *int64                                 `protobuf:"zigzag64,6,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalFixed32        *uint32                                `protobuf:"fixed32,7,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalFixed64        *uint64                                `protobuf:"fixed64,8,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed32       *int32                                 `protobuf:"fixed32,9,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalSfixed64       *int64                                 `protobuf:"fixed64,10,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalFloat          *float32                               `protobuf:"fixed32,11,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalDouble         *float64                               `protobuf:"fixed64,12,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalBool           *bool                                  `protobuf:"varint,13,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalString         *string                                `protobuf:"bytes,14,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                                 `protobuf:"bytes,15,opt,name=optional_bytes,json=optionalBytes" json:"optional_bytes,omitempty"`
-	Optionalgroup          *TestAllTypes_OptionalGroup            `protobuf:"group,16,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	OptionalNestedMessage  *TestAllTypes_NestedMessage            `protobuf:"bytes,18,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-	OptionalForeignMessage *ForeignMessage                        `protobuf:"bytes,19,opt,name=optional_foreign_message,json=optionalForeignMessage" json:"optional_foreign_message,omitempty"`
-	OptionalImportMessage  *ImportMessage                         `protobuf:"bytes,20,opt,name=optional_import_message,json=optionalImportMessage" json:"optional_import_message,omitempty"`
-	OptionalNestedEnum     *TestAllTypes_NestedEnum               `protobuf:"varint,21,opt,name=optional_nested_enum,json=optionalNestedEnum,enum=goproto.proto.test.TestAllTypes_NestedEnum" json:"optional_nested_enum,omitempty"`
-	OptionalForeignEnum    *ForeignEnum                           `protobuf:"varint,22,opt,name=optional_foreign_enum,json=optionalForeignEnum,enum=goproto.proto.test.ForeignEnum" json:"optional_foreign_enum,omitempty"`
-	OptionalImportEnum     *ImportEnum                            `protobuf:"varint,23,opt,name=optional_import_enum,json=optionalImportEnum,enum=goproto.proto.test.ImportEnum" json:"optional_import_enum,omitempty"`
-	RepeatedInt32          []int32                                `protobuf:"varint,31,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedInt64          []int64                                `protobuf:"varint,32,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedUint32         []uint32                               `protobuf:"varint,33,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedUint64         []uint64                               `protobuf:"varint,34,rep,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedSint32         []int32                                `protobuf:"zigzag32,35,rep,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedSint64         []int64                                `protobuf:"zigzag64,36,rep,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedFixed32        []uint32                               `protobuf:"fixed32,37,rep,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedFixed64        []uint64                               `protobuf:"fixed64,38,rep,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed32       []int32                                `protobuf:"fixed32,39,rep,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedSfixed64       []int64                                `protobuf:"fixed64,40,rep,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedFloat          []float32                              `protobuf:"fixed32,41,rep,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedDouble         []float64                              `protobuf:"fixed64,42,rep,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedBool           []bool                                 `protobuf:"varint,43,rep,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedString         []string                               `protobuf:"bytes,44,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                               `protobuf:"bytes,45,rep,name=repeated_bytes,json=repeatedBytes" json:"repeated_bytes,omitempty"`
-	Repeatedgroup          []*TestAllTypes_RepeatedGroup          `protobuf:"group,46,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	RepeatedNestedMessage  []*TestAllTypes_NestedMessage          `protobuf:"bytes,48,rep,name=repeated_nested_message,json=repeatedNestedMessage" json:"repeated_nested_message,omitempty"`
-	RepeatedForeignMessage []*ForeignMessage                      `protobuf:"bytes,49,rep,name=repeated_foreign_message,json=repeatedForeignMessage" json:"repeated_foreign_message,omitempty"`
-	RepeatedImportmessage  []*ImportMessage                       `protobuf:"bytes,50,rep,name=repeated_importmessage,json=repeatedImportmessage" json:"repeated_importmessage,omitempty"`
-	RepeatedNestedEnum     []TestAllTypes_NestedEnum              `protobuf:"varint,51,rep,name=repeated_nested_enum,json=repeatedNestedEnum,enum=goproto.proto.test.TestAllTypes_NestedEnum" json:"repeated_nested_enum,omitempty"`
-	RepeatedForeignEnum    []ForeignEnum                          `protobuf:"varint,52,rep,name=repeated_foreign_enum,json=repeatedForeignEnum,enum=goproto.proto.test.ForeignEnum" json:"repeated_foreign_enum,omitempty"`
-	RepeatedImportenum     []ImportEnum                           `protobuf:"varint,53,rep,name=repeated_importenum,json=repeatedImportenum,enum=goproto.proto.test.ImportEnum" json:"repeated_importenum,omitempty"`
-	MapInt32Int32          map[int32]int32                        `protobuf:"bytes,56,rep,name=map_int32_int32,json=mapInt32Int32" json:"map_int32_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Int64          map[int64]int64                        `protobuf:"bytes,57,rep,name=map_int64_int64,json=mapInt64Int64" json:"map_int64_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Uint32        map[uint32]uint32                      `protobuf:"bytes,58,rep,name=map_uint32_uint32,json=mapUint32Uint32" json:"map_uint32_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Uint64        map[uint64]uint64                      `protobuf:"bytes,59,rep,name=map_uint64_uint64,json=mapUint64Uint64" json:"map_uint64_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Sint32        map[int32]int32                        `protobuf:"bytes,60,rep,name=map_sint32_sint32,json=mapSint32Sint32" json:"map_sint32_sint32,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapSint64Sint64        map[int64]int64                        `protobuf:"bytes,61,rep,name=map_sint64_sint64,json=mapSint64Sint64" json:"map_sint64_sint64,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapFixed32Fixed32      map[uint32]uint32                      `protobuf:"bytes,62,rep,name=map_fixed32_fixed32,json=mapFixed32Fixed32" json:"map_fixed32_fixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapFixed64Fixed64      map[uint64]uint64                      `protobuf:"bytes,63,rep,name=map_fixed64_fixed64,json=mapFixed64Fixed64" json:"map_fixed64_fixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapSfixed32Sfixed32    map[int32]int32                        `protobuf:"bytes,64,rep,name=map_sfixed32_sfixed32,json=mapSfixed32Sfixed32" json:"map_sfixed32_sfixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapSfixed64Sfixed64    map[int64]int64                        `protobuf:"bytes,65,rep,name=map_sfixed64_sfixed64,json=mapSfixed64Sfixed64" json:"map_sfixed64_sfixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapInt32Float          map[int32]float32                      `protobuf:"bytes,66,rep,name=map_int32_float,json=mapInt32Float" json:"map_int32_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapInt32Double         map[int32]float64                      `protobuf:"bytes,67,rep,name=map_int32_double,json=mapInt32Double" json:"map_int32_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolBool            map[bool]bool                          `protobuf:"bytes,68,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringString        map[string]string                      `protobuf:"bytes,69,rep,name=map_string_string,json=mapStringString" json:"map_string_string,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringBytes         map[string][]byte                      `protobuf:"bytes,70,rep,name=map_string_bytes,json=mapStringBytes" json:"map_string_bytes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringNestedMessage map[string]*TestAllTypes_NestedMessage `protobuf:"bytes,71,rep,name=map_string_nested_message,json=mapStringNestedMessage" json:"map_string_nested_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringNestedEnum    map[string]TestAllTypes_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=goproto.proto.test.TestAllTypes_NestedEnum"`
-	// Singular with defaults
-	DefaultInt32       *int32                   `protobuf:"varint,81,opt,name=default_int32,json=defaultInt32,def=81" json:"default_int32,omitempty"`
-	DefaultInt64       *int64                   `protobuf:"varint,82,opt,name=default_int64,json=defaultInt64,def=82" json:"default_int64,omitempty"`
-	DefaultUint32      *uint32                  `protobuf:"varint,83,opt,name=default_uint32,json=defaultUint32,def=83" json:"default_uint32,omitempty"`
-	DefaultUint64      *uint64                  `protobuf:"varint,84,opt,name=default_uint64,json=defaultUint64,def=84" json:"default_uint64,omitempty"`
-	DefaultSint32      *int32                   `protobuf:"zigzag32,85,opt,name=default_sint32,json=defaultSint32,def=-85" json:"default_sint32,omitempty"`
-	DefaultSint64      *int64                   `protobuf:"zigzag64,86,opt,name=default_sint64,json=defaultSint64,def=86" json:"default_sint64,omitempty"`
-	DefaultFixed32     *uint32                  `protobuf:"fixed32,87,opt,name=default_fixed32,json=defaultFixed32,def=87" json:"default_fixed32,omitempty"`
-	DefaultFixed64     *uint64                  `protobuf:"fixed64,88,opt,name=default_fixed64,json=defaultFixed64,def=88" json:"default_fixed64,omitempty"`
-	DefaultSfixed32    *int32                   `protobuf:"fixed32,89,opt,name=default_sfixed32,json=defaultSfixed32,def=89" json:"default_sfixed32,omitempty"`
-	DefaultSfixed64    *int64                   `protobuf:"fixed64,80,opt,name=default_sfixed64,json=defaultSfixed64,def=-90" json:"default_sfixed64,omitempty"`
-	DefaultFloat       *float32                 `protobuf:"fixed32,91,opt,name=default_float,json=defaultFloat,def=91.5" json:"default_float,omitempty"`
-	DefaultDouble      *float64                 `protobuf:"fixed64,92,opt,name=default_double,json=defaultDouble,def=92000" json:"default_double,omitempty"`
-	DefaultBool        *bool                    `protobuf:"varint,93,opt,name=default_bool,json=defaultBool,def=1" json:"default_bool,omitempty"`
-	DefaultString      *string                  `protobuf:"bytes,94,opt,name=default_string,json=defaultString,def=hello" json:"default_string,omitempty"`
-	DefaultBytes       []byte                   `protobuf:"bytes,95,opt,name=default_bytes,json=defaultBytes,def=world" json:"default_bytes,omitempty"`
-	DefaultNestedEnum  *TestAllTypes_NestedEnum `protobuf:"varint,96,opt,name=default_nested_enum,json=defaultNestedEnum,enum=goproto.proto.test.TestAllTypes_NestedEnum,def=1" json:"default_nested_enum,omitempty"`
-	DefaultForeignEnum *ForeignEnum             `protobuf:"varint,97,opt,name=default_foreign_enum,json=defaultForeignEnum,enum=goproto.proto.test.ForeignEnum,def=5" json:"default_foreign_enum,omitempty"`
-	// Types that are assignable to OneofField:
-	//
-	//	*TestAllTypes_OneofUint32
-	//	*TestAllTypes_OneofNestedMessage
-	//	*TestAllTypes_OneofString
-	//	*TestAllTypes_OneofBytes
-	//	*TestAllTypes_OneofBool
-	//	*TestAllTypes_OneofUint64
-	//	*TestAllTypes_OneofFloat
-	//	*TestAllTypes_OneofDouble
-	//	*TestAllTypes_OneofEnum
-	//	*TestAllTypes_Oneofgroup
-	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	// A oneof with exactly one field.
-	//
-	// Types that are assignable to OneofOptional:
-	//
-	//	*TestAllTypes_OneofOptionalUint32
-	OneofOptional isTestAllTypes_OneofOptional `protobuf_oneof:"oneof_optional"`
-}
-
-// Default values for TestAllTypes fields.
-const (
-	Default_TestAllTypes_DefaultInt32       = int32(81)
-	Default_TestAllTypes_DefaultInt64       = int64(82)
-	Default_TestAllTypes_DefaultUint32      = uint32(83)
-	Default_TestAllTypes_DefaultUint64      = uint64(84)
-	Default_TestAllTypes_DefaultSint32      = int32(-85)
-	Default_TestAllTypes_DefaultSint64      = int64(86)
-	Default_TestAllTypes_DefaultFixed32     = uint32(87)
-	Default_TestAllTypes_DefaultFixed64     = uint64(88)
-	Default_TestAllTypes_DefaultSfixed32    = int32(89)
-	Default_TestAllTypes_DefaultSfixed64    = int64(-90)
-	Default_TestAllTypes_DefaultFloat       = float32(91.5)
-	Default_TestAllTypes_DefaultDouble      = float64(92000)
-	Default_TestAllTypes_DefaultBool        = bool(true)
-	Default_TestAllTypes_DefaultString      = string("hello")
-	Default_TestAllTypes_DefaultNestedEnum  = TestAllTypes_BAR
-	Default_TestAllTypes_DefaultForeignEnum = ForeignEnum_FOREIGN_BAR
-)
-
-// Default values for TestAllTypes fields.
-var (
-	Default_TestAllTypes_DefaultBytes = []byte("world")
-)
-
-func (x *TestAllTypes) Reset() {
-	*x = TestAllTypes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes) ProtoMessage() {}
-
-func (x *TestAllTypes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes.ProtoReflect.Descriptor instead.
-func (*TestAllTypes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TestAllTypes) GetOptionalInt32() int32 {
-	if x != nil && x.OptionalInt32 != nil {
-		return *x.OptionalInt32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalInt64() int64 {
-	if x != nil && x.OptionalInt64 != nil {
-		return *x.OptionalInt64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalUint32() uint32 {
-	if x != nil && x.OptionalUint32 != nil {
-		return *x.OptionalUint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalUint64() uint64 {
-	if x != nil && x.OptionalUint64 != nil {
-		return *x.OptionalUint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSint32() int32 {
-	if x != nil && x.OptionalSint32 != nil {
-		return *x.OptionalSint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSint64() int64 {
-	if x != nil && x.OptionalSint64 != nil {
-		return *x.OptionalSint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFixed32() uint32 {
-	if x != nil && x.OptionalFixed32 != nil {
-		return *x.OptionalFixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFixed64() uint64 {
-	if x != nil && x.OptionalFixed64 != nil {
-		return *x.OptionalFixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSfixed32() int32 {
-	if x != nil && x.OptionalSfixed32 != nil {
-		return *x.OptionalSfixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSfixed64() int64 {
-	if x != nil && x.OptionalSfixed64 != nil {
-		return *x.OptionalSfixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFloat() float32 {
-	if x != nil && x.OptionalFloat != nil {
-		return *x.OptionalFloat
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalDouble() float64 {
-	if x != nil && x.OptionalDouble != nil {
-		return *x.OptionalDouble
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalBool() bool {
-	if x != nil && x.OptionalBool != nil {
-		return *x.OptionalBool
-	}
-	return false
-}
-
-func (x *TestAllTypes) GetOptionalString() string {
-	if x != nil && x.OptionalString != nil {
-		return *x.OptionalString
-	}
-	return ""
-}
-
-func (x *TestAllTypes) GetOptionalBytes() []byte {
-	if x != nil {
-		return x.OptionalBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalgroup() *TestAllTypes_OptionalGroup {
-	if x != nil {
-		return x.Optionalgroup
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalNestedMessage() *TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalForeignMessage() *ForeignMessage {
-	if x != nil {
-		return x.OptionalForeignMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalImportMessage() *ImportMessage {
-	if x != nil {
-		return x.OptionalImportMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalNestedEnum() TestAllTypes_NestedEnum {
-	if x != nil && x.OptionalNestedEnum != nil {
-		return *x.OptionalNestedEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (x *TestAllTypes) GetOptionalForeignEnum() ForeignEnum {
-	if x != nil && x.OptionalForeignEnum != nil {
-		return *x.OptionalForeignEnum
-	}
-	return ForeignEnum_FOREIGN_FOO
-}
-
-func (x *TestAllTypes) GetOptionalImportEnum() ImportEnum {
-	if x != nil && x.OptionalImportEnum != nil {
-		return *x.OptionalImportEnum
-	}
-	return ImportEnum_IMPORT_ZERO
-}
-
-func (x *TestAllTypes) GetRepeatedInt32() []int32 {
-	if x != nil {
-		return x.RepeatedInt32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedInt64() []int64 {
-	if x != nil {
-		return x.RepeatedInt64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedUint32() []uint32 {
-	if x != nil {
-		return x.RepeatedUint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedUint64() []uint64 {
-	if x != nil {
-		return x.RepeatedUint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSint32() []int32 {
-	if x != nil {
-		return x.RepeatedSint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSint64() []int64 {
-	if x != nil {
-		return x.RepeatedSint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFixed32() []uint32 {
-	if x != nil {
-		return x.RepeatedFixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFixed64() []uint64 {
-	if x != nil {
-		return x.RepeatedFixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSfixed32() []int32 {
-	if x != nil {
-		return x.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSfixed64() []int64 {
-	if x != nil {
-		return x.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFloat() []float32 {
-	if x != nil {
-		return x.RepeatedFloat
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedDouble() []float64 {
-	if x != nil {
-		return x.RepeatedDouble
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedBool() []bool {
-	if x != nil {
-		return x.RepeatedBool
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedString() []string {
-	if x != nil {
-		return x.RepeatedString
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedBytes() [][]byte {
-	if x != nil {
-		return x.RepeatedBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedgroup() []*TestAllTypes_RepeatedGroup {
-	if x != nil {
-		return x.Repeatedgroup
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedNestedMessage() []*TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.RepeatedNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedForeignMessage() []*ForeignMessage {
-	if x != nil {
-		return x.RepeatedForeignMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedImportmessage() []*ImportMessage {
-	if x != nil {
-		return x.RepeatedImportmessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedNestedEnum() []TestAllTypes_NestedEnum {
-	if x != nil {
-		return x.RepeatedNestedEnum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedForeignEnum() []ForeignEnum {
-	if x != nil {
-		return x.RepeatedForeignEnum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedImportenum() []ImportEnum {
-	if x != nil {
-		return x.RepeatedImportenum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Int32() map[int32]int32 {
-	if x != nil {
-		return x.MapInt32Int32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt64Int64() map[int64]int64 {
-	if x != nil {
-		return x.MapInt64Int64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapUint32Uint32() map[uint32]uint32 {
-	if x != nil {
-		return x.MapUint32Uint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapUint64Uint64() map[uint64]uint64 {
-	if x != nil {
-		return x.MapUint64Uint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSint32Sint32() map[int32]int32 {
-	if x != nil {
-		return x.MapSint32Sint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSint64Sint64() map[int64]int64 {
-	if x != nil {
-		return x.MapSint64Sint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapFixed32Fixed32() map[uint32]uint32 {
-	if x != nil {
-		return x.MapFixed32Fixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapFixed64Fixed64() map[uint64]uint64 {
-	if x != nil {
-		return x.MapFixed64Fixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSfixed32Sfixed32() map[int32]int32 {
-	if x != nil {
-		return x.MapSfixed32Sfixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSfixed64Sfixed64() map[int64]int64 {
-	if x != nil {
-		return x.MapSfixed64Sfixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Float() map[int32]float32 {
-	if x != nil {
-		return x.MapInt32Float
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Double() map[int32]float64 {
-	if x != nil {
-		return x.MapInt32Double
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapBoolBool() map[bool]bool {
-	if x != nil {
-		return x.MapBoolBool
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringString() map[string]string {
-	if x != nil {
-		return x.MapStringString
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringBytes() map[string][]byte {
-	if x != nil {
-		return x.MapStringBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringNestedMessage() map[string]*TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.MapStringNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringNestedEnum() map[string]TestAllTypes_NestedEnum {
-	if x != nil {
-		return x.MapStringNestedEnum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetDefaultInt32() int32 {
-	if x != nil && x.DefaultInt32 != nil {
-		return *x.DefaultInt32
-	}
-	return Default_TestAllTypes_DefaultInt32
-}
-
-func (x *TestAllTypes) GetDefaultInt64() int64 {
-	if x != nil && x.DefaultInt64 != nil {
-		return *x.DefaultInt64
-	}
-	return Default_TestAllTypes_DefaultInt64
-}
-
-func (x *TestAllTypes) GetDefaultUint32() uint32 {
-	if x != nil && x.DefaultUint32 != nil {
-		return *x.DefaultUint32
-	}
-	return Default_TestAllTypes_DefaultUint32
-}
-
-func (x *TestAllTypes) GetDefaultUint64() uint64 {
-	if x != nil && x.DefaultUint64 != nil {
-		return *x.DefaultUint64
-	}
-	return Default_TestAllTypes_DefaultUint64
-}
-
-func (x *TestAllTypes) GetDefaultSint32() int32 {
-	if x != nil && x.DefaultSint32 != nil {
-		return *x.DefaultSint32
-	}
-	return Default_TestAllTypes_DefaultSint32
-}
-
-func (x *TestAllTypes) GetDefaultSint64() int64 {
-	if x != nil && x.DefaultSint64 != nil {
-		return *x.DefaultSint64
-	}
-	return Default_TestAllTypes_DefaultSint64
-}
-
-func (x *TestAllTypes) GetDefaultFixed32() uint32 {
-	if x != nil && x.DefaultFixed32 != nil {
-		return *x.DefaultFixed32
-	}
-	return Default_TestAllTypes_DefaultFixed32
-}
-
-func (x *TestAllTypes) GetDefaultFixed64() uint64 {
-	if x != nil && x.DefaultFixed64 != nil {
-		return *x.DefaultFixed64
-	}
-	return Default_TestAllTypes_DefaultFixed64
-}
-
-func (x *TestAllTypes) GetDefaultSfixed32() int32 {
-	if x != nil && x.DefaultSfixed32 != nil {
-		return *x.DefaultSfixed32
-	}
-	return Default_TestAllTypes_DefaultSfixed32
-}
-
-func (x *TestAllTypes) GetDefaultSfixed64() int64 {
-	if x != nil && x.DefaultSfixed64 != nil {
-		return *x.DefaultSfixed64
-	}
-	return Default_TestAllTypes_DefaultSfixed64
-}
-
-func (x *TestAllTypes) GetDefaultFloat() float32 {
-	if x != nil && x.DefaultFloat != nil {
-		return *x.DefaultFloat
-	}
-	return Default_TestAllTypes_DefaultFloat
-}
-
-func (x *TestAllTypes) GetDefaultDouble() float64 {
-	if x != nil && x.DefaultDouble != nil {
-		return *x.DefaultDouble
-	}
-	return Default_TestAllTypes_DefaultDouble
-}
-
-func (x *TestAllTypes) GetDefaultBool() bool {
-	if x != nil && x.DefaultBool != nil {
-		return *x.DefaultBool
-	}
-	return Default_TestAllTypes_DefaultBool
-}
-
-func (x *TestAllTypes) GetDefaultString() string {
-	if x != nil && x.DefaultString != nil {
-		return *x.DefaultString
-	}
-	return Default_TestAllTypes_DefaultString
-}
-
-func (x *TestAllTypes) GetDefaultBytes() []byte {
-	if x != nil && x.DefaultBytes != nil {
-		return x.DefaultBytes
-	}
-	return append([]byte(nil), Default_TestAllTypes_DefaultBytes...)
-}
-
-func (x *TestAllTypes) GetDefaultNestedEnum() TestAllTypes_NestedEnum {
-	if x != nil && x.DefaultNestedEnum != nil {
-		return *x.DefaultNestedEnum
-	}
-	return Default_TestAllTypes_DefaultNestedEnum
-}
-
-func (x *TestAllTypes) GetDefaultForeignEnum() ForeignEnum {
-	if x != nil && x.DefaultForeignEnum != nil {
-		return *x.DefaultForeignEnum
-	}
-	return Default_TestAllTypes_DefaultForeignEnum
-}
-
-func (m *TestAllTypes) GetOneofField() isTestAllTypes_OneofField {
-	if m != nil {
-		return m.OneofField
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofUint32() uint32 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofNestedMessage() *TestAllTypes_NestedMessage {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofNestedMessage); ok {
-		return x.OneofNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofString() string {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (x *TestAllTypes) GetOneofBytes() []byte {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofBool() bool {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (x *TestAllTypes) GetOneofUint64() uint64 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofFloat() float32 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofDouble() float64 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofEnum() TestAllTypes_NestedEnum {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofEnum); ok {
-		return x.OneofEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (x *TestAllTypes) GetOneofgroup() *TestAllTypes_OneofGroup {
-	if x, ok := x.GetOneofField().(*TestAllTypes_Oneofgroup); ok {
-		return x.Oneofgroup
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOneofOptional() isTestAllTypes_OneofOptional {
-	if m != nil {
-		return m.OneofOptional
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofOptionalUint32() uint32 {
-	if x, ok := x.GetOneofOptional().(*TestAllTypes_OneofOptionalUint32); ok {
-		return x.OneofOptionalUint32
-	}
-	return 0
-}
-
-type isTestAllTypes_OneofField interface {
-	isTestAllTypes_OneofField()
-}
-
-type TestAllTypes_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,111,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-
-type TestAllTypes_OneofNestedMessage struct {
-	OneofNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,112,opt,name=oneof_nested_message,json=oneofNestedMessage,oneof"`
-}
-
-type TestAllTypes_OneofString struct {
-	OneofString string `protobuf:"bytes,113,opt,name=oneof_string,json=oneofString,oneof"`
-}
-
-type TestAllTypes_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,oneof"`
-}
-
-type TestAllTypes_OneofBool struct {
-	OneofBool bool `protobuf:"varint,115,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-
-type TestAllTypes_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,116,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-
-type TestAllTypes_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,117,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-
-type TestAllTypes_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,118,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-
-type TestAllTypes_OneofEnum struct {
-	OneofEnum TestAllTypes_NestedEnum `protobuf:"varint,119,opt,name=oneof_enum,json=oneofEnum,enum=goproto.proto.test.TestAllTypes_NestedEnum,oneof"`
-}
-
-type TestAllTypes_Oneofgroup struct {
-	Oneofgroup *TestAllTypes_OneofGroup `protobuf:"group,121,opt,name=OneofGroup,json=oneofgroup,oneof"`
-}
-
-func (*TestAllTypes_OneofUint32) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofNestedMessage) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofString) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofBytes) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofBool) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofUint64) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofFloat) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofDouble) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_Oneofgroup) isTestAllTypes_OneofField() {}
-
-type isTestAllTypes_OneofOptional interface {
-	isTestAllTypes_OneofOptional()
-}
-
-type TestAllTypes_OneofOptionalUint32 struct {
-	OneofOptionalUint32 uint32 `protobuf:"varint,120,opt,name=oneof_optional_uint32,json=oneofOptionalUint32,oneof"`
-}
-
-func (*TestAllTypes_OneofOptionalUint32) isTestAllTypes_OneofOptional() {}
-
-// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-type TestDeprecatedMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-	DeprecatedInt32 *int32 `protobuf:"varint,1,opt,name=deprecated_int32,json=deprecatedInt32" json:"deprecated_int32,omitempty"`
-	// Types that are assignable to DeprecatedOneof:
-	//
-	//	*TestDeprecatedMessage_DeprecatedOneofField
-	DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
-}
-
-func (x *TestDeprecatedMessage) Reset() {
-	*x = TestDeprecatedMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestDeprecatedMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestDeprecatedMessage) ProtoMessage() {}
-
-func (x *TestDeprecatedMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestDeprecatedMessage.ProtoReflect.Descriptor instead.
-func (*TestDeprecatedMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{1}
-}
-
-// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-func (x *TestDeprecatedMessage) GetDeprecatedInt32() int32 {
-	if x != nil && x.DeprecatedInt32 != nil {
-		return *x.DeprecatedInt32
-	}
-	return 0
-}
-
-func (m *TestDeprecatedMessage) GetDeprecatedOneof() isTestDeprecatedMessage_DeprecatedOneof {
-	if m != nil {
-		return m.DeprecatedOneof
-	}
-	return nil
-}
-
-// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-func (x *TestDeprecatedMessage) GetDeprecatedOneofField() int32 {
-	if x, ok := x.GetDeprecatedOneof().(*TestDeprecatedMessage_DeprecatedOneofField); ok {
-		return x.DeprecatedOneofField
-	}
-	return 0
-}
-
-type isTestDeprecatedMessage_DeprecatedOneof interface {
-	isTestDeprecatedMessage_DeprecatedOneof()
-}
-
-type TestDeprecatedMessage_DeprecatedOneofField struct {
-	// Deprecated: Marked as deprecated in internal/testprotos/test/test.proto.
-	DeprecatedOneofField int32 `protobuf:"varint,2,opt,name=deprecated_oneof_field,json=deprecatedOneofField,oneof"`
-}
-
-func (*TestDeprecatedMessage_DeprecatedOneofField) isTestDeprecatedMessage_DeprecatedOneof() {}
-
-type ForeignMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
-	D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
-}
-
-func (x *ForeignMessage) Reset() {
-	*x = ForeignMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ForeignMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ForeignMessage) ProtoMessage() {}
-
-func (x *ForeignMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ForeignMessage.ProtoReflect.Descriptor instead.
-func (*ForeignMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ForeignMessage) GetC() int32 {
-	if x != nil && x.C != nil {
-		return *x.C
-	}
-	return 0
-}
-
-func (x *ForeignMessage) GetD() int32 {
-	if x != nil && x.D != nil {
-		return *x.D
-	}
-	return 0
-}
-
-type TestReservedFields struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *TestReservedFields) Reset() {
-	*x = TestReservedFields{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestReservedFields) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestReservedFields) ProtoMessage() {}
-
-func (x *TestReservedFields) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestReservedFields.ProtoReflect.Descriptor instead.
-func (*TestReservedFields) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{3}
-}
-
-type TestAllExtensions struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *TestAllExtensions) Reset() {
-	*x = TestAllExtensions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllExtensions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllExtensions) ProtoMessage() {}
-
-func (x *TestAllExtensions) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllExtensions.ProtoReflect.Descriptor instead.
-func (*TestAllExtensions) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{4}
-}
-
-type OptionalGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A                     *int32                           `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
-	SameFieldNumber       *int32                           `protobuf:"varint,16,opt,name=same_field_number,json=sameFieldNumber" json:"same_field_number,omitempty"`
-	OptionalNestedMessage *TestAllExtensions_NestedMessage `protobuf:"bytes,1000,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-}
-
-func (x *OptionalGroup) Reset() {
-	*x = OptionalGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OptionalGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OptionalGroup) ProtoMessage() {}
-
-func (x *OptionalGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OptionalGroup.ProtoReflect.Descriptor instead.
-func (*OptionalGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *OptionalGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *OptionalGroup) GetSameFieldNumber() int32 {
-	if x != nil && x.SameFieldNumber != nil {
-		return *x.SameFieldNumber
-	}
-	return 0
-}
-
-func (x *OptionalGroup) GetOptionalNestedMessage() *TestAllExtensions_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-type RepeatedGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A                     *int32                           `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
-	OptionalNestedMessage *TestAllExtensions_NestedMessage `protobuf:"bytes,1001,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-}
-
-func (x *RepeatedGroup) Reset() {
-	*x = RepeatedGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RepeatedGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RepeatedGroup) ProtoMessage() {}
-
-func (x *RepeatedGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RepeatedGroup.ProtoReflect.Descriptor instead.
-func (*RepeatedGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *RepeatedGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *RepeatedGroup) GetOptionalNestedMessage() *TestAllExtensions_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-type TestNestedExtension struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *TestNestedExtension) Reset() {
-	*x = TestNestedExtension{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestNestedExtension) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestNestedExtension) ProtoMessage() {}
-
-func (x *TestNestedExtension) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestNestedExtension.ProtoReflect.Descriptor instead.
-func (*TestNestedExtension) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{7}
-}
-
-type TestRequired struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
-}
-
-func (x *TestRequired) Reset() {
-	*x = TestRequired{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestRequired) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestRequired) ProtoMessage() {}
-
-func (x *TestRequired) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestRequired.ProtoReflect.Descriptor instead.
-func (*TestRequired) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *TestRequired) GetRequiredField() int32 {
-	if x != nil && x.RequiredField != nil {
-		return *x.RequiredField
-	}
-	return 0
-}
-
-type TestRequiredForeign struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptionalMessage *TestRequired           `protobuf:"bytes,1,opt,name=optional_message,json=optionalMessage" json:"optional_message,omitempty"`
-	RepeatedMessage []*TestRequired         `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"`
-	MapMessage      map[int32]*TestRequired `protobuf:"bytes,3,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Types that are assignable to OneofField:
-	//
-	//	*TestRequiredForeign_OneofMessage
-	OneofField isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
-}
-
-func (x *TestRequiredForeign) Reset() {
-	*x = TestRequiredForeign{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestRequiredForeign) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestRequiredForeign) ProtoMessage() {}
-
-func (x *TestRequiredForeign) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestRequiredForeign.ProtoReflect.Descriptor instead.
-func (*TestRequiredForeign) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *TestRequiredForeign) GetOptionalMessage() *TestRequired {
-	if x != nil {
-		return x.OptionalMessage
-	}
-	return nil
-}
-
-func (x *TestRequiredForeign) GetRepeatedMessage() []*TestRequired {
-	if x != nil {
-		return x.RepeatedMessage
-	}
-	return nil
-}
-
-func (x *TestRequiredForeign) GetMapMessage() map[int32]*TestRequired {
-	if x != nil {
-		return x.MapMessage
-	}
-	return nil
-}
-
-func (m *TestRequiredForeign) GetOneofField() isTestRequiredForeign_OneofField {
-	if m != nil {
-		return m.OneofField
-	}
-	return nil
-}
-
-func (x *TestRequiredForeign) GetOneofMessage() *TestRequired {
-	if x, ok := x.GetOneofField().(*TestRequiredForeign_OneofMessage); ok {
-		return x.OneofMessage
-	}
-	return nil
-}
-
-type isTestRequiredForeign_OneofField interface {
-	isTestRequiredForeign_OneofField()
-}
-
-type TestRequiredForeign_OneofMessage struct {
-	OneofMessage *TestRequired `protobuf:"bytes,4,opt,name=oneof_message,json=oneofMessage,oneof"`
-}
-
-func (*TestRequiredForeign_OneofMessage) isTestRequiredForeign_OneofField() {}
-
-type TestRequiredGroupFields struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Optionalgroup *TestRequiredGroupFields_OptionalGroup   `protobuf:"group,1,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	Repeatedgroup []*TestRequiredGroupFields_RepeatedGroup `protobuf:"group,3,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-}
-
-func (x *TestRequiredGroupFields) Reset() {
-	*x = TestRequiredGroupFields{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestRequiredGroupFields) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestRequiredGroupFields) ProtoMessage() {}
-
-func (x *TestRequiredGroupFields) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestRequiredGroupFields.ProtoReflect.Descriptor instead.
-func (*TestRequiredGroupFields) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *TestRequiredGroupFields) GetOptionalgroup() *TestRequiredGroupFields_OptionalGroup {
-	if x != nil {
-		return x.Optionalgroup
-	}
-	return nil
-}
-
-func (x *TestRequiredGroupFields) GetRepeatedgroup() []*TestRequiredGroupFields_RepeatedGroup {
-	if x != nil {
-		return x.Repeatedgroup
-	}
-	return nil
-}
-
-type TestWeak struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	weakFields    protoimpl.WeakFields
-	unknownFields protoimpl.UnknownFields
-
-	XXX_weak_WeakMessage1 struct{} `protobuf:"bytes,1,opt,name=weak_message1,json=weakMessage1,weak=goproto.proto.test.weak.WeakImportMessage1" json:"weak_message1,omitempty"`
-	XXX_weak_WeakMessage2 struct{} `protobuf:"bytes,2,opt,name=weak_message2,json=weakMessage2,weak=goproto.proto.test.weak.WeakImportMessage2" json:"weak_message2,omitempty"`
-}
-
-func (x *TestWeak) Reset() {
-	*x = TestWeak{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestWeak) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestWeak) ProtoMessage() {}
-
-func (x *TestWeak) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestWeak.ProtoReflect.Descriptor instead.
-func (*TestWeak) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *TestWeak) GetWeakMessage1() proto.Message {
-	var w protoimpl.WeakFields
-	if x != nil {
-		w = x.weakFields
-	}
-	return protoimpl.X.GetWeak(w, 1, "goproto.proto.test.weak.WeakImportMessage1")
-}
-
-func (x *TestWeak) GetWeakMessage2() proto.Message {
-	var w protoimpl.WeakFields
-	if x != nil {
-		w = x.weakFields
-	}
-	return protoimpl.X.GetWeak(w, 2, "goproto.proto.test.weak.WeakImportMessage2")
-}
-
-func (x *TestWeak) SetWeakMessage1(v proto.Message) {
-	var w *protoimpl.WeakFields
-	if x != nil {
-		w = &x.weakFields
-	}
-	protoimpl.X.SetWeak(w, 1, "goproto.proto.test.weak.WeakImportMessage1", v)
-}
-
-func (x *TestWeak) SetWeakMessage2(v proto.Message) {
-	var w *protoimpl.WeakFields
-	if x != nil {
-		w = &x.weakFields
-	}
-	protoimpl.X.SetWeak(w, 2, "goproto.proto.test.weak.WeakImportMessage2", v)
-}
-
-type TestPackedTypes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PackedInt32    []int32       `protobuf:"varint,90,rep,packed,name=packed_int32,json=packedInt32" json:"packed_int32,omitempty"`
-	PackedInt64    []int64       `protobuf:"varint,91,rep,packed,name=packed_int64,json=packedInt64" json:"packed_int64,omitempty"`
-	PackedUint32   []uint32      `protobuf:"varint,92,rep,packed,name=packed_uint32,json=packedUint32" json:"packed_uint32,omitempty"`
-	PackedUint64   []uint64      `protobuf:"varint,93,rep,packed,name=packed_uint64,json=packedUint64" json:"packed_uint64,omitempty"`
-	PackedSint32   []int32       `protobuf:"zigzag32,94,rep,packed,name=packed_sint32,json=packedSint32" json:"packed_sint32,omitempty"`
-	PackedSint64   []int64       `protobuf:"zigzag64,95,rep,packed,name=packed_sint64,json=packedSint64" json:"packed_sint64,omitempty"`
-	PackedFixed32  []uint32      `protobuf:"fixed32,96,rep,packed,name=packed_fixed32,json=packedFixed32" json:"packed_fixed32,omitempty"`
-	PackedFixed64  []uint64      `protobuf:"fixed64,97,rep,packed,name=packed_fixed64,json=packedFixed64" json:"packed_fixed64,omitempty"`
-	PackedSfixed32 []int32       `protobuf:"fixed32,98,rep,packed,name=packed_sfixed32,json=packedSfixed32" json:"packed_sfixed32,omitempty"`
-	PackedSfixed64 []int64       `protobuf:"fixed64,99,rep,packed,name=packed_sfixed64,json=packedSfixed64" json:"packed_sfixed64,omitempty"`
-	PackedFloat    []float32     `protobuf:"fixed32,100,rep,packed,name=packed_float,json=packedFloat" json:"packed_float,omitempty"`
-	PackedDouble   []float64     `protobuf:"fixed64,101,rep,packed,name=packed_double,json=packedDouble" json:"packed_double,omitempty"`
-	PackedBool     []bool        `protobuf:"varint,102,rep,packed,name=packed_bool,json=packedBool" json:"packed_bool,omitempty"`
-	PackedEnum     []ForeignEnum `protobuf:"varint,103,rep,packed,name=packed_enum,json=packedEnum,enum=goproto.proto.test.ForeignEnum" json:"packed_enum,omitempty"`
-}
-
-func (x *TestPackedTypes) Reset() {
-	*x = TestPackedTypes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestPackedTypes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestPackedTypes) ProtoMessage() {}
-
-func (x *TestPackedTypes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestPackedTypes.ProtoReflect.Descriptor instead.
-func (*TestPackedTypes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *TestPackedTypes) GetPackedInt32() []int32 {
-	if x != nil {
-		return x.PackedInt32
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedInt64() []int64 {
-	if x != nil {
-		return x.PackedInt64
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedUint32() []uint32 {
-	if x != nil {
-		return x.PackedUint32
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedUint64() []uint64 {
-	if x != nil {
-		return x.PackedUint64
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedSint32() []int32 {
-	if x != nil {
-		return x.PackedSint32
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedSint64() []int64 {
-	if x != nil {
-		return x.PackedSint64
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedFixed32() []uint32 {
-	if x != nil {
-		return x.PackedFixed32
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedFixed64() []uint64 {
-	if x != nil {
-		return x.PackedFixed64
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedSfixed32() []int32 {
-	if x != nil {
-		return x.PackedSfixed32
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedSfixed64() []int64 {
-	if x != nil {
-		return x.PackedSfixed64
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedFloat() []float32 {
-	if x != nil {
-		return x.PackedFloat
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedDouble() []float64 {
-	if x != nil {
-		return x.PackedDouble
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedBool() []bool {
-	if x != nil {
-		return x.PackedBool
-	}
-	return nil
-}
-
-func (x *TestPackedTypes) GetPackedEnum() []ForeignEnum {
-	if x != nil {
-		return x.PackedEnum
-	}
-	return nil
-}
-
-type TestUnpackedTypes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UnpackedInt32    []int32       `protobuf:"varint,90,rep,name=unpacked_int32,json=unpackedInt32" json:"unpacked_int32,omitempty"`
-	UnpackedInt64    []int64       `protobuf:"varint,91,rep,name=unpacked_int64,json=unpackedInt64" json:"unpacked_int64,omitempty"`
-	UnpackedUint32   []uint32      `protobuf:"varint,92,rep,name=unpacked_uint32,json=unpackedUint32" json:"unpacked_uint32,omitempty"`
-	UnpackedUint64   []uint64      `protobuf:"varint,93,rep,name=unpacked_uint64,json=unpackedUint64" json:"unpacked_uint64,omitempty"`
-	UnpackedSint32   []int32       `protobuf:"zigzag32,94,rep,name=unpacked_sint32,json=unpackedSint32" json:"unpacked_sint32,omitempty"`
-	UnpackedSint64   []int64       `protobuf:"zigzag64,95,rep,name=unpacked_sint64,json=unpackedSint64" json:"unpacked_sint64,omitempty"`
-	UnpackedFixed32  []uint32      `protobuf:"fixed32,96,rep,name=unpacked_fixed32,json=unpackedFixed32" json:"unpacked_fixed32,omitempty"`
-	UnpackedFixed64  []uint64      `protobuf:"fixed64,97,rep,name=unpacked_fixed64,json=unpackedFixed64" json:"unpacked_fixed64,omitempty"`
-	UnpackedSfixed32 []int32       `protobuf:"fixed32,98,rep,name=unpacked_sfixed32,json=unpackedSfixed32" json:"unpacked_sfixed32,omitempty"`
-	UnpackedSfixed64 []int64       `protobuf:"fixed64,99,rep,name=unpacked_sfixed64,json=unpackedSfixed64" json:"unpacked_sfixed64,omitempty"`
-	UnpackedFloat    []float32     `protobuf:"fixed32,100,rep,name=unpacked_float,json=unpackedFloat" json:"unpacked_float,omitempty"`
-	UnpackedDouble   []float64     `protobuf:"fixed64,101,rep,name=unpacked_double,json=unpackedDouble" json:"unpacked_double,omitempty"`
-	UnpackedBool     []bool        `protobuf:"varint,102,rep,name=unpacked_bool,json=unpackedBool" json:"unpacked_bool,omitempty"`
-	UnpackedEnum     []ForeignEnum `protobuf:"varint,103,rep,name=unpacked_enum,json=unpackedEnum,enum=goproto.proto.test.ForeignEnum" json:"unpacked_enum,omitempty"`
-}
-
-func (x *TestUnpackedTypes) Reset() {
-	*x = TestUnpackedTypes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestUnpackedTypes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestUnpackedTypes) ProtoMessage() {}
-
-func (x *TestUnpackedTypes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestUnpackedTypes.ProtoReflect.Descriptor instead.
-func (*TestUnpackedTypes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *TestUnpackedTypes) GetUnpackedInt32() []int32 {
-	if x != nil {
-		return x.UnpackedInt32
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedInt64() []int64 {
-	if x != nil {
-		return x.UnpackedInt64
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedUint32() []uint32 {
-	if x != nil {
-		return x.UnpackedUint32
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedUint64() []uint64 {
-	if x != nil {
-		return x.UnpackedUint64
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedSint32() []int32 {
-	if x != nil {
-		return x.UnpackedSint32
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedSint64() []int64 {
-	if x != nil {
-		return x.UnpackedSint64
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedFixed32() []uint32 {
-	if x != nil {
-		return x.UnpackedFixed32
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedFixed64() []uint64 {
-	if x != nil {
-		return x.UnpackedFixed64
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedSfixed32() []int32 {
-	if x != nil {
-		return x.UnpackedSfixed32
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedSfixed64() []int64 {
-	if x != nil {
-		return x.UnpackedSfixed64
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedFloat() []float32 {
-	if x != nil {
-		return x.UnpackedFloat
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedDouble() []float64 {
-	if x != nil {
-		return x.UnpackedDouble
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedBool() []bool {
-	if x != nil {
-		return x.UnpackedBool
-	}
-	return nil
-}
-
-func (x *TestUnpackedTypes) GetUnpackedEnum() []ForeignEnum {
-	if x != nil {
-		return x.UnpackedEnum
-	}
-	return nil
-}
-
-type TestPackedExtensions struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *TestPackedExtensions) Reset() {
-	*x = TestPackedExtensions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestPackedExtensions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestPackedExtensions) ProtoMessage() {}
-
-func (x *TestPackedExtensions) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestPackedExtensions.ProtoReflect.Descriptor instead.
-func (*TestPackedExtensions) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{14}
-}
-
-type TestUnpackedExtensions struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *TestUnpackedExtensions) Reset() {
-	*x = TestUnpackedExtensions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestUnpackedExtensions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestUnpackedExtensions) ProtoMessage() {}
-
-func (x *TestUnpackedExtensions) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestUnpackedExtensions.ProtoReflect.Descriptor instead.
-func (*TestUnpackedExtensions) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{15}
-}
-
-// Test that RPC services work.
-type FooRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *FooRequest) Reset() {
-	*x = FooRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FooRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FooRequest) ProtoMessage() {}
-
-func (x *FooRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FooRequest.ProtoReflect.Descriptor instead.
-func (*FooRequest) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{16}
-}
-
-type FooResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *FooResponse) Reset() {
-	*x = FooResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FooResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FooResponse) ProtoMessage() {}
-
-func (x *FooResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FooResponse.ProtoReflect.Descriptor instead.
-func (*FooResponse) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{17}
-}
-
-type WeirdDefault struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	WeirdDefault []byte `protobuf:"bytes,1,opt,name=weird_default,json=weirdDefault,def=hello, \\\"world!\\\"\\ndead\\336\\255\\276\\357beef\x60" json:"weird_default,omitempty"`
-}
-
-// Default values for WeirdDefault fields.
-var (
-	Default_WeirdDefault_WeirdDefault = []byte("hello, \"world!\"\ndeadޭ\xbe\xefbeef`")
-)
-
-func (x *WeirdDefault) Reset() {
-	*x = WeirdDefault{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WeirdDefault) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WeirdDefault) ProtoMessage() {}
-
-func (x *WeirdDefault) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WeirdDefault.ProtoReflect.Descriptor instead.
-func (*WeirdDefault) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{18}
-}
-
-func (x *WeirdDefault) GetWeirdDefault() []byte {
-	if x != nil && x.WeirdDefault != nil {
-		return x.WeirdDefault
-	}
-	return append([]byte(nil), Default_WeirdDefault_WeirdDefault...)
-}
-
-type RemoteDefault struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Default     *enums.Enum `protobuf:"varint,1,opt,name=default,enum=goproto.proto.enums.Enum" json:"default,omitempty"`
-	Zero        *enums.Enum `protobuf:"varint,2,opt,name=zero,enum=goproto.proto.enums.Enum,def=0" json:"zero,omitempty"`
-	One         *enums.Enum `protobuf:"varint,3,opt,name=one,enum=goproto.proto.enums.Enum,def=1" json:"one,omitempty"`
-	Elevent     *enums.Enum `protobuf:"varint,4,opt,name=elevent,enum=goproto.proto.enums.Enum,def=11" json:"elevent,omitempty"`
-	Seventeen   *enums.Enum `protobuf:"varint,5,opt,name=seventeen,enum=goproto.proto.enums.Enum,def=17" json:"seventeen,omitempty"`
-	Thirtyseven *enums.Enum `protobuf:"varint,6,opt,name=thirtyseven,enum=goproto.proto.enums.Enum,def=37" json:"thirtyseven,omitempty"`
-	Sixtyseven  *enums.Enum `protobuf:"varint,7,opt,name=sixtyseven,enum=goproto.proto.enums.Enum,def=67" json:"sixtyseven,omitempty"`
-	Negative    *enums.Enum `protobuf:"varint,8,opt,name=negative,enum=goproto.proto.enums.Enum,def=-1" json:"negative,omitempty"`
-}
-
-// Default values for RemoteDefault fields.
-const (
-	Default_RemoteDefault_Zero        = enums.Enum(0)  // enums.Enum_ZERO
-	Default_RemoteDefault_One         = enums.Enum(1)  // enums.Enum_ONE
-	Default_RemoteDefault_Elevent     = enums.Enum(11) // enums.Enum_ELEVENT
-	Default_RemoteDefault_Seventeen   = enums.Enum(17) // enums.Enum_SEVENTEEN
-	Default_RemoteDefault_Thirtyseven = enums.Enum(37) // enums.Enum_THIRTYSEVEN
-	Default_RemoteDefault_Sixtyseven  = enums.Enum(67) // enums.Enum_SIXTYSEVEN
-	Default_RemoteDefault_Negative    = enums.Enum(-1) // enums.Enum_NEGATIVE
-)
-
-func (x *RemoteDefault) Reset() {
-	*x = RemoteDefault{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RemoteDefault) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoteDefault) ProtoMessage() {}
-
-func (x *RemoteDefault) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoteDefault.ProtoReflect.Descriptor instead.
-func (*RemoteDefault) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{19}
-}
-
-func (x *RemoteDefault) GetDefault() enums.Enum {
-	if x != nil && x.Default != nil {
-		return *x.Default
-	}
-	return enums.Enum(1337)
-}
-
-func (x *RemoteDefault) GetZero() enums.Enum {
-	if x != nil && x.Zero != nil {
-		return *x.Zero
-	}
-	return Default_RemoteDefault_Zero
-}
-
-func (x *RemoteDefault) GetOne() enums.Enum {
-	if x != nil && x.One != nil {
-		return *x.One
-	}
-	return Default_RemoteDefault_One
-}
-
-func (x *RemoteDefault) GetElevent() enums.Enum {
-	if x != nil && x.Elevent != nil {
-		return *x.Elevent
-	}
-	return Default_RemoteDefault_Elevent
-}
-
-func (x *RemoteDefault) GetSeventeen() enums.Enum {
-	if x != nil && x.Seventeen != nil {
-		return *x.Seventeen
-	}
-	return Default_RemoteDefault_Seventeen
-}
-
-func (x *RemoteDefault) GetThirtyseven() enums.Enum {
-	if x != nil && x.Thirtyseven != nil {
-		return *x.Thirtyseven
-	}
-	return Default_RemoteDefault_Thirtyseven
-}
-
-func (x *RemoteDefault) GetSixtyseven() enums.Enum {
-	if x != nil && x.Sixtyseven != nil {
-		return *x.Sixtyseven
-	}
-	return Default_RemoteDefault_Sixtyseven
-}
-
-func (x *RemoteDefault) GetNegative() enums.Enum {
-	if x != nil && x.Negative != nil {
-		return *x.Negative
-	}
-	return Default_RemoteDefault_Negative
-}
-
-type TestAllTypes_NestedMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A           *int32        `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
-}
-
-func (x *TestAllTypes_NestedMessage) Reset() {
-	*x = TestAllTypes_NestedMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes_NestedMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes_NestedMessage) ProtoMessage() {}
-
-func (x *TestAllTypes_NestedMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Descriptor instead.
-func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *TestAllTypes_NestedMessage) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *TestAllTypes_NestedMessage) GetCorecursive() *TestAllTypes {
-	if x != nil {
-		return x.Corecursive
-	}
-	return nil
-}
-
-type TestAllTypes_OptionalGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A                     *int32                      `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
-	OptionalNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,1000,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-	SameFieldNumber       *int32                      `protobuf:"varint,16,opt,name=same_field_number,json=sameFieldNumber" json:"same_field_number,omitempty"`
-}
-
-func (x *TestAllTypes_OptionalGroup) Reset() {
-	*x = TestAllTypes_OptionalGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes_OptionalGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes_OptionalGroup) ProtoMessage() {}
-
-func (x *TestAllTypes_OptionalGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes_OptionalGroup.ProtoReflect.Descriptor instead.
-func (*TestAllTypes_OptionalGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0, 1}
-}
-
-func (x *TestAllTypes_OptionalGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *TestAllTypes_OptionalGroup) GetOptionalNestedMessage() *TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes_OptionalGroup) GetSameFieldNumber() int32 {
-	if x != nil && x.SameFieldNumber != nil {
-		return *x.SameFieldNumber
-	}
-	return 0
-}
-
-type TestAllTypes_RepeatedGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A                     *int32                      `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
-	OptionalNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,1001,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-}
-
-func (x *TestAllTypes_RepeatedGroup) Reset() {
-	*x = TestAllTypes_RepeatedGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes_RepeatedGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes_RepeatedGroup) ProtoMessage() {}
-
-func (x *TestAllTypes_RepeatedGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes_RepeatedGroup.ProtoReflect.Descriptor instead.
-func (*TestAllTypes_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0, 2}
-}
-
-func (x *TestAllTypes_RepeatedGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *TestAllTypes_RepeatedGroup) GetOptionalNestedMessage() *TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-type TestAllTypes_OneofGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	B *int32 `protobuf:"varint,2,opt,name=b" json:"b,omitempty"`
-}
-
-func (x *TestAllTypes_OneofGroup) Reset() {
-	*x = TestAllTypes_OneofGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[40]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes_OneofGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes_OneofGroup) ProtoMessage() {}
-
-func (x *TestAllTypes_OneofGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[40]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes_OneofGroup.ProtoReflect.Descriptor instead.
-func (*TestAllTypes_OneofGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{0, 20}
-}
-
-func (x *TestAllTypes_OneofGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *TestAllTypes_OneofGroup) GetB() int32 {
-	if x != nil && x.B != nil {
-		return *x.B
-	}
-	return 0
-}
-
-type TestAllExtensions_NestedMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A           *int32             `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive *TestAllExtensions `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
-}
-
-func (x *TestAllExtensions_NestedMessage) Reset() {
-	*x = TestAllExtensions_NestedMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[41]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllExtensions_NestedMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllExtensions_NestedMessage) ProtoMessage() {}
-
-func (x *TestAllExtensions_NestedMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[41]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllExtensions_NestedMessage.ProtoReflect.Descriptor instead.
-func (*TestAllExtensions_NestedMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{4, 0}
-}
-
-func (x *TestAllExtensions_NestedMessage) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-func (x *TestAllExtensions_NestedMessage) GetCorecursive() *TestAllExtensions {
-	if x != nil {
-		return x.Corecursive
-	}
-	return nil
-}
-
-type TestRequiredGroupFields_OptionalGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
-}
-
-func (x *TestRequiredGroupFields_OptionalGroup) Reset() {
-	*x = TestRequiredGroupFields_OptionalGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[43]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestRequiredGroupFields_OptionalGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestRequiredGroupFields_OptionalGroup) ProtoMessage() {}
-
-func (x *TestRequiredGroupFields_OptionalGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[43]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestRequiredGroupFields_OptionalGroup.ProtoReflect.Descriptor instead.
-func (*TestRequiredGroupFields_OptionalGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{10, 0}
-}
-
-func (x *TestRequiredGroupFields_OptionalGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-type TestRequiredGroupFields_RepeatedGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
-}
-
-func (x *TestRequiredGroupFields_RepeatedGroup) Reset() {
-	*x = TestRequiredGroupFields_RepeatedGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_proto_msgTypes[44]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestRequiredGroupFields_RepeatedGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestRequiredGroupFields_RepeatedGroup) ProtoMessage() {}
-
-func (x *TestRequiredGroupFields_RepeatedGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_proto_msgTypes[44]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestRequiredGroupFields_RepeatedGroup.ProtoReflect.Descriptor instead.
-func (*TestRequiredGroupFields_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_proto_rawDescGZIP(), []int{10, 1}
-}
-
-func (x *TestRequiredGroupFields_RepeatedGroup) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-var file_internal_testprotos_test_test_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         1,
-		Name:          "goproto.proto.test.optional_int32",
-		Tag:           "varint,1,opt,name=optional_int32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         2,
-		Name:          "goproto.proto.test.optional_int64",
-		Tag:           "varint,2,opt,name=optional_int64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         3,
-		Name:          "goproto.proto.test.optional_uint32",
-		Tag:           "varint,3,opt,name=optional_uint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         4,
-		Name:          "goproto.proto.test.optional_uint64",
-		Tag:           "varint,4,opt,name=optional_uint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         5,
-		Name:          "goproto.proto.test.optional_sint32",
-		Tag:           "zigzag32,5,opt,name=optional_sint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         6,
-		Name:          "goproto.proto.test.optional_sint64",
-		Tag:           "zigzag64,6,opt,name=optional_sint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         7,
-		Name:          "goproto.proto.test.optional_fixed32",
-		Tag:           "fixed32,7,opt,name=optional_fixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         8,
-		Name:          "goproto.proto.test.optional_fixed64",
-		Tag:           "fixed64,8,opt,name=optional_fixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         9,
-		Name:          "goproto.proto.test.optional_sfixed32",
-		Tag:           "fixed32,9,opt,name=optional_sfixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         10,
-		Name:          "goproto.proto.test.optional_sfixed64",
-		Tag:           "fixed64,10,opt,name=optional_sfixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*float32)(nil),
-		Field:         11,
-		Name:          "goproto.proto.test.optional_float",
-		Tag:           "fixed32,11,opt,name=optional_float",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*float64)(nil),
-		Field:         12,
-		Name:          "goproto.proto.test.optional_double",
-		Tag:           "fixed64,12,opt,name=optional_double",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         13,
-		Name:          "goproto.proto.test.optional_bool",
-		Tag:           "varint,13,opt,name=optional_bool",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         14,
-		Name:          "goproto.proto.test.optional_string",
-		Tag:           "bytes,14,opt,name=optional_string",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]byte)(nil),
-		Field:         15,
-		Name:          "goproto.proto.test.optional_bytes",
-		Tag:           "bytes,15,opt,name=optional_bytes",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*OptionalGroup)(nil),
-		Field:         16,
-		Name:          "goproto.proto.test.optionalgroup",
-		Tag:           "group,16,opt,name=OptionalGroup",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*TestAllExtensions_NestedMessage)(nil),
-		Field:         18,
-		Name:          "goproto.proto.test.optional_nested_message",
-		Tag:           "bytes,18,opt,name=optional_nested_message",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*TestAllTypes_NestedEnum)(nil),
-		Field:         21,
-		Name:          "goproto.proto.test.optional_nested_enum",
-		Tag:           "varint,21,opt,name=optional_nested_enum,enum=goproto.proto.test.TestAllTypes_NestedEnum",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         31,
-		Name:          "goproto.proto.test.repeated_int32",
-		Tag:           "varint,31,rep,name=repeated_int32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         32,
-		Name:          "goproto.proto.test.repeated_int64",
-		Tag:           "varint,32,rep,name=repeated_int64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         33,
-		Name:          "goproto.proto.test.repeated_uint32",
-		Tag:           "varint,33,rep,name=repeated_uint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         34,
-		Name:          "goproto.proto.test.repeated_uint64",
-		Tag:           "varint,34,rep,name=repeated_uint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         35,
-		Name:          "goproto.proto.test.repeated_sint32",
-		Tag:           "zigzag32,35,rep,name=repeated_sint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         36,
-		Name:          "goproto.proto.test.repeated_sint64",
-		Tag:           "zigzag64,36,rep,name=repeated_sint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         37,
-		Name:          "goproto.proto.test.repeated_fixed32",
-		Tag:           "fixed32,37,rep,name=repeated_fixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         38,
-		Name:          "goproto.proto.test.repeated_fixed64",
-		Tag:           "fixed64,38,rep,name=repeated_fixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         39,
-		Name:          "goproto.proto.test.repeated_sfixed32",
-		Tag:           "fixed32,39,rep,name=repeated_sfixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         40,
-		Name:          "goproto.proto.test.repeated_sfixed64",
-		Tag:           "fixed64,40,rep,name=repeated_sfixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]float32)(nil),
-		Field:         41,
-		Name:          "goproto.proto.test.repeated_float",
-		Tag:           "fixed32,41,rep,name=repeated_float",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]float64)(nil),
-		Field:         42,
-		Name:          "goproto.proto.test.repeated_double",
-		Tag:           "fixed64,42,rep,name=repeated_double",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]bool)(nil),
-		Field:         43,
-		Name:          "goproto.proto.test.repeated_bool",
-		Tag:           "varint,43,rep,name=repeated_bool",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]string)(nil),
-		Field:         44,
-		Name:          "goproto.proto.test.repeated_string",
-		Tag:           "bytes,44,rep,name=repeated_string",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([][]byte)(nil),
-		Field:         45,
-		Name:          "goproto.proto.test.repeated_bytes",
-		Tag:           "bytes,45,rep,name=repeated_bytes",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]*RepeatedGroup)(nil),
-		Field:         46,
-		Name:          "goproto.proto.test.repeatedgroup",
-		Tag:           "group,46,rep,name=RepeatedGroup",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]*TestAllExtensions_NestedMessage)(nil),
-		Field:         48,
-		Name:          "goproto.proto.test.repeated_nested_message",
-		Tag:           "bytes,48,rep,name=repeated_nested_message",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]TestAllTypes_NestedEnum)(nil),
-		Field:         51,
-		Name:          "goproto.proto.test.repeated_nested_enum",
-		Tag:           "varint,51,rep,name=repeated_nested_enum,enum=goproto.proto.test.TestAllTypes_NestedEnum",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         81,
-		Name:          "goproto.proto.test.default_int32",
-		Tag:           "varint,81,opt,name=default_int32,def=81",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         82,
-		Name:          "goproto.proto.test.default_int64",
-		Tag:           "varint,82,opt,name=default_int64,def=82",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         83,
-		Name:          "goproto.proto.test.default_uint32",
-		Tag:           "varint,83,opt,name=default_uint32,def=83",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         84,
-		Name:          "goproto.proto.test.default_uint64",
-		Tag:           "varint,84,opt,name=default_uint64,def=84",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         85,
-		Name:          "goproto.proto.test.default_sint32",
-		Tag:           "zigzag32,85,opt,name=default_sint32,def=-85",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         86,
-		Name:          "goproto.proto.test.default_sint64",
-		Tag:           "zigzag64,86,opt,name=default_sint64,def=86",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         87,
-		Name:          "goproto.proto.test.default_fixed32",
-		Tag:           "fixed32,87,opt,name=default_fixed32,def=87",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         88,
-		Name:          "goproto.proto.test.default_fixed64",
-		Tag:           "fixed64,88,opt,name=default_fixed64,def=88",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         89,
-		Name:          "goproto.proto.test.default_sfixed32",
-		Tag:           "fixed32,89,opt,name=default_sfixed32,def=89",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         80,
-		Name:          "goproto.proto.test.default_sfixed64",
-		Tag:           "fixed64,80,opt,name=default_sfixed64,def=-90",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*float32)(nil),
-		Field:         91,
-		Name:          "goproto.proto.test.default_float",
-		Tag:           "fixed32,91,opt,name=default_float,def=91.5",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*float64)(nil),
-		Field:         92,
-		Name:          "goproto.proto.test.default_double",
-		Tag:           "fixed64,92,opt,name=default_double,def=92000",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         93,
-		Name:          "goproto.proto.test.default_bool",
-		Tag:           "varint,93,opt,name=default_bool,def=1",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         94,
-		Name:          "goproto.proto.test.default_string",
-		Tag:           "bytes,94,opt,name=default_string,def=hello",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]byte)(nil),
-		Field:         95,
-		Name:          "goproto.proto.test.default_bytes",
-		Tag:           "bytes,95,opt,name=default_bytes,def=world",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         90,
-		Name:          "goproto.proto.test.packed_int32",
-		Tag:           "varint,90,rep,packed,name=packed_int32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         91,
-		Name:          "goproto.proto.test.packed_int64",
-		Tag:           "varint,91,rep,packed,name=packed_int64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         92,
-		Name:          "goproto.proto.test.packed_uint32",
-		Tag:           "varint,92,rep,packed,name=packed_uint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         93,
-		Name:          "goproto.proto.test.packed_uint64",
-		Tag:           "varint,93,rep,packed,name=packed_uint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         94,
-		Name:          "goproto.proto.test.packed_sint32",
-		Tag:           "zigzag32,94,rep,packed,name=packed_sint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         95,
-		Name:          "goproto.proto.test.packed_sint64",
-		Tag:           "zigzag64,95,rep,packed,name=packed_sint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         96,
-		Name:          "goproto.proto.test.packed_fixed32",
-		Tag:           "fixed32,96,rep,packed,name=packed_fixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         97,
-		Name:          "goproto.proto.test.packed_fixed64",
-		Tag:           "fixed64,97,rep,packed,name=packed_fixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         98,
-		Name:          "goproto.proto.test.packed_sfixed32",
-		Tag:           "fixed32,98,rep,packed,name=packed_sfixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         99,
-		Name:          "goproto.proto.test.packed_sfixed64",
-		Tag:           "fixed64,99,rep,packed,name=packed_sfixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]float32)(nil),
-		Field:         100,
-		Name:          "goproto.proto.test.packed_float",
-		Tag:           "fixed32,100,rep,packed,name=packed_float",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]float64)(nil),
-		Field:         101,
-		Name:          "goproto.proto.test.packed_double",
-		Tag:           "fixed64,101,rep,packed,name=packed_double",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]bool)(nil),
-		Field:         102,
-		Name:          "goproto.proto.test.packed_bool",
-		Tag:           "varint,102,rep,packed,name=packed_bool",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestPackedExtensions)(nil),
-		ExtensionType: ([]ForeignEnum)(nil),
-		Field:         103,
-		Name:          "goproto.proto.test.packed_enum",
-		Tag:           "varint,103,rep,packed,name=packed_enum,enum=goproto.proto.test.ForeignEnum",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         90,
-		Name:          "goproto.proto.test.unpacked_int32",
-		Tag:           "varint,90,rep,name=unpacked_int32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         91,
-		Name:          "goproto.proto.test.unpacked_int64",
-		Tag:           "varint,91,rep,name=unpacked_int64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         92,
-		Name:          "goproto.proto.test.unpacked_uint32",
-		Tag:           "varint,92,rep,name=unpacked_uint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         93,
-		Name:          "goproto.proto.test.unpacked_uint64",
-		Tag:           "varint,93,rep,name=unpacked_uint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         94,
-		Name:          "goproto.proto.test.unpacked_sint32",
-		Tag:           "zigzag32,94,rep,name=unpacked_sint32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         95,
-		Name:          "goproto.proto.test.unpacked_sint64",
-		Tag:           "zigzag64,95,rep,name=unpacked_sint64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         96,
-		Name:          "goproto.proto.test.unpacked_fixed32",
-		Tag:           "fixed32,96,rep,name=unpacked_fixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]uint64)(nil),
-		Field:         97,
-		Name:          "goproto.proto.test.unpacked_fixed64",
-		Tag:           "fixed64,97,rep,name=unpacked_fixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int32)(nil),
-		Field:         98,
-		Name:          "goproto.proto.test.unpacked_sfixed32",
-		Tag:           "fixed32,98,rep,name=unpacked_sfixed32",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]int64)(nil),
-		Field:         99,
-		Name:          "goproto.proto.test.unpacked_sfixed64",
-		Tag:           "fixed64,99,rep,name=unpacked_sfixed64",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]float32)(nil),
-		Field:         100,
-		Name:          "goproto.proto.test.unpacked_float",
-		Tag:           "fixed32,100,rep,name=unpacked_float",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]float64)(nil),
-		Field:         101,
-		Name:          "goproto.proto.test.unpacked_double",
-		Tag:           "fixed64,101,rep,name=unpacked_double",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]bool)(nil),
-		Field:         102,
-		Name:          "goproto.proto.test.unpacked_bool",
-		Tag:           "varint,102,rep,name=unpacked_bool",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestUnpackedExtensions)(nil),
-		ExtensionType: ([]ForeignEnum)(nil),
-		Field:         103,
-		Name:          "goproto.proto.test.unpacked_enum",
-		Tag:           "varint,103,rep,name=unpacked_enum,enum=goproto.proto.test.ForeignEnum",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         1003,
-		Name:          "goproto.proto.test.TestNestedExtension.nested_string_extension",
-		Tag:           "bytes,1003,opt,name=nested_string_extension",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: (*TestRequired)(nil),
-		Field:         1000,
-		Name:          "goproto.proto.test.TestRequired.single",
-		Tag:           "bytes,1000,opt,name=single",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-	{
-		ExtendedType:  (*TestAllExtensions)(nil),
-		ExtensionType: ([]*TestRequired)(nil),
-		Field:         1001,
-		Name:          "goproto.proto.test.TestRequired.multi",
-		Tag:           "bytes,1001,rep,name=multi",
-		Filename:      "internal/testprotos/test/test.proto",
-	},
-}
-
-// Extension fields to TestAllExtensions.
-var (
-	// optional int32 optional_int32 = 1;
-	E_OptionalInt32 = &file_internal_testprotos_test_test_proto_extTypes[0]
-	// optional int64 optional_int64 = 2;
-	E_OptionalInt64 = &file_internal_testprotos_test_test_proto_extTypes[1]
-	// optional uint32 optional_uint32 = 3;
-	E_OptionalUint32 = &file_internal_testprotos_test_test_proto_extTypes[2]
-	// optional uint64 optional_uint64 = 4;
-	E_OptionalUint64 = &file_internal_testprotos_test_test_proto_extTypes[3]
-	// optional sint32 optional_sint32 = 5;
-	E_OptionalSint32 = &file_internal_testprotos_test_test_proto_extTypes[4]
-	// optional sint64 optional_sint64 = 6;
-	E_OptionalSint64 = &file_internal_testprotos_test_test_proto_extTypes[5]
-	// optional fixed32 optional_fixed32 = 7;
-	E_OptionalFixed32 = &file_internal_testprotos_test_test_proto_extTypes[6]
-	// optional fixed64 optional_fixed64 = 8;
-	E_OptionalFixed64 = &file_internal_testprotos_test_test_proto_extTypes[7]
-	// optional sfixed32 optional_sfixed32 = 9;
-	E_OptionalSfixed32 = &file_internal_testprotos_test_test_proto_extTypes[8]
-	// optional sfixed64 optional_sfixed64 = 10;
-	E_OptionalSfixed64 = &file_internal_testprotos_test_test_proto_extTypes[9]
-	// optional float optional_float = 11;
-	E_OptionalFloat = &file_internal_testprotos_test_test_proto_extTypes[10]
-	// optional double optional_double = 12;
-	E_OptionalDouble = &file_internal_testprotos_test_test_proto_extTypes[11]
-	// optional bool optional_bool = 13;
-	E_OptionalBool = &file_internal_testprotos_test_test_proto_extTypes[12]
-	// optional string optional_string = 14;
-	E_OptionalString = &file_internal_testprotos_test_test_proto_extTypes[13]
-	// optional bytes optional_bytes = 15;
-	E_OptionalBytes = &file_internal_testprotos_test_test_proto_extTypes[14]
-	// optional goproto.proto.test.OptionalGroup optionalgroup = 16;
-	E_Optionalgroup = &file_internal_testprotos_test_test_proto_extTypes[15]
-	// optional goproto.proto.test.TestAllExtensions.NestedMessage optional_nested_message = 18;
-	E_OptionalNestedMessage = &file_internal_testprotos_test_test_proto_extTypes[16]
-	// optional goproto.proto.test.TestAllTypes.NestedEnum optional_nested_enum = 21;
-	E_OptionalNestedEnum = &file_internal_testprotos_test_test_proto_extTypes[17]
-	// repeated int32 repeated_int32 = 31;
-	E_RepeatedInt32 = &file_internal_testprotos_test_test_proto_extTypes[18]
-	// repeated int64 repeated_int64 = 32;
-	E_RepeatedInt64 = &file_internal_testprotos_test_test_proto_extTypes[19]
-	// repeated uint32 repeated_uint32 = 33;
-	E_RepeatedUint32 = &file_internal_testprotos_test_test_proto_extTypes[20]
-	// repeated uint64 repeated_uint64 = 34;
-	E_RepeatedUint64 = &file_internal_testprotos_test_test_proto_extTypes[21]
-	// repeated sint32 repeated_sint32 = 35;
-	E_RepeatedSint32 = &file_internal_testprotos_test_test_proto_extTypes[22]
-	// repeated sint64 repeated_sint64 = 36;
-	E_RepeatedSint64 = &file_internal_testprotos_test_test_proto_extTypes[23]
-	// repeated fixed32 repeated_fixed32 = 37;
-	E_RepeatedFixed32 = &file_internal_testprotos_test_test_proto_extTypes[24]
-	// repeated fixed64 repeated_fixed64 = 38;
-	E_RepeatedFixed64 = &file_internal_testprotos_test_test_proto_extTypes[25]
-	// repeated sfixed32 repeated_sfixed32 = 39;
-	E_RepeatedSfixed32 = &file_internal_testprotos_test_test_proto_extTypes[26]
-	// repeated sfixed64 repeated_sfixed64 = 40;
-	E_RepeatedSfixed64 = &file_internal_testprotos_test_test_proto_extTypes[27]
-	// repeated float repeated_float = 41;
-	E_RepeatedFloat = &file_internal_testprotos_test_test_proto_extTypes[28]
-	// repeated double repeated_double = 42;
-	E_RepeatedDouble = &file_internal_testprotos_test_test_proto_extTypes[29]
-	// repeated bool repeated_bool = 43;
-	E_RepeatedBool = &file_internal_testprotos_test_test_proto_extTypes[30]
-	// repeated string repeated_string = 44;
-	E_RepeatedString = &file_internal_testprotos_test_test_proto_extTypes[31]
-	// repeated bytes repeated_bytes = 45;
-	E_RepeatedBytes = &file_internal_testprotos_test_test_proto_extTypes[32]
-	// repeated goproto.proto.test.RepeatedGroup repeatedgroup = 46;
-	E_Repeatedgroup = &file_internal_testprotos_test_test_proto_extTypes[33]
-	// repeated goproto.proto.test.TestAllExtensions.NestedMessage repeated_nested_message = 48;
-	E_RepeatedNestedMessage = &file_internal_testprotos_test_test_proto_extTypes[34]
-	// repeated goproto.proto.test.TestAllTypes.NestedEnum repeated_nested_enum = 51;
-	E_RepeatedNestedEnum = &file_internal_testprotos_test_test_proto_extTypes[35]
-	// optional int32 default_int32 = 81;
-	E_DefaultInt32 = &file_internal_testprotos_test_test_proto_extTypes[36]
-	// optional int64 default_int64 = 82;
-	E_DefaultInt64 = &file_internal_testprotos_test_test_proto_extTypes[37]
-	// optional uint32 default_uint32 = 83;
-	E_DefaultUint32 = &file_internal_testprotos_test_test_proto_extTypes[38]
-	// optional uint64 default_uint64 = 84;
-	E_DefaultUint64 = &file_internal_testprotos_test_test_proto_extTypes[39]
-	// optional sint32 default_sint32 = 85;
-	E_DefaultSint32 = &file_internal_testprotos_test_test_proto_extTypes[40]
-	// optional sint64 default_sint64 = 86;
-	E_DefaultSint64 = &file_internal_testprotos_test_test_proto_extTypes[41]
-	// optional fixed32 default_fixed32 = 87;
-	E_DefaultFixed32 = &file_internal_testprotos_test_test_proto_extTypes[42]
-	// optional fixed64 default_fixed64 = 88;
-	E_DefaultFixed64 = &file_internal_testprotos_test_test_proto_extTypes[43]
-	// optional sfixed32 default_sfixed32 = 89;
-	E_DefaultSfixed32 = &file_internal_testprotos_test_test_proto_extTypes[44]
-	// optional sfixed64 default_sfixed64 = 80;
-	E_DefaultSfixed64 = &file_internal_testprotos_test_test_proto_extTypes[45]
-	// optional float default_float = 91;
-	E_DefaultFloat = &file_internal_testprotos_test_test_proto_extTypes[46]
-	// optional double default_double = 92;
-	E_DefaultDouble = &file_internal_testprotos_test_test_proto_extTypes[47]
-	// optional bool default_bool = 93;
-	E_DefaultBool = &file_internal_testprotos_test_test_proto_extTypes[48]
-	// optional string default_string = 94;
-	E_DefaultString = &file_internal_testprotos_test_test_proto_extTypes[49]
-	// optional bytes default_bytes = 95;
-	E_DefaultBytes = &file_internal_testprotos_test_test_proto_extTypes[50]
-	// optional string nested_string_extension = 1003;
-	E_TestNestedExtension_NestedStringExtension = &file_internal_testprotos_test_test_proto_extTypes[79]
-	// optional goproto.proto.test.TestRequired single = 1000;
-	E_TestRequired_Single = &file_internal_testprotos_test_test_proto_extTypes[80]
-	// repeated goproto.proto.test.TestRequired multi = 1001;
-	E_TestRequired_Multi = &file_internal_testprotos_test_test_proto_extTypes[81]
-)
-
-// Extension fields to TestPackedExtensions.
-var (
-	// repeated int32 packed_int32 = 90;
-	E_PackedInt32 = &file_internal_testprotos_test_test_proto_extTypes[51]
-	// repeated int64 packed_int64 = 91;
-	E_PackedInt64 = &file_internal_testprotos_test_test_proto_extTypes[52]
-	// repeated uint32 packed_uint32 = 92;
-	E_PackedUint32 = &file_internal_testprotos_test_test_proto_extTypes[53]
-	// repeated uint64 packed_uint64 = 93;
-	E_PackedUint64 = &file_internal_testprotos_test_test_proto_extTypes[54]
-	// repeated sint32 packed_sint32 = 94;
-	E_PackedSint32 = &file_internal_testprotos_test_test_proto_extTypes[55]
-	// repeated sint64 packed_sint64 = 95;
-	E_PackedSint64 = &file_internal_testprotos_test_test_proto_extTypes[56]
-	// repeated fixed32 packed_fixed32 = 96;
-	E_PackedFixed32 = &file_internal_testprotos_test_test_proto_extTypes[57]
-	// repeated fixed64 packed_fixed64 = 97;
-	E_PackedFixed64 = &file_internal_testprotos_test_test_proto_extTypes[58]
-	// repeated sfixed32 packed_sfixed32 = 98;
-	E_PackedSfixed32 = &file_internal_testprotos_test_test_proto_extTypes[59]
-	// repeated sfixed64 packed_sfixed64 = 99;
-	E_PackedSfixed64 = &file_internal_testprotos_test_test_proto_extTypes[60]
-	// repeated float packed_float = 100;
-	E_PackedFloat = &file_internal_testprotos_test_test_proto_extTypes[61]
-	// repeated double packed_double = 101;
-	E_PackedDouble = &file_internal_testprotos_test_test_proto_extTypes[62]
-	// repeated bool packed_bool = 102;
-	E_PackedBool = &file_internal_testprotos_test_test_proto_extTypes[63]
-	// repeated goproto.proto.test.ForeignEnum packed_enum = 103;
-	E_PackedEnum = &file_internal_testprotos_test_test_proto_extTypes[64]
-)
-
-// Extension fields to TestUnpackedExtensions.
-var (
-	// repeated int32 unpacked_int32 = 90;
-	E_UnpackedInt32 = &file_internal_testprotos_test_test_proto_extTypes[65]
-	// repeated int64 unpacked_int64 = 91;
-	E_UnpackedInt64 = &file_internal_testprotos_test_test_proto_extTypes[66]
-	// repeated uint32 unpacked_uint32 = 92;
-	E_UnpackedUint32 = &file_internal_testprotos_test_test_proto_extTypes[67]
-	// repeated uint64 unpacked_uint64 = 93;
-	E_UnpackedUint64 = &file_internal_testprotos_test_test_proto_extTypes[68]
-	// repeated sint32 unpacked_sint32 = 94;
-	E_UnpackedSint32 = &file_internal_testprotos_test_test_proto_extTypes[69]
-	// repeated sint64 unpacked_sint64 = 95;
-	E_UnpackedSint64 = &file_internal_testprotos_test_test_proto_extTypes[70]
-	// repeated fixed32 unpacked_fixed32 = 96;
-	E_UnpackedFixed32 = &file_internal_testprotos_test_test_proto_extTypes[71]
-	// repeated fixed64 unpacked_fixed64 = 97;
-	E_UnpackedFixed64 = &file_internal_testprotos_test_test_proto_extTypes[72]
-	// repeated sfixed32 unpacked_sfixed32 = 98;
-	E_UnpackedSfixed32 = &file_internal_testprotos_test_test_proto_extTypes[73]
-	// repeated sfixed64 unpacked_sfixed64 = 99;
-	E_UnpackedSfixed64 = &file_internal_testprotos_test_test_proto_extTypes[74]
-	// repeated float unpacked_float = 100;
-	E_UnpackedFloat = &file_internal_testprotos_test_test_proto_extTypes[75]
-	// repeated double unpacked_double = 101;
-	E_UnpackedDouble = &file_internal_testprotos_test_test_proto_extTypes[76]
-	// repeated bool unpacked_bool = 102;
-	E_UnpackedBool = &file_internal_testprotos_test_test_proto_extTypes[77]
-	// repeated goproto.proto.test.ForeignEnum unpacked_enum = 103;
-	E_UnpackedEnum = &file_internal_testprotos_test_test_proto_extTypes[78]
-)
-
-var File_internal_testprotos_test_test_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test_test_proto_rawDesc = []byte{
-	0x0a, 0x23, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x65,
-	0x6e, 0x75, 0x6d, 0x73, 0x2f, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x2a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
-	0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2f, 0x77, 0x65, 0x61, 0x6b, 0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x65,
-	0x61, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2f, 0x77, 0x65, 0x61, 0x6b, 0x32, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x65,
-	0x61, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa5, 0x3a, 0x0a, 0x0c, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x11, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x06, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x10, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x08, 0x20, 0x01, 0x28, 0x06,
-	0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x12, 0x2b, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x10, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x2b,
-	0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x10, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x0a, 0x0e, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x02, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x0d, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x6f, 0x6f, 0x6c,
-	0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73,
-	0x12, 0x54, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0a, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x66, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5c,
-	0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6f,
-	0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x59, 0x0a, 0x17,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5d, 0x0a, 0x14, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18,
-	0x15, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e,
-	0x75, 0x6d, 0x52, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x53, 0x0a, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18,
-	0x16, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x13, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x50, 0x0a, 0x14, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x65,
-	0x6e, 0x75, 0x6d, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x49,
-	0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x25, 0x0a,
-	0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18,
-	0x1f, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x20, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x21,
-	0x20, 0x03, 0x28, 0x0d, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x22, 0x20, 0x03, 0x28, 0x04, 0x52, 0x0e, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a,
-	0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x18, 0x23, 0x20, 0x03, 0x28, 0x11, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x24, 0x20, 0x03, 0x28, 0x12, 0x52,
-	0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x29, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x18, 0x25, 0x20, 0x03, 0x28, 0x07, 0x52, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x26,
-	0x20, 0x03, 0x28, 0x06, 0x52, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x2b, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65,
-	0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x27, 0x20, 0x03, 0x28, 0x0f,
-	0x52, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x12, 0x2b, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x28, 0x20, 0x03, 0x28, 0x10, 0x52, 0x10, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12,
-	0x25, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x18, 0x29, 0x20, 0x03, 0x28, 0x02, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65,
-	0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x2a, 0x20, 0x03, 0x28, 0x01, 0x52,
-	0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12,
-	0x23, 0x0a, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x6f, 0x6f, 0x6c,
-	0x18, 0x2b, 0x20, 0x03, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x2c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x0a,
-	0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18,
-	0x2d, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x2e, 0x20, 0x03, 0x28, 0x0a, 0x32, 0x2e, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x52, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x66, 0x0a, 0x17, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x30, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x5c, 0x0a, 0x18, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x31,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x16, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x12, 0x58, 0x0a, 0x16, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70,
-	0x6f, 0x72, 0x74, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x32, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x21, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x52, 0x15, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6d, 0x70,
-	0x6f, 0x72, 0x74, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5d, 0x0a, 0x14, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e,
-	0x75, 0x6d, 0x18, 0x33, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x53, 0x0a, 0x15, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e,
-	0x75, 0x6d, 0x18, 0x34, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f,
-	0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x13, 0x72, 0x65, 0x70, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x4f,
-	0x0a, 0x13, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x35, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x6e, 0x75, 0x6d, 0x12,
-	0x5b, 0x0a, 0x0f, 0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x18, 0x38, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d,
-	0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x5b, 0x0a, 0x0f,
-	0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x39, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x36, 0x34,
-	0x49, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d, 0x61, 0x70, 0x49,
-	0x6e, 0x74, 0x36, 0x34, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x61, 0x0a, 0x11, 0x6d, 0x61, 0x70,
-	0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x3a,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70,
-	0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x61, 0x0a, 0x11,
-	0x6d, 0x61, 0x70, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x18, 0x3b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f,
-	0x6d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x61, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x73, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x18, 0x3c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70,
-	0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x61, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x3d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e,
-	0x4d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x67, 0x0a, 0x13, 0x6d, 0x61, 0x70, 0x5f, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x3e, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x46,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x6d, 0x61, 0x70,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x67,
-	0x0a, 0x13, 0x6d, 0x61, 0x70, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x5f, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x3f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61,
-	0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x6d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x6d, 0x0a, 0x15, 0x6d, 0x61, 0x70, 0x5f, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
-	0x18, 0x40, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x13, 0x6d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x53, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x6d, 0x0a, 0x15, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18,
-	0x41, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x13, 0x6d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x53, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x5b, 0x0a, 0x0f, 0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x42, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73,
-	0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x12, 0x5e, 0x0a, 0x10, 0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x43, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d,
-	0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x0e, 0x6d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x44, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x12, 0x55, 0x0a, 0x0d, 0x6d, 0x61, 0x70, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x62,
-	0x6f, 0x6f, 0x6c, 0x18, 0x44, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x42,
-	0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x61,
-	0x70, 0x42, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x61, 0x0a, 0x11, 0x6d, 0x61, 0x70,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x45,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5e, 0x0a, 0x10,
-	0x6d, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73,
-	0x18, 0x46, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6d, 0x61,
-	0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x77, 0x0a, 0x19,
-	0x6d, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x47, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65,
-	0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x16, 0x6d,
-	0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x6e, 0x0a, 0x16, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18,
-	0x49, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x13, 0x6d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x27, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x51, 0x20, 0x01, 0x28, 0x05, 0x3a, 0x02, 0x38, 0x31,
-	0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x27,
-	0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x52, 0x20, 0x01, 0x28, 0x03, 0x3a, 0x02, 0x38, 0x32, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x53, 0x20, 0x01, 0x28, 0x0d, 0x3a,
-	0x02, 0x38, 0x33, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x55, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x29, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x75, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x18, 0x54, 0x20, 0x01, 0x28, 0x04, 0x3a, 0x02, 0x38, 0x34, 0x52, 0x0d,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x2a, 0x0a,
-	0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18,
-	0x55, 0x20, 0x01, 0x28, 0x11, 0x3a, 0x03, 0x2d, 0x38, 0x35, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x0e, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x56, 0x20, 0x01, 0x28,
-	0x12, 0x3a, 0x02, 0x38, 0x36, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x12, 0x2b, 0x0a, 0x0f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x57, 0x20, 0x01, 0x28, 0x07, 0x3a, 0x02, 0x38,
-	0x37, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33,
-	0x32, 0x12, 0x2b, 0x0a, 0x0f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x18, 0x58, 0x20, 0x01, 0x28, 0x06, 0x3a, 0x02, 0x38, 0x38, 0x52, 0x0e,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x2d,
-	0x0a, 0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x18, 0x59, 0x20, 0x01, 0x28, 0x0f, 0x3a, 0x02, 0x38, 0x39, 0x52, 0x0f, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x2e, 0x0a,
-	0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x18, 0x50, 0x20, 0x01, 0x28, 0x10, 0x3a, 0x03, 0x2d, 0x39, 0x30, 0x52, 0x0f, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x29, 0x0a,
-	0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x5b,
-	0x20, 0x01, 0x28, 0x02, 0x3a, 0x04, 0x39, 0x31, 0x2e, 0x35, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x2c, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x5c, 0x20, 0x01, 0x28, 0x01,
-	0x3a, 0x05, 0x39, 0x32, 0x30, 0x30, 0x30, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x27, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x5d, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x04, 0x74, 0x72,
-	0x75, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12,
-	0x2c, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x18, 0x5e, 0x20, 0x01, 0x28, 0x09, 0x3a, 0x05, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x0d,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a,
-	0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x5f,
-	0x20, 0x01, 0x28, 0x0c, 0x3a, 0x05, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x52, 0x0c, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x13, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d,
-	0x18, 0x60, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45,
-	0x6e, 0x75, 0x6d, 0x3a, 0x03, 0x42, 0x41, 0x52, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x5e, 0x0a, 0x14, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65,
-	0x6e, 0x75, 0x6d, 0x18, 0x61, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x0b, 0x46, 0x4f, 0x52, 0x45,
-	0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x52, 0x52, 0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x23, 0x0a, 0x0c, 0x6f,
-	0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x6f, 0x20, 0x01, 0x28,
-	0x0d, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x12, 0x62, 0x0a, 0x14, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x70, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73,
-	0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x00,
-	0x52, 0x12, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x18, 0x71, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e,
-	0x65, 0x6f, 0x66, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x21, 0x0a, 0x0b, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x72, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00,
-	0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0a,
-	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x73, 0x20, 0x01, 0x28, 0x08,
-	0x48, 0x00, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x23, 0x0a,
-	0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x74, 0x20,
-	0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x55, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x12, 0x21, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x18, 0x75, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
-	0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x23, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x64,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x76, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x6f,
-	0x6e, 0x65, 0x6f, 0x66, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x4c, 0x0a, 0x0a, 0x6f, 0x6e,
-	0x65, 0x6f, 0x66, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x77, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73,
-	0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x09, 0x6f,
-	0x6e, 0x65, 0x6f, 0x66, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x4d, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f,
-	0x66, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x79, 0x20, 0x01, 0x28, 0x0a, 0x32, 0x2b, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4f,
-	0x6e, 0x65, 0x6f, 0x66, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x34, 0x0a, 0x15, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x18, 0x78, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01, 0x52, 0x13, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x1a, 0x61, 0x0a,
-	0x0d, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0c,
-	0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x42, 0x0a, 0x0b,
-	0x63, 0x6f, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79,
-	0x70, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65,
-	0x1a, 0xb2, 0x01, 0x0a, 0x0d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61,
-	0x12, 0x67, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0xe8, 0x07, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x61, 0x6d,
-	0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x73, 0x61, 0x6d, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x1a, 0x86, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x2f, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x67, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x40,
-	0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x40, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x49, 0x6e, 0x74, 0x36,
-	0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x55,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61,
-	0x70, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x11, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42,
-	0x0a, 0x14, 0x4d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x12, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x07, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x07, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x4d, 0x61, 0x70, 0x46,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x06, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46,
-	0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x53, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x10, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x10, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40,
-	0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x41, 0x0a, 0x13, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x44, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x4d, 0x61, 0x70, 0x42, 0x6f, 0x6f, 0x6c, 0x42, 0x6f,
-	0x6f, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x4d, 0x61, 0x70, 0x53, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x79, 0x0a, 0x1b, 0x4d, 0x61,
-	0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x73, 0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x41, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x28, 0x0a, 0x0a, 0x4f, 0x6e,
-	0x65, 0x6f, 0x66, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x0c, 0x0a, 0x01, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x01, 0x62, 0x22, 0x39, 0x0a, 0x0a, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e,
-	0x75, 0x6d, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x4f, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42,
-	0x41, 0x52, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x5a, 0x10, 0x02, 0x12, 0x10, 0x0a,
-	0x03, 0x4e, 0x45, 0x47, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x42,
-	0x0d, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x10,
-	0x0a, 0x0e, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x22, 0xc4, 0x01, 0x0a, 0x15, 0x54, 0x65, 0x73, 0x74, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x10, 0x64, 0x65,
-	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x3a, 0x0a, 0x16, 0x64, 0x65, 0x70,
-	0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x69,
-	0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x02, 0x18, 0x01, 0x48, 0x00, 0x52,
-	0x14, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x6e, 0x65, 0x6f, 0x66,
-	0x46, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x28, 0x0a, 0x0e, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
-	0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x0a, 0x44, 0x45, 0x50, 0x52, 0x45,
-	0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x00, 0x1a, 0x02, 0x08, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x3a,
-	0x02, 0x18, 0x01, 0x42, 0x12, 0x0a, 0x10, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x63, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x63, 0x12, 0x0c, 0x0a, 0x01, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x01, 0x64, 0x22, 0x30, 0x0a, 0x12, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x4a, 0x04, 0x08, 0x02, 0x10,
-	0x03, 0x4a, 0x04, 0x08, 0x0f, 0x10, 0x10, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0c, 0x52, 0x03, 0x62,
-	0x61, 0x72, 0x52, 0x03, 0x62, 0x61, 0x7a, 0x22, 0x85, 0x01, 0x0a, 0x11, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x66, 0x0a,
-	0x0d, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0c,
-	0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x47, 0x0a, 0x0b,
-	0x63, 0x6f, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x75,
-	0x72, 0x73, 0x69, 0x76, 0x65, 0x2a, 0x08, 0x08, 0x01, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22,
-	0xb7, 0x01, 0x0a, 0x0d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12,
-	0x2a, 0x0a, 0x11, 0x73, 0x61, 0x6d, 0x65, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x73, 0x61, 0x6d, 0x65,
-	0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x6c, 0x0a, 0x17, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x8b, 0x01, 0x0a, 0x0d, 0x52, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61,
-	0x18, 0x2f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x6c, 0x0a, 0x17, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x75, 0x0a, 0x13, 0x54, 0x65, 0x73, 0x74, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x5e,
-	0x0a, 0x17, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xf7,
-	0x01, 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12,
-	0x25, 0x0a, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x18, 0x01, 0x20, 0x02, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x32, 0x60, 0x0a, 0x06, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-	0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
-	0x52, 0x06, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x32, 0x5e, 0x0a, 0x05, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe9, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x64, 0x52, 0x05, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x22, 0xc2, 0x03, 0x0a, 0x13, 0x54, 0x65, 0x73,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e,
-	0x12, 0x4b, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x0f, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x4b, 0x0a,
-	0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x58, 0x0a, 0x0b, 0x6d, 0x61,
-	0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x37, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x64, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x2e, 0x4d, 0x61, 0x70, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x61, 0x70, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x47, 0x0a, 0x0d, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x48, 0x00, 0x52,
-	0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x5f, 0x0a,
-	0x0f, 0x4d, 0x61, 0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0d,
-	0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x99, 0x02,
-	0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x0d, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0a,
-	0x32, 0x39, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
-	0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x5f, 0x0a, 0x0d, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0a, 0x32, 0x39, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x52,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x1d, 0x0a, 0x0d, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01,
-	0x61, 0x18, 0x02, 0x20, 0x02, 0x28, 0x05, 0x52, 0x01, 0x61, 0x1a, 0x1d, 0x0a, 0x0d, 0x52, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0c, 0x0a, 0x01, 0x61,
-	0x18, 0x04, 0x20, 0x02, 0x28, 0x05, 0x52, 0x01, 0x61, 0x22, 0xb6, 0x01, 0x0a, 0x08, 0x54, 0x65,
-	0x73, 0x74, 0x57, 0x65, 0x61, 0x6b, 0x12, 0x54, 0x0a, 0x0d, 0x77, 0x65, 0x61, 0x6b, 0x5f, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x6b, 0x2e, 0x57, 0x65, 0x61, 0x6b, 0x49, 0x6d, 0x70, 0x6f,
-	0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x42, 0x02, 0x50, 0x01, 0x52, 0x0c,
-	0x77, 0x65, 0x61, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x54, 0x0a, 0x0d,
-	0x77, 0x65, 0x61, 0x6b, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x6b, 0x2e, 0x57, 0x65,
-	0x61, 0x6b, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32,
-	0x42, 0x02, 0x50, 0x01, 0x52, 0x0c, 0x77, 0x65, 0x61, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x32, 0x22, 0xee, 0x04, 0x0a, 0x0f, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x5a, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01,
-	0x52, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x25, 0x0a,
-	0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x5b, 0x20,
-	0x03, 0x28, 0x03, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49,
-	0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x5c, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x01, 0x52,
-	0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x27, 0x0a,
-	0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x5d,
-	0x20, 0x03, 0x28, 0x04, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x5e, 0x20, 0x03, 0x28, 0x11, 0x42, 0x02, 0x10,
-	0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
-	0x27, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x18, 0x5f, 0x20, 0x03, 0x28, 0x12, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x0e, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x60, 0x20, 0x03, 0x28, 0x07,
-	0x42, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x0e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x61, 0x20, 0x03, 0x28, 0x06, 0x42, 0x02, 0x10, 0x01, 0x52,
-	0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x2b,
-	0x0a, 0x0f, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33,
-	0x32, 0x18, 0x62, 0x20, 0x03, 0x28, 0x0f, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x2b, 0x0a, 0x0f, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x63,
-	0x20, 0x03, 0x28, 0x10, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x0a, 0x0c, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x64, 0x20, 0x03, 0x28, 0x02, 0x42, 0x02,
-	0x10, 0x01, 0x52, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12,
-	0x27, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65,
-	0x18, 0x65, 0x20, 0x03, 0x28, 0x01, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x66, 0x20, 0x03, 0x28, 0x08, 0x42, 0x02, 0x10,
-	0x01, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x44, 0x0a,
-	0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x67, 0x20, 0x03,
-	0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45,
-	0x6e, 0x75, 0x6d, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45,
-	0x6e, 0x75, 0x6d, 0x22, 0xa8, 0x05, 0x0a, 0x11, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x29, 0x0a, 0x0e, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x5a, 0x20, 0x03, 0x28,
-	0x05, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x5b, 0x20, 0x03, 0x28, 0x03, 0x42, 0x02, 0x10, 0x00,
-	0x52, 0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x2b, 0x0a, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x18, 0x5c, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x2b, 0x0a, 0x0f,
-	0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x5d, 0x20, 0x03, 0x28, 0x04, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x2b, 0x0a, 0x0f, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x5e, 0x20, 0x03,
-	0x28, 0x11, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x2b, 0x0a, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x5f, 0x20, 0x03, 0x28, 0x12, 0x42,
-	0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x2d, 0x0a, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x60, 0x20, 0x03, 0x28, 0x07, 0x42, 0x02, 0x10,
-	0x00, 0x52, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x12, 0x2d, 0x0a, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x61, 0x20, 0x03, 0x28, 0x06, 0x42, 0x02, 0x10, 0x00,
-	0x52, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x12, 0x2f, 0x0a, 0x11, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x62, 0x20, 0x03, 0x28, 0x0f, 0x42, 0x02, 0x10, 0x00,
-	0x52, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x12, 0x2f, 0x0a, 0x11, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x63, 0x20, 0x03, 0x28, 0x10, 0x42, 0x02, 0x10,
-	0x00, 0x52, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f,
-	0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x64, 0x20, 0x03, 0x28, 0x02, 0x42, 0x02, 0x10, 0x00, 0x52,
-	0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x2b,
-	0x0a, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c,
-	0x65, 0x18, 0x65, 0x20, 0x03, 0x28, 0x01, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x27, 0x0a, 0x0d, 0x75,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x66, 0x20, 0x03,
-	0x28, 0x08, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0c, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x48, 0x0a, 0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x67, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x42, 0x02, 0x10, 0x00,
-	0x52, 0x0c, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x22, 0x20,
-	0x0a, 0x14, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2a, 0x08, 0x08, 0x01, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02,
-	0x22, 0x22, 0x0a, 0x16, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2a, 0x08, 0x08, 0x01, 0x10, 0x80,
-	0x80, 0x80, 0x80, 0x02, 0x22, 0x0c, 0x0a, 0x0a, 0x46, 0x6f, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x22, 0x0d, 0x0a, 0x0b, 0x46, 0x6f, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x61, 0x0a, 0x0c, 0x57, 0x65, 0x69, 0x72, 0x64, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x12, 0x51, 0x0a, 0x0d, 0x77, 0x65, 0x69, 0x72, 0x64, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x3a, 0x2c, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2c,
-	0x20, 0x5c, 0x22, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x5c, 0x22, 0x5c, 0x6e, 0x64, 0x65, 0x61,
-	0x64, 0x5c, 0x33, 0x33, 0x36, 0x5c, 0x32, 0x35, 0x35, 0x5c, 0x32, 0x37, 0x36, 0x5c, 0x33, 0x35,
-	0x37, 0x62, 0x65, 0x65, 0x66, 0x60, 0x52, 0x0c, 0x77, 0x65, 0x69, 0x72, 0x64, 0x44, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x22, 0xff, 0x03, 0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x33, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e,
-	0x75, 0x6d, 0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x7a,
-	0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e,
-	0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x52, 0x04, 0x7a, 0x65, 0x72, 0x6f,
-	0x12, 0x30, 0x0a, 0x03, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e,
-	0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x03, 0x4f, 0x4e, 0x45, 0x52, 0x03, 0x6f,
-	0x6e, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x65, 0x6c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x07,
-	0x45, 0x4c, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x52, 0x07, 0x65, 0x6c, 0x65, 0x76, 0x65, 0x6e, 0x74,
-	0x12, 0x42, 0x0a, 0x09, 0x73, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x6e, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x09,
-	0x53, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x45, 0x45, 0x4e, 0x52, 0x09, 0x73, 0x65, 0x76, 0x65, 0x6e,
-	0x74, 0x65, 0x65, 0x6e, 0x12, 0x48, 0x0a, 0x0b, 0x74, 0x68, 0x69, 0x72, 0x74, 0x79, 0x73, 0x65,
-	0x76, 0x65, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e,
-	0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x0b, 0x54, 0x48, 0x49, 0x52, 0x54, 0x59, 0x53, 0x45, 0x56, 0x45,
-	0x4e, 0x52, 0x0b, 0x74, 0x68, 0x69, 0x72, 0x74, 0x79, 0x73, 0x65, 0x76, 0x65, 0x6e, 0x12, 0x45,
-	0x0a, 0x0a, 0x73, 0x69, 0x78, 0x74, 0x79, 0x73, 0x65, 0x76, 0x65, 0x6e, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x0a, 0x53,
-	0x49, 0x58, 0x54, 0x59, 0x53, 0x45, 0x56, 0x45, 0x4e, 0x52, 0x0a, 0x73, 0x69, 0x78, 0x74, 0x79,
-	0x73, 0x65, 0x76, 0x65, 0x6e, 0x12, 0x3f, 0x0a, 0x08, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x45, 0x6e,
-	0x75, 0x6d, 0x3a, 0x08, 0x4e, 0x45, 0x47, 0x41, 0x54, 0x49, 0x56, 0x45, 0x52, 0x08, 0x6e, 0x65,
-	0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2a, 0x40, 0x0a, 0x0b, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45, 0x49, 0x47, 0x4e,
-	0x5f, 0x46, 0x4f, 0x4f, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45, 0x49, 0x47,
-	0x4e, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f, 0x52, 0x45, 0x49,
-	0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x06, 0x2a, 0x47, 0x0a, 0x16, 0x54, 0x65, 0x73, 0x74,
-	0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x73, 0x12, 0x11, 0x0a, 0x0d, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x5f, 0x45,
-	0x4e, 0x55, 0x4d, 0x10, 0x00, 0x22, 0x04, 0x08, 0x02, 0x10, 0x02, 0x22, 0x04, 0x08, 0x0f, 0x10,
-	0x0f, 0x22, 0x04, 0x08, 0x09, 0x10, 0x0b, 0x2a, 0x03, 0x42, 0x41, 0x52, 0x2a, 0x03, 0x42, 0x41,
-	0x5a, 0x32, 0xa8, 0x01, 0x0a, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x46, 0x0a, 0x03, 0x46, 0x6f, 0x6f, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f,
-	0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f,
-	0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0a, 0x54, 0x65, 0x73,
-	0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x6f,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x6f,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x32, 0x85, 0x01, 0x0a,
-	0x15, 0x54, 0x65, 0x73, 0x74, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x67, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x12, 0x29, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x44, 0x65,
-	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a,
-	0x29, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x1a,
-	0x03, 0x88, 0x02, 0x01, 0x3a, 0x4c, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x3a, 0x4c, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x36, 0x34,
-	0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x12,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x3a, 0x50, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x07, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x3a, 0x50, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x06, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x3a, 0x52, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x52, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x10, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x4c, 0x0a, 0x0e,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x25,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0d, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x25, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x3a, 0x4a, 0x0a, 0x0d, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x25, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x3a, 0x4e, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3a, 0x4c, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x0f, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x3a, 0x6e, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x0a, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x3a, 0x92, 0x01, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x3a, 0x84, 0x01, 0x0a, 0x14, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e,
-	0x75, 0x6d, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2b, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65,
-	0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
-	0x3a, 0x4c, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x4c,
-	0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x20, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x4e, 0x0a, 0x0f,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
-	0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x21, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x4e, 0x0a, 0x0f,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x04, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x4e, 0x0a, 0x0f,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
-	0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x11, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x4e, 0x0a, 0x0f,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x12, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x50, 0x0a, 0x10,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
-	0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x25, 0x20, 0x03, 0x28, 0x07, 0x52, 0x0f, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x50,
-	0x0a, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x26, 0x20, 0x03, 0x28, 0x06, 0x52,
-	0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34,
-	0x3a, 0x52, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x27, 0x20, 0x03,
-	0x28, 0x0f, 0x52, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x3a, 0x52, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x28, 0x20, 0x03, 0x28, 0x10, 0x52, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x4c, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x29, 0x20, 0x03, 0x28, 0x02, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65,
-	0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x3a, 0x4e, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x2a, 0x20, 0x03, 0x28, 0x01, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x3a, 0x4a, 0x0a, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2b,
-	0x20, 0x03, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x6f,
-	0x6f, 0x6c, 0x3a, 0x4e, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2c, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x3a, 0x4c, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62,
-	0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2d, 0x20, 0x03, 0x28,
-	0x0c, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73,
-	0x3a, 0x6e, 0x0a, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x2e, 0x20, 0x03, 0x28, 0x0a, 0x32, 0x21,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70,
-	0x3a, 0x92, 0x01, 0x0a, 0x17, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x30, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x3a, 0x84, 0x01, 0x0a, 0x14, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x25,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x33, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x4e, 0x0a, 0x0d,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x25, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x51, 0x20, 0x01, 0x28, 0x05, 0x3a, 0x02, 0x38, 0x31, 0x52, 0x0c,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x4e, 0x0a, 0x0d,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x25, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x52, 0x20, 0x01, 0x28, 0x03, 0x3a, 0x02, 0x38, 0x32, 0x52, 0x0c,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x50, 0x0a, 0x0e,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x25,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x53, 0x20, 0x01, 0x28, 0x0d, 0x3a, 0x02, 0x38, 0x33, 0x52,
-	0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x50,
-	0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x54, 0x20, 0x01, 0x28, 0x04, 0x3a, 0x02, 0x38,
-	0x34, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x3a, 0x51, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x55, 0x20, 0x01, 0x28, 0x11, 0x3a,
-	0x03, 0x2d, 0x38, 0x35, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x3a, 0x50, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x56, 0x20, 0x01,
-	0x28, 0x12, 0x3a, 0x02, 0x38, 0x36, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x52, 0x0a, 0x0f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x57, 0x20, 0x01, 0x28, 0x07, 0x3a, 0x02, 0x38, 0x37, 0x52, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x52, 0x0a, 0x0f, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x58, 0x20, 0x01, 0x28, 0x06, 0x3a, 0x02, 0x38, 0x38, 0x52, 0x0e, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x54, 0x0a,
-	0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33,
-	0x32, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x59, 0x20, 0x01, 0x28, 0x0f, 0x3a, 0x02,
-	0x38, 0x39, 0x52, 0x0f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x3a, 0x55, 0x0a, 0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x50,
-	0x20, 0x01, 0x28, 0x10, 0x3a, 0x03, 0x2d, 0x39, 0x30, 0x52, 0x0f, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x50, 0x0a, 0x0d, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x25, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x5b, 0x20, 0x01, 0x28, 0x02, 0x3a, 0x04, 0x39, 0x31, 0x2e, 0x35, 0x52, 0x0c,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x3a, 0x53, 0x0a, 0x0e,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x25,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5c, 0x20, 0x01, 0x28, 0x01, 0x3a, 0x05, 0x39, 0x32, 0x30,
-	0x30, 0x30, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c,
-	0x65, 0x3a, 0x4e, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x6f, 0x6f,
-	0x6c, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5d, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x04,
-	0x74, 0x72, 0x75, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x6f, 0x6f,
-	0x6c, 0x3a, 0x53, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5e, 0x20, 0x01, 0x28, 0x09,
-	0x3a, 0x05, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3a, 0x51, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5f,
-	0x20, 0x01, 0x28, 0x0c, 0x3a, 0x05, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x52, 0x0c, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x3a, 0x4f, 0x0a, 0x0c, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x5a, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x4f, 0x0a, 0x0c, 0x70, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5b, 0x20, 0x03, 0x28, 0x03, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0b,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x51, 0x0a, 0x0d, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x28, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5c, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x01,
-	0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x51,
-	0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5d, 0x20, 0x03, 0x28, 0x04, 0x42,
-	0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x3a, 0x51, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5e, 0x20, 0x03,
-	0x28, 0x11, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x3a, 0x51, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x5f, 0x20, 0x03, 0x28, 0x12, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x53, 0x0a, 0x0e, 0x70, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54,
-	0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x60, 0x20, 0x03, 0x28, 0x07, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x53, 0x0a, 0x0e,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x28,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x61, 0x20, 0x03, 0x28, 0x06, 0x42, 0x02,
-	0x10, 0x01, 0x52, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x3a, 0x55, 0x0a, 0x0f, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x62,
-	0x20, 0x03, 0x28, 0x0f, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x55, 0x0a, 0x0f, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x28, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x63, 0x20, 0x03, 0x28, 0x10, 0x42, 0x02, 0x10, 0x01, 0x52,
-	0x0e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a,
-	0x4f, 0x0a, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12,
-	0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x64, 0x20, 0x03, 0x28, 0x02, 0x42,
-	0x02, 0x10, 0x01, 0x52, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74,
-	0x3a, 0x51, 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c,
-	0x65, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x65, 0x20, 0x03, 0x28,
-	0x01, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x44, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x3a, 0x4d, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x62, 0x6f,
-	0x6f, 0x6c, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x66, 0x20, 0x03,
-	0x28, 0x08, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x42, 0x6f,
-	0x6f, 0x6c, 0x3a, 0x6e, 0x0a, 0x0b, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75,
-	0x6d, 0x12, 0x28, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x67, 0x20, 0x03, 0x28,
-	0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e,
-	0x75, 0x6d, 0x42, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x6e,
-	0x75, 0x6d, 0x3a, 0x55, 0x0a, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x5a, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0d, 0x75, 0x6e, 0x70, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x55, 0x0a, 0x0e, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x2a, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5b, 0x20, 0x03, 0x28, 0x03, 0x42, 0x02, 0x10,
-	0x00, 0x52, 0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34,
-	0x3a, 0x57, 0x0a, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x5c, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x57, 0x0a, 0x0f, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x2a, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5d, 0x20, 0x03, 0x28, 0x04, 0x42, 0x02,
-	0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x3a, 0x57, 0x0a, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x5e, 0x20, 0x03, 0x28, 0x11, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x57, 0x0a, 0x0f, 0x75,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x2a,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x5f, 0x20, 0x03, 0x28, 0x12,
-	0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x3a, 0x59, 0x0a, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x60, 0x20, 0x03, 0x28, 0x07, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0f,
-	0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a,
-	0x59, 0x0a, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x61, 0x20, 0x03, 0x28, 0x06, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0f, 0x75, 0x6e, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x5b, 0x0a, 0x11, 0x75, 0x6e,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12,
-	0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65,
-	0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x62, 0x20, 0x03, 0x28,
-	0x0f, 0x42, 0x02, 0x10, 0x00, 0x52, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x5b, 0x0a, 0x11, 0x75, 0x6e, 0x70, 0x61, 0x63,
-	0x6b, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x2a, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x63, 0x20, 0x03, 0x28, 0x10, 0x42, 0x02,
-	0x10, 0x00, 0x52, 0x10, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x3a, 0x55, 0x0a, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x64, 0x20, 0x03, 0x28, 0x02, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0d, 0x75, 0x6e,
-	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x3a, 0x57, 0x0a, 0x0f, 0x75,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x2a,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x65, 0x20, 0x03, 0x28, 0x01,
-	0x42, 0x02, 0x10, 0x00, 0x52, 0x0e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x44, 0x6f,
-	0x75, 0x62, 0x6c, 0x65, 0x3a, 0x53, 0x0a, 0x0d, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
-	0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x55,
-	0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x66, 0x20, 0x03, 0x28, 0x08, 0x42, 0x02, 0x10, 0x00, 0x52, 0x0c, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x3a, 0x74, 0x0a, 0x0d, 0x75, 0x6e, 0x70,
-	0x61, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x54, 0x65, 0x73, 0x74, 0x55, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x67, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x42, 0x02, 0x10,
-	0x00, 0x52, 0x0c, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x42,
-	0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x50, 0x02, 0x58, 0x03, 0x58, 0x04,
-}
-
-var (
-	file_internal_testprotos_test_test_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test_test_proto_rawDescData = file_internal_testprotos_test_test_proto_rawDesc
-)
-
-func file_internal_testprotos_test_test_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test_test_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test_test_proto_rawDescData)
-	})
-	return file_internal_testprotos_test_test_proto_rawDescData
-}
-
-var file_internal_testprotos_test_test_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
-var file_internal_testprotos_test_test_proto_msgTypes = make([]protoimpl.MessageInfo, 45)
-var file_internal_testprotos_test_test_proto_goTypes = []interface{}{
-	(ForeignEnum)(0),                          // 0: goproto.proto.test.ForeignEnum
-	(TestReservedEnumFields)(0),               // 1: goproto.proto.test.TestReservedEnumFields
-	(TestAllTypes_NestedEnum)(0),              // 2: goproto.proto.test.TestAllTypes.NestedEnum
-	(TestDeprecatedMessage_DeprecatedEnum)(0), // 3: goproto.proto.test.TestDeprecatedMessage.DeprecatedEnum
-	(*TestAllTypes)(nil),                      // 4: goproto.proto.test.TestAllTypes
-	(*TestDeprecatedMessage)(nil),             // 5: goproto.proto.test.TestDeprecatedMessage
-	(*ForeignMessage)(nil),                    // 6: goproto.proto.test.ForeignMessage
-	(*TestReservedFields)(nil),                // 7: goproto.proto.test.TestReservedFields
-	(*TestAllExtensions)(nil),                 // 8: goproto.proto.test.TestAllExtensions
-	(*OptionalGroup)(nil),                     // 9: goproto.proto.test.OptionalGroup
-	(*RepeatedGroup)(nil),                     // 10: goproto.proto.test.RepeatedGroup
-	(*TestNestedExtension)(nil),               // 11: goproto.proto.test.TestNestedExtension
-	(*TestRequired)(nil),                      // 12: goproto.proto.test.TestRequired
-	(*TestRequiredForeign)(nil),               // 13: goproto.proto.test.TestRequiredForeign
-	(*TestRequiredGroupFields)(nil),           // 14: goproto.proto.test.TestRequiredGroupFields
-	(*TestWeak)(nil),                          // 15: goproto.proto.test.TestWeak
-	(*TestPackedTypes)(nil),                   // 16: goproto.proto.test.TestPackedTypes
-	(*TestUnpackedTypes)(nil),                 // 17: goproto.proto.test.TestUnpackedTypes
-	(*TestPackedExtensions)(nil),              // 18: goproto.proto.test.TestPackedExtensions
-	(*TestUnpackedExtensions)(nil),            // 19: goproto.proto.test.TestUnpackedExtensions
-	(*FooRequest)(nil),                        // 20: goproto.proto.test.FooRequest
-	(*FooResponse)(nil),                       // 21: goproto.proto.test.FooResponse
-	(*WeirdDefault)(nil),                      // 22: goproto.proto.test.WeirdDefault
-	(*RemoteDefault)(nil),                     // 23: goproto.proto.test.RemoteDefault
-	(*TestAllTypes_NestedMessage)(nil),        // 24: goproto.proto.test.TestAllTypes.NestedMessage
-	(*TestAllTypes_OptionalGroup)(nil),        // 25: goproto.proto.test.TestAllTypes.OptionalGroup
-	(*TestAllTypes_RepeatedGroup)(nil),        // 26: goproto.proto.test.TestAllTypes.RepeatedGroup
-	nil,                                       // 27: goproto.proto.test.TestAllTypes.MapInt32Int32Entry
-	nil,                                       // 28: goproto.proto.test.TestAllTypes.MapInt64Int64Entry
-	nil,                                       // 29: goproto.proto.test.TestAllTypes.MapUint32Uint32Entry
-	nil,                                       // 30: goproto.proto.test.TestAllTypes.MapUint64Uint64Entry
-	nil,                                       // 31: goproto.proto.test.TestAllTypes.MapSint32Sint32Entry
-	nil,                                       // 32: goproto.proto.test.TestAllTypes.MapSint64Sint64Entry
-	nil,                                       // 33: goproto.proto.test.TestAllTypes.MapFixed32Fixed32Entry
-	nil,                                       // 34: goproto.proto.test.TestAllTypes.MapFixed64Fixed64Entry
-	nil,                                       // 35: goproto.proto.test.TestAllTypes.MapSfixed32Sfixed32Entry
-	nil,                                       // 36: goproto.proto.test.TestAllTypes.MapSfixed64Sfixed64Entry
-	nil,                                       // 37: goproto.proto.test.TestAllTypes.MapInt32FloatEntry
-	nil,                                       // 38: goproto.proto.test.TestAllTypes.MapInt32DoubleEntry
-	nil,                                       // 39: goproto.proto.test.TestAllTypes.MapBoolBoolEntry
-	nil,                                       // 40: goproto.proto.test.TestAllTypes.MapStringStringEntry
-	nil,                                       // 41: goproto.proto.test.TestAllTypes.MapStringBytesEntry
-	nil,                                       // 42: goproto.proto.test.TestAllTypes.MapStringNestedMessageEntry
-	nil,                                       // 43: goproto.proto.test.TestAllTypes.MapStringNestedEnumEntry
-	(*TestAllTypes_OneofGroup)(nil),           // 44: goproto.proto.test.TestAllTypes.OneofGroup
-	(*TestAllExtensions_NestedMessage)(nil),   // 45: goproto.proto.test.TestAllExtensions.NestedMessage
-	nil,                                       // 46: goproto.proto.test.TestRequiredForeign.MapMessageEntry
-	(*TestRequiredGroupFields_OptionalGroup)(nil), // 47: goproto.proto.test.TestRequiredGroupFields.OptionalGroup
-	(*TestRequiredGroupFields_RepeatedGroup)(nil), // 48: goproto.proto.test.TestRequiredGroupFields.RepeatedGroup
-	(*ImportMessage)(nil),                         // 49: goproto.proto.test.ImportMessage
-	(ImportEnum)(0),                               // 50: goproto.proto.test.ImportEnum
-	(enums.Enum)(0),                               // 51: goproto.proto.enums.Enum
-}
-var file_internal_testprotos_test_test_proto_depIdxs = []int32{
-	25,  // 0: goproto.proto.test.TestAllTypes.optionalgroup:type_name -> goproto.proto.test.TestAllTypes.OptionalGroup
-	24,  // 1: goproto.proto.test.TestAllTypes.optional_nested_message:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	6,   // 2: goproto.proto.test.TestAllTypes.optional_foreign_message:type_name -> goproto.proto.test.ForeignMessage
-	49,  // 3: goproto.proto.test.TestAllTypes.optional_import_message:type_name -> goproto.proto.test.ImportMessage
-	2,   // 4: goproto.proto.test.TestAllTypes.optional_nested_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	0,   // 5: goproto.proto.test.TestAllTypes.optional_foreign_enum:type_name -> goproto.proto.test.ForeignEnum
-	50,  // 6: goproto.proto.test.TestAllTypes.optional_import_enum:type_name -> goproto.proto.test.ImportEnum
-	26,  // 7: goproto.proto.test.TestAllTypes.repeatedgroup:type_name -> goproto.proto.test.TestAllTypes.RepeatedGroup
-	24,  // 8: goproto.proto.test.TestAllTypes.repeated_nested_message:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	6,   // 9: goproto.proto.test.TestAllTypes.repeated_foreign_message:type_name -> goproto.proto.test.ForeignMessage
-	49,  // 10: goproto.proto.test.TestAllTypes.repeated_importmessage:type_name -> goproto.proto.test.ImportMessage
-	2,   // 11: goproto.proto.test.TestAllTypes.repeated_nested_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	0,   // 12: goproto.proto.test.TestAllTypes.repeated_foreign_enum:type_name -> goproto.proto.test.ForeignEnum
-	50,  // 13: goproto.proto.test.TestAllTypes.repeated_importenum:type_name -> goproto.proto.test.ImportEnum
-	27,  // 14: goproto.proto.test.TestAllTypes.map_int32_int32:type_name -> goproto.proto.test.TestAllTypes.MapInt32Int32Entry
-	28,  // 15: goproto.proto.test.TestAllTypes.map_int64_int64:type_name -> goproto.proto.test.TestAllTypes.MapInt64Int64Entry
-	29,  // 16: goproto.proto.test.TestAllTypes.map_uint32_uint32:type_name -> goproto.proto.test.TestAllTypes.MapUint32Uint32Entry
-	30,  // 17: goproto.proto.test.TestAllTypes.map_uint64_uint64:type_name -> goproto.proto.test.TestAllTypes.MapUint64Uint64Entry
-	31,  // 18: goproto.proto.test.TestAllTypes.map_sint32_sint32:type_name -> goproto.proto.test.TestAllTypes.MapSint32Sint32Entry
-	32,  // 19: goproto.proto.test.TestAllTypes.map_sint64_sint64:type_name -> goproto.proto.test.TestAllTypes.MapSint64Sint64Entry
-	33,  // 20: goproto.proto.test.TestAllTypes.map_fixed32_fixed32:type_name -> goproto.proto.test.TestAllTypes.MapFixed32Fixed32Entry
-	34,  // 21: goproto.proto.test.TestAllTypes.map_fixed64_fixed64:type_name -> goproto.proto.test.TestAllTypes.MapFixed64Fixed64Entry
-	35,  // 22: goproto.proto.test.TestAllTypes.map_sfixed32_sfixed32:type_name -> goproto.proto.test.TestAllTypes.MapSfixed32Sfixed32Entry
-	36,  // 23: goproto.proto.test.TestAllTypes.map_sfixed64_sfixed64:type_name -> goproto.proto.test.TestAllTypes.MapSfixed64Sfixed64Entry
-	37,  // 24: goproto.proto.test.TestAllTypes.map_int32_float:type_name -> goproto.proto.test.TestAllTypes.MapInt32FloatEntry
-	38,  // 25: goproto.proto.test.TestAllTypes.map_int32_double:type_name -> goproto.proto.test.TestAllTypes.MapInt32DoubleEntry
-	39,  // 26: goproto.proto.test.TestAllTypes.map_bool_bool:type_name -> goproto.proto.test.TestAllTypes.MapBoolBoolEntry
-	40,  // 27: goproto.proto.test.TestAllTypes.map_string_string:type_name -> goproto.proto.test.TestAllTypes.MapStringStringEntry
-	41,  // 28: goproto.proto.test.TestAllTypes.map_string_bytes:type_name -> goproto.proto.test.TestAllTypes.MapStringBytesEntry
-	42,  // 29: goproto.proto.test.TestAllTypes.map_string_nested_message:type_name -> goproto.proto.test.TestAllTypes.MapStringNestedMessageEntry
-	43,  // 30: goproto.proto.test.TestAllTypes.map_string_nested_enum:type_name -> goproto.proto.test.TestAllTypes.MapStringNestedEnumEntry
-	2,   // 31: goproto.proto.test.TestAllTypes.default_nested_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	0,   // 32: goproto.proto.test.TestAllTypes.default_foreign_enum:type_name -> goproto.proto.test.ForeignEnum
-	24,  // 33: goproto.proto.test.TestAllTypes.oneof_nested_message:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	2,   // 34: goproto.proto.test.TestAllTypes.oneof_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	44,  // 35: goproto.proto.test.TestAllTypes.oneofgroup:type_name -> goproto.proto.test.TestAllTypes.OneofGroup
-	45,  // 36: goproto.proto.test.OptionalGroup.optional_nested_message:type_name -> goproto.proto.test.TestAllExtensions.NestedMessage
-	45,  // 37: goproto.proto.test.RepeatedGroup.optional_nested_message:type_name -> goproto.proto.test.TestAllExtensions.NestedMessage
-	12,  // 38: goproto.proto.test.TestRequiredForeign.optional_message:type_name -> goproto.proto.test.TestRequired
-	12,  // 39: goproto.proto.test.TestRequiredForeign.repeated_message:type_name -> goproto.proto.test.TestRequired
-	46,  // 40: goproto.proto.test.TestRequiredForeign.map_message:type_name -> goproto.proto.test.TestRequiredForeign.MapMessageEntry
-	12,  // 41: goproto.proto.test.TestRequiredForeign.oneof_message:type_name -> goproto.proto.test.TestRequired
-	47,  // 42: goproto.proto.test.TestRequiredGroupFields.optionalgroup:type_name -> goproto.proto.test.TestRequiredGroupFields.OptionalGroup
-	48,  // 43: goproto.proto.test.TestRequiredGroupFields.repeatedgroup:type_name -> goproto.proto.test.TestRequiredGroupFields.RepeatedGroup
-	0,   // 44: goproto.proto.test.TestPackedTypes.packed_enum:type_name -> goproto.proto.test.ForeignEnum
-	0,   // 45: goproto.proto.test.TestUnpackedTypes.unpacked_enum:type_name -> goproto.proto.test.ForeignEnum
-	51,  // 46: goproto.proto.test.RemoteDefault.default:type_name -> goproto.proto.enums.Enum
-	51,  // 47: goproto.proto.test.RemoteDefault.zero:type_name -> goproto.proto.enums.Enum
-	51,  // 48: goproto.proto.test.RemoteDefault.one:type_name -> goproto.proto.enums.Enum
-	51,  // 49: goproto.proto.test.RemoteDefault.elevent:type_name -> goproto.proto.enums.Enum
-	51,  // 50: goproto.proto.test.RemoteDefault.seventeen:type_name -> goproto.proto.enums.Enum
-	51,  // 51: goproto.proto.test.RemoteDefault.thirtyseven:type_name -> goproto.proto.enums.Enum
-	51,  // 52: goproto.proto.test.RemoteDefault.sixtyseven:type_name -> goproto.proto.enums.Enum
-	51,  // 53: goproto.proto.test.RemoteDefault.negative:type_name -> goproto.proto.enums.Enum
-	4,   // 54: goproto.proto.test.TestAllTypes.NestedMessage.corecursive:type_name -> goproto.proto.test.TestAllTypes
-	24,  // 55: goproto.proto.test.TestAllTypes.OptionalGroup.optional_nested_message:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	24,  // 56: goproto.proto.test.TestAllTypes.RepeatedGroup.optional_nested_message:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	24,  // 57: goproto.proto.test.TestAllTypes.MapStringNestedMessageEntry.value:type_name -> goproto.proto.test.TestAllTypes.NestedMessage
-	2,   // 58: goproto.proto.test.TestAllTypes.MapStringNestedEnumEntry.value:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	8,   // 59: goproto.proto.test.TestAllExtensions.NestedMessage.corecursive:type_name -> goproto.proto.test.TestAllExtensions
-	12,  // 60: goproto.proto.test.TestRequiredForeign.MapMessageEntry.value:type_name -> goproto.proto.test.TestRequired
-	8,   // 61: goproto.proto.test.optional_int32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 62: goproto.proto.test.optional_int64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 63: goproto.proto.test.optional_uint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 64: goproto.proto.test.optional_uint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 65: goproto.proto.test.optional_sint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 66: goproto.proto.test.optional_sint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 67: goproto.proto.test.optional_fixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 68: goproto.proto.test.optional_fixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 69: goproto.proto.test.optional_sfixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 70: goproto.proto.test.optional_sfixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 71: goproto.proto.test.optional_float:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 72: goproto.proto.test.optional_double:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 73: goproto.proto.test.optional_bool:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 74: goproto.proto.test.optional_string:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 75: goproto.proto.test.optional_bytes:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 76: goproto.proto.test.optionalgroup:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 77: goproto.proto.test.optional_nested_message:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 78: goproto.proto.test.optional_nested_enum:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 79: goproto.proto.test.repeated_int32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 80: goproto.proto.test.repeated_int64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 81: goproto.proto.test.repeated_uint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 82: goproto.proto.test.repeated_uint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 83: goproto.proto.test.repeated_sint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 84: goproto.proto.test.repeated_sint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 85: goproto.proto.test.repeated_fixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 86: goproto.proto.test.repeated_fixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 87: goproto.proto.test.repeated_sfixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 88: goproto.proto.test.repeated_sfixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 89: goproto.proto.test.repeated_float:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 90: goproto.proto.test.repeated_double:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 91: goproto.proto.test.repeated_bool:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 92: goproto.proto.test.repeated_string:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 93: goproto.proto.test.repeated_bytes:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 94: goproto.proto.test.repeatedgroup:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 95: goproto.proto.test.repeated_nested_message:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 96: goproto.proto.test.repeated_nested_enum:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 97: goproto.proto.test.default_int32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 98: goproto.proto.test.default_int64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 99: goproto.proto.test.default_uint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 100: goproto.proto.test.default_uint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 101: goproto.proto.test.default_sint32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 102: goproto.proto.test.default_sint64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 103: goproto.proto.test.default_fixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 104: goproto.proto.test.default_fixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 105: goproto.proto.test.default_sfixed32:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 106: goproto.proto.test.default_sfixed64:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 107: goproto.proto.test.default_float:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 108: goproto.proto.test.default_double:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 109: goproto.proto.test.default_bool:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 110: goproto.proto.test.default_string:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 111: goproto.proto.test.default_bytes:extendee -> goproto.proto.test.TestAllExtensions
-	18,  // 112: goproto.proto.test.packed_int32:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 113: goproto.proto.test.packed_int64:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 114: goproto.proto.test.packed_uint32:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 115: goproto.proto.test.packed_uint64:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 116: goproto.proto.test.packed_sint32:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 117: goproto.proto.test.packed_sint64:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 118: goproto.proto.test.packed_fixed32:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 119: goproto.proto.test.packed_fixed64:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 120: goproto.proto.test.packed_sfixed32:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 121: goproto.proto.test.packed_sfixed64:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 122: goproto.proto.test.packed_float:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 123: goproto.proto.test.packed_double:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 124: goproto.proto.test.packed_bool:extendee -> goproto.proto.test.TestPackedExtensions
-	18,  // 125: goproto.proto.test.packed_enum:extendee -> goproto.proto.test.TestPackedExtensions
-	19,  // 126: goproto.proto.test.unpacked_int32:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 127: goproto.proto.test.unpacked_int64:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 128: goproto.proto.test.unpacked_uint32:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 129: goproto.proto.test.unpacked_uint64:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 130: goproto.proto.test.unpacked_sint32:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 131: goproto.proto.test.unpacked_sint64:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 132: goproto.proto.test.unpacked_fixed32:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 133: goproto.proto.test.unpacked_fixed64:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 134: goproto.proto.test.unpacked_sfixed32:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 135: goproto.proto.test.unpacked_sfixed64:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 136: goproto.proto.test.unpacked_float:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 137: goproto.proto.test.unpacked_double:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 138: goproto.proto.test.unpacked_bool:extendee -> goproto.proto.test.TestUnpackedExtensions
-	19,  // 139: goproto.proto.test.unpacked_enum:extendee -> goproto.proto.test.TestUnpackedExtensions
-	8,   // 140: goproto.proto.test.TestNestedExtension.nested_string_extension:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 141: goproto.proto.test.TestRequired.single:extendee -> goproto.proto.test.TestAllExtensions
-	8,   // 142: goproto.proto.test.TestRequired.multi:extendee -> goproto.proto.test.TestAllExtensions
-	9,   // 143: goproto.proto.test.optionalgroup:type_name -> goproto.proto.test.OptionalGroup
-	45,  // 144: goproto.proto.test.optional_nested_message:type_name -> goproto.proto.test.TestAllExtensions.NestedMessage
-	2,   // 145: goproto.proto.test.optional_nested_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	10,  // 146: goproto.proto.test.repeatedgroup:type_name -> goproto.proto.test.RepeatedGroup
-	45,  // 147: goproto.proto.test.repeated_nested_message:type_name -> goproto.proto.test.TestAllExtensions.NestedMessage
-	2,   // 148: goproto.proto.test.repeated_nested_enum:type_name -> goproto.proto.test.TestAllTypes.NestedEnum
-	0,   // 149: goproto.proto.test.packed_enum:type_name -> goproto.proto.test.ForeignEnum
-	0,   // 150: goproto.proto.test.unpacked_enum:type_name -> goproto.proto.test.ForeignEnum
-	12,  // 151: goproto.proto.test.TestRequired.single:type_name -> goproto.proto.test.TestRequired
-	12,  // 152: goproto.proto.test.TestRequired.multi:type_name -> goproto.proto.test.TestRequired
-	20,  // 153: goproto.proto.test.TestService.Foo:input_type -> goproto.proto.test.FooRequest
-	20,  // 154: goproto.proto.test.TestService.TestStream:input_type -> goproto.proto.test.FooRequest
-	5,   // 155: goproto.proto.test.TestDeprecatedService.Deprecated:input_type -> goproto.proto.test.TestDeprecatedMessage
-	21,  // 156: goproto.proto.test.TestService.Foo:output_type -> goproto.proto.test.FooResponse
-	21,  // 157: goproto.proto.test.TestService.TestStream:output_type -> goproto.proto.test.FooResponse
-	5,   // 158: goproto.proto.test.TestDeprecatedService.Deprecated:output_type -> goproto.proto.test.TestDeprecatedMessage
-	156, // [156:159] is the sub-list for method output_type
-	153, // [153:156] is the sub-list for method input_type
-	143, // [143:153] is the sub-list for extension type_name
-	61,  // [61:143] is the sub-list for extension extendee
-	0,   // [0:61] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test_test_proto_init() }
-func file_internal_testprotos_test_test_proto_init() {
-	if File_internal_testprotos_test_test_proto != nil {
-		return
-	}
-	file_internal_testprotos_test_test_import_proto_init()
-	file_internal_testprotos_test_test_public_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestDeprecatedMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ForeignMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestReservedFields); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllExtensions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OptionalGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RepeatedGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestNestedExtension); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestRequired); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestRequiredForeign); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestRequiredGroupFields); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestWeak); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.weakFields
-			case 3:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestPackedTypes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestUnpackedTypes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestPackedExtensions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestUnpackedExtensions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FooRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FooResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WeirdDefault); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RemoteDefault); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes_NestedMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes_OptionalGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes_RepeatedGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes_OneofGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllExtensions_NestedMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestRequiredGroupFields_OptionalGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test_test_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestRequiredGroupFields_RepeatedGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_internal_testprotos_test_test_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*TestAllTypes_OneofUint32)(nil),
-		(*TestAllTypes_OneofNestedMessage)(nil),
-		(*TestAllTypes_OneofString)(nil),
-		(*TestAllTypes_OneofBytes)(nil),
-		(*TestAllTypes_OneofBool)(nil),
-		(*TestAllTypes_OneofUint64)(nil),
-		(*TestAllTypes_OneofFloat)(nil),
-		(*TestAllTypes_OneofDouble)(nil),
-		(*TestAllTypes_OneofEnum)(nil),
-		(*TestAllTypes_Oneofgroup)(nil),
-		(*TestAllTypes_OneofOptionalUint32)(nil),
-	}
-	file_internal_testprotos_test_test_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*TestDeprecatedMessage_DeprecatedOneofField)(nil),
-	}
-	file_internal_testprotos_test_test_proto_msgTypes[9].OneofWrappers = []interface{}{
-		(*TestRequiredForeign_OneofMessage)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test_test_proto_rawDesc,
-			NumEnums:      4,
-			NumMessages:   45,
-			NumExtensions: 82,
-			NumServices:   2,
-		},
-		GoTypes:           file_internal_testprotos_test_test_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test_test_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_test_test_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_test_test_proto_msgTypes,
-		ExtensionInfos:    file_internal_testprotos_test_test_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_test_test_proto = out.File
-	file_internal_testprotos_test_test_proto_rawDesc = nil
-	file_internal_testprotos_test_test_proto_goTypes = nil
-	file_internal_testprotos_test_test_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/test_import.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test/test_import.pb.go
deleted file mode 100644
index 6be93bdf913..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/test_import.pb.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test/test_import.proto
-
-package test
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type ImportEnum int32
-
-const (
-	ImportEnum_IMPORT_ZERO ImportEnum = 0
-)
-
-// Enum value maps for ImportEnum.
-var (
-	ImportEnum_name = map[int32]string{
-		0: "IMPORT_ZERO",
-	}
-	ImportEnum_value = map[string]int32{
-		"IMPORT_ZERO": 0,
-	}
-)
-
-func (x ImportEnum) Enum() *ImportEnum {
-	p := new(ImportEnum)
-	*p = x
-	return p
-}
-
-func (x ImportEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ImportEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test_test_import_proto_enumTypes[0].Descriptor()
-}
-
-func (ImportEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test_test_import_proto_enumTypes[0]
-}
-
-func (x ImportEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *ImportEnum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = ImportEnum(num)
-	return nil
-}
-
-// Deprecated: Use ImportEnum.Descriptor instead.
-func (ImportEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_import_proto_rawDescGZIP(), []int{0}
-}
-
-type ImportMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ImportMessage) Reset() {
-	*x = ImportMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_import_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ImportMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ImportMessage) ProtoMessage() {}
-
-func (x *ImportMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_import_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ImportMessage.ProtoReflect.Descriptor instead.
-func (*ImportMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_import_proto_rawDescGZIP(), []int{0}
-}
-
-var File_internal_testprotos_test_test_import_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test_test_import_proto_rawDesc = []byte{
-	0x0a, 0x2a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
-	0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x22, 0x0f, 0x0a, 0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x2a, 0x1d, 0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12,
-	0x0f, 0x0a, 0x0b, 0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00,
-	0x42, 0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e,
-	0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
-}
-
-var (
-	file_internal_testprotos_test_test_import_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test_test_import_proto_rawDescData = file_internal_testprotos_test_test_import_proto_rawDesc
-)
-
-func file_internal_testprotos_test_test_import_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test_test_import_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test_test_import_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test_test_import_proto_rawDescData)
-	})
-	return file_internal_testprotos_test_test_import_proto_rawDescData
-}
-
-var file_internal_testprotos_test_test_import_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_internal_testprotos_test_test_import_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_test_test_import_proto_goTypes = []interface{}{
-	(ImportEnum)(0),       // 0: goproto.proto.test.ImportEnum
-	(*ImportMessage)(nil), // 1: goproto.proto.test.ImportMessage
-}
-var file_internal_testprotos_test_test_import_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test_test_import_proto_init() }
-func file_internal_testprotos_test_test_import_proto_init() {
-	if File_internal_testprotos_test_test_import_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test_test_import_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ImportMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test_test_import_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test_test_import_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test_test_import_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_test_test_import_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_test_test_import_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_test_test_import_proto = out.File
-	file_internal_testprotos_test_test_import_proto_rawDesc = nil
-	file_internal_testprotos_test_test_import_proto_goTypes = nil
-	file_internal_testprotos_test_test_import_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/test_public.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test/test_public.pb.go
deleted file mode 100644
index 19797ea1aba..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/test_public.pb.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test/test_public.proto
-
-package test
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type PublicImportMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PublicImportMessage) Reset() {
-	*x = PublicImportMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_test_public_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PublicImportMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PublicImportMessage) ProtoMessage() {}
-
-func (x *PublicImportMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_test_public_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PublicImportMessage.ProtoReflect.Descriptor instead.
-func (*PublicImportMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_test_public_proto_rawDescGZIP(), []int{0}
-}
-
-var File_internal_testprotos_test_test_public_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test_test_public_proto_rawDesc = []byte{
-	0x0a, 0x2a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x22, 0x15, 0x0a, 0x13, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74,
-	0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
-}
-
-var (
-	file_internal_testprotos_test_test_public_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test_test_public_proto_rawDescData = file_internal_testprotos_test_test_public_proto_rawDesc
-)
-
-func file_internal_testprotos_test_test_public_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test_test_public_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test_test_public_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test_test_public_proto_rawDescData)
-	})
-	return file_internal_testprotos_test_test_public_proto_rawDescData
-}
-
-var file_internal_testprotos_test_test_public_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_test_test_public_proto_goTypes = []interface{}{
-	(*PublicImportMessage)(nil), // 0: goproto.proto.test.PublicImportMessage
-}
-var file_internal_testprotos_test_test_public_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test_test_public_proto_init() }
-func file_internal_testprotos_test_test_public_proto_init() {
-	if File_internal_testprotos_test_test_public_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test_test_public_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PublicImportMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test_test_public_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test_test_public_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test_test_public_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_test_test_public_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_test_test_public_proto = out.File
-	file_internal_testprotos_test_test_public_proto_rawDesc = nil
-	file_internal_testprotos_test_test_public_proto_goTypes = nil
-	file_internal_testprotos_test_test_public_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/test_weak.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/test_weak.pb.go
deleted file mode 100644
index 63203c529b0..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/test_weak.pb.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test/weak1/test_weak.proto
-
-package weak1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type WeakImportMessage1 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A *int32 `protobuf:"varint,1,req,name=a" json:"a,omitempty"`
-}
-
-func (x *WeakImportMessage1) Reset() {
-	*x = WeakImportMessage1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test_weak1_test_weak_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WeakImportMessage1) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WeakImportMessage1) ProtoMessage() {}
-
-func (x *WeakImportMessage1) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test_weak1_test_weak_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WeakImportMessage1.ProtoReflect.Descriptor instead.
-func (*WeakImportMessage1) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test_weak1_test_weak_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *WeakImportMessage1) GetA() int32 {
-	if x != nil && x.A != nil {
-		return *x.A
-	}
-	return 0
-}
-
-var File_internal_testprotos_test_weak1_test_weak_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test_weak1_test_weak_proto_rawDesc = []byte{
-	0x0a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x77, 0x65, 0x61, 0x6b, 0x31,
-	0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x65, 0x61, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x17, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x2e, 0x77, 0x65, 0x61, 0x6b, 0x22, 0x22, 0x0a, 0x12, 0x57, 0x65, 0x61,
-	0x6b, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12,
-	0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x02, 0x28, 0x05, 0x52, 0x01, 0x61, 0x42, 0x3b, 0x5a,
-	0x39, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
-	0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
-	0x74, 0x65, 0x73, 0x74, 0x2f, 0x77, 0x65, 0x61, 0x6b, 0x31,
-}
-
-var (
-	file_internal_testprotos_test_weak1_test_weak_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test_weak1_test_weak_proto_rawDescData = file_internal_testprotos_test_weak1_test_weak_proto_rawDesc
-)
-
-func file_internal_testprotos_test_weak1_test_weak_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test_weak1_test_weak_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test_weak1_test_weak_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test_weak1_test_weak_proto_rawDescData)
-	})
-	return file_internal_testprotos_test_weak1_test_weak_proto_rawDescData
-}
-
-var file_internal_testprotos_test_weak1_test_weak_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_test_weak1_test_weak_proto_goTypes = []interface{}{
-	(*WeakImportMessage1)(nil), // 0: goproto.proto.test.weak.WeakImportMessage1
-}
-var file_internal_testprotos_test_weak1_test_weak_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test_weak1_test_weak_proto_init() }
-func file_internal_testprotos_test_weak1_test_weak_proto_init() {
-	if File_internal_testprotos_test_weak1_test_weak_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test_weak1_test_weak_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WeakImportMessage1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test_weak1_test_weak_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test_weak1_test_weak_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test_weak1_test_weak_proto_depIdxs,
-		MessageInfos:      file_internal_testprotos_test_weak1_test_weak_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_test_weak1_test_weak_proto = out.File
-	file_internal_testprotos_test_weak1_test_weak_proto_rawDesc = nil
-	file_internal_testprotos_test_weak1_test_weak_proto_goTypes = nil
-	file_internal_testprotos_test_weak1_test_weak_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/ya.make
deleted file mode 100644
index 7586de092a5..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/weak1/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test_weak.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/test/ya.make
deleted file mode 100644
index c65313d522e..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test/ya.make
+++ /dev/null
@@ -1,17 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(
-    ext.pb.go
-    test.pb.go
-    test_import.pb.go
-    test_public.pb.go
-)
-
-END()
-
-RECURSE(
-    weak1
-    weak2
-)
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test3/test.pb.go
deleted file mode 100644
index d2ff0bf2824..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test.pb.go
+++ /dev/null
@@ -1,1717 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test3/test.proto
-
-package test3
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type ForeignEnum int32
-
-const (
-	ForeignEnum_FOREIGN_ZERO ForeignEnum = 0
-	ForeignEnum_FOREIGN_FOO  ForeignEnum = 4
-	ForeignEnum_FOREIGN_BAR  ForeignEnum = 5
-	ForeignEnum_FOREIGN_BAZ  ForeignEnum = 6
-)
-
-// Enum value maps for ForeignEnum.
-var (
-	ForeignEnum_name = map[int32]string{
-		0: "FOREIGN_ZERO",
-		4: "FOREIGN_FOO",
-		5: "FOREIGN_BAR",
-		6: "FOREIGN_BAZ",
-	}
-	ForeignEnum_value = map[string]int32{
-		"FOREIGN_ZERO": 0,
-		"FOREIGN_FOO":  4,
-		"FOREIGN_BAR":  5,
-		"FOREIGN_BAZ":  6,
-	}
-)
-
-func (x ForeignEnum) Enum() *ForeignEnum {
-	p := new(ForeignEnum)
-	*p = x
-	return p
-}
-
-func (x ForeignEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ForeignEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test3_test_proto_enumTypes[0].Descriptor()
-}
-
-func (ForeignEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test3_test_proto_enumTypes[0]
-}
-
-func (x ForeignEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ForeignEnum.Descriptor instead.
-func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_proto_rawDescGZIP(), []int{0}
-}
-
-type TestAllTypes_NestedEnum int32
-
-const (
-	TestAllTypes_FOO TestAllTypes_NestedEnum = 0
-	TestAllTypes_BAR TestAllTypes_NestedEnum = 1
-	TestAllTypes_BAZ TestAllTypes_NestedEnum = 2
-	TestAllTypes_NEG TestAllTypes_NestedEnum = -1 // Intentionally negative.
-)
-
-// Enum value maps for TestAllTypes_NestedEnum.
-var (
-	TestAllTypes_NestedEnum_name = map[int32]string{
-		0:  "FOO",
-		1:  "BAR",
-		2:  "BAZ",
-		-1: "NEG",
-	}
-	TestAllTypes_NestedEnum_value = map[string]int32{
-		"FOO": 0,
-		"BAR": 1,
-		"BAZ": 2,
-		"NEG": -1,
-	}
-)
-
-func (x TestAllTypes_NestedEnum) Enum() *TestAllTypes_NestedEnum {
-	p := new(TestAllTypes_NestedEnum)
-	*p = x
-	return p
-}
-
-func (x TestAllTypes_NestedEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TestAllTypes_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test3_test_proto_enumTypes[1].Descriptor()
-}
-
-func (TestAllTypes_NestedEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test3_test_proto_enumTypes[1]
-}
-
-func (x TestAllTypes_NestedEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use TestAllTypes_NestedEnum.Descriptor instead.
-func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_proto_rawDescGZIP(), []int{0, 0}
-}
-
-type TestAllTypes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SingularInt32          int32                                  `protobuf:"varint,81,opt,name=singular_int32,json=singularInt32,proto3" json:"singular_int32,omitempty"`
-	SingularInt64          int64                                  `protobuf:"varint,82,opt,name=singular_int64,json=singularInt64,proto3" json:"singular_int64,omitempty"`
-	SingularUint32         uint32                                 `protobuf:"varint,83,opt,name=singular_uint32,json=singularUint32,proto3" json:"singular_uint32,omitempty"`
-	SingularUint64         uint64                                 `protobuf:"varint,84,opt,name=singular_uint64,json=singularUint64,proto3" json:"singular_uint64,omitempty"`
-	SingularSint32         int32                                  `protobuf:"zigzag32,85,opt,name=singular_sint32,json=singularSint32,proto3" json:"singular_sint32,omitempty"`
-	SingularSint64         int64                                  `protobuf:"zigzag64,86,opt,name=singular_sint64,json=singularSint64,proto3" json:"singular_sint64,omitempty"`
-	SingularFixed32        uint32                                 `protobuf:"fixed32,87,opt,name=singular_fixed32,json=singularFixed32,proto3" json:"singular_fixed32,omitempty"`
-	SingularFixed64        uint64                                 `protobuf:"fixed64,88,opt,name=singular_fixed64,json=singularFixed64,proto3" json:"singular_fixed64,omitempty"`
-	SingularSfixed32       int32                                  `protobuf:"fixed32,89,opt,name=singular_sfixed32,json=singularSfixed32,proto3" json:"singular_sfixed32,omitempty"`
-	SingularSfixed64       int64                                  `protobuf:"fixed64,90,opt,name=singular_sfixed64,json=singularSfixed64,proto3" json:"singular_sfixed64,omitempty"`
-	SingularFloat          float32                                `protobuf:"fixed32,91,opt,name=singular_float,json=singularFloat,proto3" json:"singular_float,omitempty"`
-	SingularDouble         float64                                `protobuf:"fixed64,92,opt,name=singular_double,json=singularDouble,proto3" json:"singular_double,omitempty"`
-	SingularBool           bool                                   `protobuf:"varint,93,opt,name=singular_bool,json=singularBool,proto3" json:"singular_bool,omitempty"`
-	SingularString         string                                 `protobuf:"bytes,94,opt,name=singular_string,json=singularString,proto3" json:"singular_string,omitempty"`
-	SingularBytes          []byte                                 `protobuf:"bytes,95,opt,name=singular_bytes,json=singularBytes,proto3" json:"singular_bytes,omitempty"`
-	SingularNestedMessage  *TestAllTypes_NestedMessage            `protobuf:"bytes,98,opt,name=singular_nested_message,json=singularNestedMessage,proto3" json:"singular_nested_message,omitempty"`
-	SingularForeignMessage *ForeignMessage                        `protobuf:"bytes,99,opt,name=singular_foreign_message,json=singularForeignMessage,proto3" json:"singular_foreign_message,omitempty"`
-	SingularImportMessage  *ImportMessage                         `protobuf:"bytes,100,opt,name=singular_import_message,json=singularImportMessage,proto3" json:"singular_import_message,omitempty"`
-	SingularNestedEnum     TestAllTypes_NestedEnum                `protobuf:"varint,101,opt,name=singular_nested_enum,json=singularNestedEnum,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum" json:"singular_nested_enum,omitempty"`
-	SingularForeignEnum    ForeignEnum                            `protobuf:"varint,102,opt,name=singular_foreign_enum,json=singularForeignEnum,proto3,enum=goproto.proto.test3.ForeignEnum" json:"singular_foreign_enum,omitempty"`
-	SingularImportEnum     ImportEnum                             `protobuf:"varint,103,opt,name=singular_import_enum,json=singularImportEnum,proto3,enum=goproto.proto.test3.ImportEnum" json:"singular_import_enum,omitempty"`
-	OptionalInt32          *int32                                 `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32,proto3,oneof" json:"optional_int32,omitempty"`
-	OptionalInt64          *int64                                 `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64,proto3,oneof" json:"optional_int64,omitempty"`
-	OptionalUint32         *uint32                                `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32,proto3,oneof" json:"optional_uint32,omitempty"`
-	OptionalUint64         *uint64                                `protobuf:"varint,4,opt,name=optional_uint64,json=optionalUint64,proto3,oneof" json:"optional_uint64,omitempty"`
-	OptionalSint32         *int32                                 `protobuf:"zigzag32,5,opt,name=optional_sint32,json=optionalSint32,proto3,oneof" json:"optional_sint32,omitempty"`
-	OptionalSint64         *int64                                 `protobuf:"zigzag64,6,opt,name=optional_sint64,json=optionalSint64,proto3,oneof" json:"optional_sint64,omitempty"`
-	OptionalFixed32        *uint32                                `protobuf:"fixed32,7,opt,name=optional_fixed32,json=optionalFixed32,proto3,oneof" json:"optional_fixed32,omitempty"`
-	OptionalFixed64        *uint64                                `protobuf:"fixed64,8,opt,name=optional_fixed64,json=optionalFixed64,proto3,oneof" json:"optional_fixed64,omitempty"`
-	OptionalSfixed32       *int32                                 `protobuf:"fixed32,9,opt,name=optional_sfixed32,json=optionalSfixed32,proto3,oneof" json:"optional_sfixed32,omitempty"`
-	OptionalSfixed64       *int64                                 `protobuf:"fixed64,10,opt,name=optional_sfixed64,json=optionalSfixed64,proto3,oneof" json:"optional_sfixed64,omitempty"`
-	OptionalFloat          *float32                               `protobuf:"fixed32,11,opt,name=optional_float,json=optionalFloat,proto3,oneof" json:"optional_float,omitempty"`
-	OptionalDouble         *float64                               `protobuf:"fixed64,12,opt,name=optional_double,json=optionalDouble,proto3,oneof" json:"optional_double,omitempty"`
-	OptionalBool           *bool                                  `protobuf:"varint,13,opt,name=optional_bool,json=optionalBool,proto3,oneof" json:"optional_bool,omitempty"`
-	OptionalString         *string                                `protobuf:"bytes,14,opt,name=optional_string,json=optionalString,proto3,oneof" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                                 `protobuf:"bytes,15,opt,name=optional_bytes,json=optionalBytes,proto3,oneof" json:"optional_bytes,omitempty"`
-	OptionalNestedMessage  *TestAllTypes_NestedMessage            `protobuf:"bytes,18,opt,name=optional_nested_message,json=optionalNestedMessage,proto3,oneof" json:"optional_nested_message,omitempty"`
-	OptionalForeignMessage *ForeignMessage                        `protobuf:"bytes,19,opt,name=optional_foreign_message,json=optionalForeignMessage,proto3,oneof" json:"optional_foreign_message,omitempty"`
-	OptionalImportMessage  *ImportMessage                         `protobuf:"bytes,20,opt,name=optional_import_message,json=optionalImportMessage,proto3,oneof" json:"optional_import_message,omitempty"`
-	OptionalNestedEnum     *TestAllTypes_NestedEnum               `protobuf:"varint,21,opt,name=optional_nested_enum,json=optionalNestedEnum,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum,oneof" json:"optional_nested_enum,omitempty"`
-	OptionalForeignEnum    *ForeignEnum                           `protobuf:"varint,22,opt,name=optional_foreign_enum,json=optionalForeignEnum,proto3,enum=goproto.proto.test3.ForeignEnum,oneof" json:"optional_foreign_enum,omitempty"`
-	OptionalImportEnum     *ImportEnum                            `protobuf:"varint,23,opt,name=optional_import_enum,json=optionalImportEnum,proto3,enum=goproto.proto.test3.ImportEnum,oneof" json:"optional_import_enum,omitempty"`
-	RepeatedInt32          []int32                                `protobuf:"varint,31,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
-	RepeatedInt64          []int64                                `protobuf:"varint,32,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
-	RepeatedUint32         []uint32                               `protobuf:"varint,33,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
-	RepeatedUint64         []uint64                               `protobuf:"varint,34,rep,packed,name=repeated_uint64,json=repeatedUint64,proto3" json:"repeated_uint64,omitempty"`
-	RepeatedSint32         []int32                                `protobuf:"zigzag32,35,rep,packed,name=repeated_sint32,json=repeatedSint32,proto3" json:"repeated_sint32,omitempty"`
-	RepeatedSint64         []int64                                `protobuf:"zigzag64,36,rep,packed,name=repeated_sint64,json=repeatedSint64,proto3" json:"repeated_sint64,omitempty"`
-	RepeatedFixed32        []uint32                               `protobuf:"fixed32,37,rep,packed,name=repeated_fixed32,json=repeatedFixed32,proto3" json:"repeated_fixed32,omitempty"`
-	RepeatedFixed64        []uint64                               `protobuf:"fixed64,38,rep,packed,name=repeated_fixed64,json=repeatedFixed64,proto3" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed32       []int32                                `protobuf:"fixed32,39,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32,proto3" json:"repeated_sfixed32,omitempty"`
-	RepeatedSfixed64       []int64                                `protobuf:"fixed64,40,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64,proto3" json:"repeated_sfixed64,omitempty"`
-	RepeatedFloat          []float32                              `protobuf:"fixed32,41,rep,packed,name=repeated_float,json=repeatedFloat,proto3" json:"repeated_float,omitempty"`
-	RepeatedDouble         []float64                              `protobuf:"fixed64,42,rep,packed,name=repeated_double,json=repeatedDouble,proto3" json:"repeated_double,omitempty"`
-	RepeatedBool           []bool                                 `protobuf:"varint,43,rep,packed,name=repeated_bool,json=repeatedBool,proto3" json:"repeated_bool,omitempty"`
-	RepeatedString         []string                               `protobuf:"bytes,44,rep,name=repeated_string,json=repeatedString,proto3" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                               `protobuf:"bytes,45,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedNestedMessage  []*TestAllTypes_NestedMessage          `protobuf:"bytes,48,rep,name=repeated_nested_message,json=repeatedNestedMessage,proto3" json:"repeated_nested_message,omitempty"`
-	RepeatedForeignMessage []*ForeignMessage                      `protobuf:"bytes,49,rep,name=repeated_foreign_message,json=repeatedForeignMessage,proto3" json:"repeated_foreign_message,omitempty"`
-	RepeatedImportmessage  []*ImportMessage                       `protobuf:"bytes,50,rep,name=repeated_importmessage,json=repeatedImportmessage,proto3" json:"repeated_importmessage,omitempty"`
-	RepeatedNestedEnum     []TestAllTypes_NestedEnum              `protobuf:"varint,51,rep,packed,name=repeated_nested_enum,json=repeatedNestedEnum,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum" json:"repeated_nested_enum,omitempty"`
-	RepeatedForeignEnum    []ForeignEnum                          `protobuf:"varint,52,rep,packed,name=repeated_foreign_enum,json=repeatedForeignEnum,proto3,enum=goproto.proto.test3.ForeignEnum" json:"repeated_foreign_enum,omitempty"`
-	RepeatedImportenum     []ImportEnum                           `protobuf:"varint,53,rep,packed,name=repeated_importenum,json=repeatedImportenum,proto3,enum=goproto.proto.test3.ImportEnum" json:"repeated_importenum,omitempty"`
-	MapInt32Int32          map[int32]int32                        `protobuf:"bytes,56,rep,name=map_int32_int32,json=mapInt32Int32,proto3" json:"map_int32_int32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapInt64Int64          map[int64]int64                        `protobuf:"bytes,57,rep,name=map_int64_int64,json=mapInt64Int64,proto3" json:"map_int64_int64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint32Uint32        map[uint32]uint32                      `protobuf:"bytes,58,rep,name=map_uint32_uint32,json=mapUint32Uint32,proto3" json:"map_uint32_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapUint64Uint64        map[uint64]uint64                      `protobuf:"bytes,59,rep,name=map_uint64_uint64,json=mapUint64Uint64,proto3" json:"map_uint64_uint64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapSint32Sint32        map[int32]int32                        `protobuf:"bytes,60,rep,name=map_sint32_sint32,json=mapSint32Sint32,proto3" json:"map_sint32_sint32,omitempty" protobuf_key:"zigzag32,1,opt,name=key,proto3" protobuf_val:"zigzag32,2,opt,name=value,proto3"`
-	MapSint64Sint64        map[int64]int64                        `protobuf:"bytes,61,rep,name=map_sint64_sint64,json=mapSint64Sint64,proto3" json:"map_sint64_sint64,omitempty" protobuf_key:"zigzag64,1,opt,name=key,proto3" protobuf_val:"zigzag64,2,opt,name=value,proto3"`
-	MapFixed32Fixed32      map[uint32]uint32                      `protobuf:"bytes,62,rep,name=map_fixed32_fixed32,json=mapFixed32Fixed32,proto3" json:"map_fixed32_fixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapFixed64Fixed64      map[uint64]uint64                      `protobuf:"bytes,63,rep,name=map_fixed64_fixed64,json=mapFixed64Fixed64,proto3" json:"map_fixed64_fixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapSfixed32Sfixed32    map[int32]int32                        `protobuf:"bytes,64,rep,name=map_sfixed32_sfixed32,json=mapSfixed32Sfixed32,proto3" json:"map_sfixed32_sfixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapSfixed64Sfixed64    map[int64]int64                        `protobuf:"bytes,65,rep,name=map_sfixed64_sfixed64,json=mapSfixed64Sfixed64,proto3" json:"map_sfixed64_sfixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapInt32Float          map[int32]float32                      `protobuf:"bytes,66,rep,name=map_int32_float,json=mapInt32Float,proto3" json:"map_int32_float,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed32,2,opt,name=value,proto3"`
-	MapInt32Double         map[int32]float64                      `protobuf:"bytes,67,rep,name=map_int32_double,json=mapInt32Double,proto3" json:"map_int32_double,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"`
-	MapBoolBool            map[bool]bool                          `protobuf:"bytes,68,rep,name=map_bool_bool,json=mapBoolBool,proto3" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapStringString        map[string]string                      `protobuf:"bytes,69,rep,name=map_string_string,json=mapStringString,proto3" json:"map_string_string,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapStringBytes         map[string][]byte                      `protobuf:"bytes,70,rep,name=map_string_bytes,json=mapStringBytes,proto3" json:"map_string_bytes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapStringNestedMessage map[string]*TestAllTypes_NestedMessage `protobuf:"bytes,71,rep,name=map_string_nested_message,json=mapStringNestedMessage,proto3" json:"map_string_nested_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapStringNestedEnum    map[string]TestAllTypes_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum,proto3" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum"`
-	// Types that are assignable to OneofField:
-	//
-	//	*TestAllTypes_OneofUint32
-	//	*TestAllTypes_OneofNestedMessage
-	//	*TestAllTypes_OneofString
-	//	*TestAllTypes_OneofBytes
-	//	*TestAllTypes_OneofBool
-	//	*TestAllTypes_OneofUint64
-	//	*TestAllTypes_OneofFloat
-	//	*TestAllTypes_OneofDouble
-	//	*TestAllTypes_OneofEnum
-	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-}
-
-func (x *TestAllTypes) Reset() {
-	*x = TestAllTypes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test3_test_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes) ProtoMessage() {}
-
-func (x *TestAllTypes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test3_test_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes.ProtoReflect.Descriptor instead.
-func (*TestAllTypes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TestAllTypes) GetSingularInt32() int32 {
-	if x != nil {
-		return x.SingularInt32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularInt64() int64 {
-	if x != nil {
-		return x.SingularInt64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularUint32() uint32 {
-	if x != nil {
-		return x.SingularUint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularUint64() uint64 {
-	if x != nil {
-		return x.SingularUint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularSint32() int32 {
-	if x != nil {
-		return x.SingularSint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularSint64() int64 {
-	if x != nil {
-		return x.SingularSint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularFixed32() uint32 {
-	if x != nil {
-		return x.SingularFixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularFixed64() uint64 {
-	if x != nil {
-		return x.SingularFixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularSfixed32() int32 {
-	if x != nil {
-		return x.SingularSfixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularSfixed64() int64 {
-	if x != nil {
-		return x.SingularSfixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularFloat() float32 {
-	if x != nil {
-		return x.SingularFloat
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularDouble() float64 {
-	if x != nil {
-		return x.SingularDouble
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetSingularBool() bool {
-	if x != nil {
-		return x.SingularBool
-	}
-	return false
-}
-
-func (x *TestAllTypes) GetSingularString() string {
-	if x != nil {
-		return x.SingularString
-	}
-	return ""
-}
-
-func (x *TestAllTypes) GetSingularBytes() []byte {
-	if x != nil {
-		return x.SingularBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetSingularNestedMessage() *TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.SingularNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetSingularForeignMessage() *ForeignMessage {
-	if x != nil {
-		return x.SingularForeignMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetSingularImportMessage() *ImportMessage {
-	if x != nil {
-		return x.SingularImportMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetSingularNestedEnum() TestAllTypes_NestedEnum {
-	if x != nil {
-		return x.SingularNestedEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (x *TestAllTypes) GetSingularForeignEnum() ForeignEnum {
-	if x != nil {
-		return x.SingularForeignEnum
-	}
-	return ForeignEnum_FOREIGN_ZERO
-}
-
-func (x *TestAllTypes) GetSingularImportEnum() ImportEnum {
-	if x != nil {
-		return x.SingularImportEnum
-	}
-	return ImportEnum_IMPORT_ZERO
-}
-
-func (x *TestAllTypes) GetOptionalInt32() int32 {
-	if x != nil && x.OptionalInt32 != nil {
-		return *x.OptionalInt32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalInt64() int64 {
-	if x != nil && x.OptionalInt64 != nil {
-		return *x.OptionalInt64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalUint32() uint32 {
-	if x != nil && x.OptionalUint32 != nil {
-		return *x.OptionalUint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalUint64() uint64 {
-	if x != nil && x.OptionalUint64 != nil {
-		return *x.OptionalUint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSint32() int32 {
-	if x != nil && x.OptionalSint32 != nil {
-		return *x.OptionalSint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSint64() int64 {
-	if x != nil && x.OptionalSint64 != nil {
-		return *x.OptionalSint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFixed32() uint32 {
-	if x != nil && x.OptionalFixed32 != nil {
-		return *x.OptionalFixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFixed64() uint64 {
-	if x != nil && x.OptionalFixed64 != nil {
-		return *x.OptionalFixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSfixed32() int32 {
-	if x != nil && x.OptionalSfixed32 != nil {
-		return *x.OptionalSfixed32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalSfixed64() int64 {
-	if x != nil && x.OptionalSfixed64 != nil {
-		return *x.OptionalSfixed64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalFloat() float32 {
-	if x != nil && x.OptionalFloat != nil {
-		return *x.OptionalFloat
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalDouble() float64 {
-	if x != nil && x.OptionalDouble != nil {
-		return *x.OptionalDouble
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOptionalBool() bool {
-	if x != nil && x.OptionalBool != nil {
-		return *x.OptionalBool
-	}
-	return false
-}
-
-func (x *TestAllTypes) GetOptionalString() string {
-	if x != nil && x.OptionalString != nil {
-		return *x.OptionalString
-	}
-	return ""
-}
-
-func (x *TestAllTypes) GetOptionalBytes() []byte {
-	if x != nil {
-		return x.OptionalBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalNestedMessage() *TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.OptionalNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalForeignMessage() *ForeignMessage {
-	if x != nil {
-		return x.OptionalForeignMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalImportMessage() *ImportMessage {
-	if x != nil {
-		return x.OptionalImportMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOptionalNestedEnum() TestAllTypes_NestedEnum {
-	if x != nil && x.OptionalNestedEnum != nil {
-		return *x.OptionalNestedEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (x *TestAllTypes) GetOptionalForeignEnum() ForeignEnum {
-	if x != nil && x.OptionalForeignEnum != nil {
-		return *x.OptionalForeignEnum
-	}
-	return ForeignEnum_FOREIGN_ZERO
-}
-
-func (x *TestAllTypes) GetOptionalImportEnum() ImportEnum {
-	if x != nil && x.OptionalImportEnum != nil {
-		return *x.OptionalImportEnum
-	}
-	return ImportEnum_IMPORT_ZERO
-}
-
-func (x *TestAllTypes) GetRepeatedInt32() []int32 {
-	if x != nil {
-		return x.RepeatedInt32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedInt64() []int64 {
-	if x != nil {
-		return x.RepeatedInt64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedUint32() []uint32 {
-	if x != nil {
-		return x.RepeatedUint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedUint64() []uint64 {
-	if x != nil {
-		return x.RepeatedUint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSint32() []int32 {
-	if x != nil {
-		return x.RepeatedSint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSint64() []int64 {
-	if x != nil {
-		return x.RepeatedSint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFixed32() []uint32 {
-	if x != nil {
-		return x.RepeatedFixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFixed64() []uint64 {
-	if x != nil {
-		return x.RepeatedFixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSfixed32() []int32 {
-	if x != nil {
-		return x.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedSfixed64() []int64 {
-	if x != nil {
-		return x.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedFloat() []float32 {
-	if x != nil {
-		return x.RepeatedFloat
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedDouble() []float64 {
-	if x != nil {
-		return x.RepeatedDouble
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedBool() []bool {
-	if x != nil {
-		return x.RepeatedBool
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedString() []string {
-	if x != nil {
-		return x.RepeatedString
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedBytes() [][]byte {
-	if x != nil {
-		return x.RepeatedBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedNestedMessage() []*TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.RepeatedNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedForeignMessage() []*ForeignMessage {
-	if x != nil {
-		return x.RepeatedForeignMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedImportmessage() []*ImportMessage {
-	if x != nil {
-		return x.RepeatedImportmessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedNestedEnum() []TestAllTypes_NestedEnum {
-	if x != nil {
-		return x.RepeatedNestedEnum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedForeignEnum() []ForeignEnum {
-	if x != nil {
-		return x.RepeatedForeignEnum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetRepeatedImportenum() []ImportEnum {
-	if x != nil {
-		return x.RepeatedImportenum
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Int32() map[int32]int32 {
-	if x != nil {
-		return x.MapInt32Int32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt64Int64() map[int64]int64 {
-	if x != nil {
-		return x.MapInt64Int64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapUint32Uint32() map[uint32]uint32 {
-	if x != nil {
-		return x.MapUint32Uint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapUint64Uint64() map[uint64]uint64 {
-	if x != nil {
-		return x.MapUint64Uint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSint32Sint32() map[int32]int32 {
-	if x != nil {
-		return x.MapSint32Sint32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSint64Sint64() map[int64]int64 {
-	if x != nil {
-		return x.MapSint64Sint64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapFixed32Fixed32() map[uint32]uint32 {
-	if x != nil {
-		return x.MapFixed32Fixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapFixed64Fixed64() map[uint64]uint64 {
-	if x != nil {
-		return x.MapFixed64Fixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSfixed32Sfixed32() map[int32]int32 {
-	if x != nil {
-		return x.MapSfixed32Sfixed32
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapSfixed64Sfixed64() map[int64]int64 {
-	if x != nil {
-		return x.MapSfixed64Sfixed64
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Float() map[int32]float32 {
-	if x != nil {
-		return x.MapInt32Float
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapInt32Double() map[int32]float64 {
-	if x != nil {
-		return x.MapInt32Double
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapBoolBool() map[bool]bool {
-	if x != nil {
-		return x.MapBoolBool
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringString() map[string]string {
-	if x != nil {
-		return x.MapStringString
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringBytes() map[string][]byte {
-	if x != nil {
-		return x.MapStringBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringNestedMessage() map[string]*TestAllTypes_NestedMessage {
-	if x != nil {
-		return x.MapStringNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetMapStringNestedEnum() map[string]TestAllTypes_NestedEnum {
-	if x != nil {
-		return x.MapStringNestedEnum
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOneofField() isTestAllTypes_OneofField {
-	if m != nil {
-		return m.OneofField
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofUint32() uint32 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofNestedMessage() *TestAllTypes_NestedMessage {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofNestedMessage); ok {
-		return x.OneofNestedMessage
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofString() string {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (x *TestAllTypes) GetOneofBytes() []byte {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (x *TestAllTypes) GetOneofBool() bool {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (x *TestAllTypes) GetOneofUint64() uint64 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofFloat() float32 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofDouble() float64 {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (x *TestAllTypes) GetOneofEnum() TestAllTypes_NestedEnum {
-	if x, ok := x.GetOneofField().(*TestAllTypes_OneofEnum); ok {
-		return x.OneofEnum
-	}
-	return TestAllTypes_FOO
-}
-
-type isTestAllTypes_OneofField interface {
-	isTestAllTypes_OneofField()
-}
-
-type TestAllTypes_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,111,opt,name=oneof_uint32,json=oneofUint32,proto3,oneof"`
-}
-
-type TestAllTypes_OneofNestedMessage struct {
-	OneofNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,112,opt,name=oneof_nested_message,json=oneofNestedMessage,proto3,oneof"`
-}
-
-type TestAllTypes_OneofString struct {
-	OneofString string `protobuf:"bytes,113,opt,name=oneof_string,json=oneofString,proto3,oneof"`
-}
-
-type TestAllTypes_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-
-type TestAllTypes_OneofBool struct {
-	OneofBool bool `protobuf:"varint,115,opt,name=oneof_bool,json=oneofBool,proto3,oneof"`
-}
-
-type TestAllTypes_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,116,opt,name=oneof_uint64,json=oneofUint64,proto3,oneof"`
-}
-
-type TestAllTypes_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,117,opt,name=oneof_float,json=oneofFloat,proto3,oneof"`
-}
-
-type TestAllTypes_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,118,opt,name=oneof_double,json=oneofDouble,proto3,oneof"`
-}
-
-type TestAllTypes_OneofEnum struct {
-	OneofEnum TestAllTypes_NestedEnum `protobuf:"varint,119,opt,name=oneof_enum,json=oneofEnum,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum,oneof"`
-}
-
-func (*TestAllTypes_OneofUint32) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofNestedMessage) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofString) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofBytes) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofBool) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofUint64) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofFloat) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofDouble) isTestAllTypes_OneofField() {}
-
-func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField() {}
-
-type ForeignMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	C int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
-	D int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
-}
-
-func (x *ForeignMessage) Reset() {
-	*x = ForeignMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test3_test_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ForeignMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ForeignMessage) ProtoMessage() {}
-
-func (x *ForeignMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test3_test_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ForeignMessage.ProtoReflect.Descriptor instead.
-func (*ForeignMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ForeignMessage) GetC() int32 {
-	if x != nil {
-		return x.C
-	}
-	return 0
-}
-
-func (x *ForeignMessage) GetD() int32 {
-	if x != nil {
-		return x.D
-	}
-	return 0
-}
-
-type TestAllTypes_NestedMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	A           int32         `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
-	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
-}
-
-func (x *TestAllTypes_NestedMessage) Reset() {
-	*x = TestAllTypes_NestedMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test3_test_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TestAllTypes_NestedMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TestAllTypes_NestedMessage) ProtoMessage() {}
-
-func (x *TestAllTypes_NestedMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test3_test_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Descriptor instead.
-func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *TestAllTypes_NestedMessage) GetA() int32 {
-	if x != nil {
-		return x.A
-	}
-	return 0
-}
-
-func (x *TestAllTypes_NestedMessage) GetCorecursive() *TestAllTypes {
-	if x != nil {
-		return x.Corecursive
-	}
-	return nil
-}
-
-var File_internal_testprotos_test3_test_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test3_test_proto_rawDesc = []byte{
-	0x0a, 0x24, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x1a, 0x2b, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
-	0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6d, 0x70, 0x6f,
-	0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x3c, 0x0a, 0x0c, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x51, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0d, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x12, 0x25, 0x0a, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x18, 0x52, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c,
-	0x61, 0x72, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75,
-	0x6c, 0x61, 0x72, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x53, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x18, 0x54, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x75,
-	0x6c, 0x61, 0x72, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x55, 0x20, 0x01,
-	0x28, 0x11, 0x52, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x53, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x56, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0e, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x10, 0x73,
-	0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18,
-	0x57, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x46,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c,
-	0x61, 0x72, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x58, 0x20, 0x01, 0x28, 0x06,
-	0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x12, 0x2b, 0x0a, 0x11, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x59, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x10, 0x73, 0x69,
-	0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x2b,
-	0x0a, 0x11, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x18, 0x5a, 0x20, 0x01, 0x28, 0x10, 0x52, 0x10, 0x73, 0x69, 0x6e, 0x67, 0x75,
-	0x6c, 0x61, 0x72, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x0a, 0x0e, 0x73,
-	0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x5b, 0x20,
-	0x01, 0x28, 0x02, 0x52, 0x0d, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x64,
-	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x5c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73,
-	0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x5d, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x42, 0x6f, 0x6f, 0x6c,
-	0x12, 0x27, 0x0a, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x18, 0x5e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x69, 0x6e, 0x67, 0x75,
-	0x6c, 0x61, 0x72, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x5f, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0d, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x42, 0x79, 0x74, 0x65, 0x73,
-	0x12, 0x67, 0x0a, 0x17, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x6e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x62, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x52, 0x15, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5d, 0x0a, 0x18, 0x73, 0x69, 0x6e,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x63, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x52, 0x16, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5a, 0x0a, 0x17, 0x73, 0x69, 0x6e, 0x67,
-	0x75, 0x6c, 0x61, 0x72, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e,
-	0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15, 0x73,
-	0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x5e, 0x0a, 0x14, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72,
-	0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x65, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
-	0x52, 0x12, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x45, 0x6e, 0x75, 0x6d, 0x12, 0x54, 0x0a, 0x15, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72,
-	0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x66, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x13, 0x73, 0x69, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x46,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x51, 0x0a, 0x14, 0x73, 0x69,
-	0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x65, 0x6e,
-	0x75, 0x6d, 0x18, 0x67, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x49,
-	0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x73, 0x69, 0x6e, 0x67, 0x75,
-	0x6c, 0x61, 0x72, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x0a,
-	0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x48, 0x02, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74,
-	0x36, 0x34, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x48, 0x04, 0x52, 0x0e,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x88, 0x01,
-	0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11, 0x48, 0x05, 0x52, 0x0e, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x88, 0x01, 0x01, 0x12,
-	0x2c, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x18, 0x06, 0x20, 0x01, 0x28, 0x12, 0x48, 0x06, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a,
-	0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33,
-	0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x07, 0x48, 0x07, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a,
-	0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x18, 0x08, 0x20, 0x01, 0x28, 0x06, 0x48, 0x08, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a,
-	0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0f, 0x48, 0x09, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x88, 0x01, 0x01, 0x12,
-	0x30, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x10, 0x48, 0x0a, 0x52, 0x10, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x88, 0x01,
-	0x01, 0x12, 0x2a, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6c,
-	0x6f, 0x61, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x02, 0x48, 0x0b, 0x52, 0x0d, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a,
-	0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x48, 0x0c, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x0d, 0x20, 0x01,
-	0x28, 0x08, 0x48, 0x0d, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x6f,
-	0x6f, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0e,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x0f, 0x52, 0x0d, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12,
-	0x6c, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79,
-	0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x48, 0x10, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x62, 0x0a,
-	0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x23, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x48, 0x11, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, 0x01,
-	0x01, 0x12, 0x5f, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6d,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x14, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x12, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88,
-	0x01, 0x01, 0x12, 0x63, 0x0a, 0x14, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79,
-	0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x48, 0x13,
-	0x52, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x45, 0x6e, 0x75, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x59, 0x0a, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d,
-	0x18, 0x16, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72,
-	0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x48, 0x14, 0x52, 0x13, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x88,
-	0x01, 0x01, 0x12, 0x56, 0x0a, 0x14, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69,
-	0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75,
-	0x6d, 0x48, 0x15, 0x52, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6d, 0x70,
-	0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x1f, 0x20, 0x03,
-	0x28, 0x05, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x18, 0x20, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x21, 0x20, 0x03, 0x28,
-	0x0d, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x75, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x18, 0x22, 0x20, 0x03, 0x28, 0x04, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x23, 0x20,
-	0x03, 0x28, 0x11, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x24, 0x20, 0x03, 0x28, 0x12, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x29, 0x0a, 0x10,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
-	0x18, 0x25, 0x20, 0x03, 0x28, 0x07, 0x52, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x70, 0x65, 0x61,
-	0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x26, 0x20, 0x03, 0x28,
-	0x06, 0x52, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x78, 0x65, 0x64,
-	0x36, 0x34, 0x12, 0x2b, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x27, 0x20, 0x03, 0x28, 0x0f, 0x52, 0x10, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12,
-	0x2b, 0x0a, 0x11, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x18, 0x28, 0x20, 0x03, 0x28, 0x10, 0x52, 0x10, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x25, 0x0a, 0x0e,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x29,
-	0x20, 0x03, 0x28, 0x02, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x6c,
-	0x6f, 0x61, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x2a, 0x20, 0x03, 0x28, 0x01, 0x52, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d,
-	0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x2b, 0x20,
-	0x03, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x6f, 0x6f,
-	0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x18, 0x2c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x70, 0x65,
-	0x61, 0x74, 0x65, 0x64, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x2d, 0x20, 0x03,
-	0x28, 0x0c, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x42, 0x79, 0x74, 0x65,
-	0x73, 0x12, 0x67, 0x0a, 0x17, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x30, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x52, 0x15, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x5d, 0x0a, 0x18, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x31, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x52, 0x16, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x59, 0x0a, 0x16, 0x72, 0x65, 0x70,
-	0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x18, 0x32, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x6f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e,
-	0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x15, 0x72,
-	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x5e, 0x0a, 0x14, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x33, 0x20, 0x03,
-	0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
-	0x52, 0x12, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x45, 0x6e, 0x75, 0x6d, 0x12, 0x54, 0x0a, 0x15, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x34, 0x20,
-	0x03, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67,
-	0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x13, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x50, 0x0a, 0x13, 0x72, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x6e, 0x75,
-	0x6d, 0x18, 0x35, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x49, 0x6d,
-	0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x12, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74,
-	0x65, 0x64, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x5c, 0x0a, 0x0f,
-	0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18,
-	0x38, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d, 0x61, 0x70,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x5c, 0x0a, 0x0f, 0x6d, 0x61,
-	0x70, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x39, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x49,
-	0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d, 0x61, 0x70, 0x49, 0x6e,
-	0x74, 0x36, 0x34, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x62, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f,
-	0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x3a, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c,
-	0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70,
-	0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x62, 0x0a, 0x11,
-	0x6d, 0x61, 0x70, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x18, 0x3b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x55, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x0f, 0x6d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x12, 0x62, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x73,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x3c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d,
-	0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x62, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x3d, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x36, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70,
-	0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x53, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x68, 0x0a, 0x13, 0x6d, 0x61, 0x70, 0x5f,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18,
-	0x3e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x11, 0x6d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x12, 0x68, 0x0a, 0x13, 0x6d, 0x61, 0x70, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x3f, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x38, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70,
-	0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x46, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x6d, 0x61, 0x70, 0x46, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x6e, 0x0a, 0x15,
-	0x6d, 0x61, 0x70, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x5f, 0x73, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x40, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d,
-	0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x6d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x6e, 0x0a, 0x15,
-	0x6d, 0x61, 0x70, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x5f, 0x73, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x41, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d,
-	0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13, 0x6d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x5c, 0x0a, 0x0f,
-	0x6d, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18,
-	0x42, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74,
-	0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x6d, 0x61, 0x70,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x5f, 0x0a, 0x10, 0x6d, 0x61,
-	0x70, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x43,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41,
-	0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74, 0x33, 0x32,
-	0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6d, 0x61, 0x70,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x56, 0x0a, 0x0d, 0x6d,
-	0x61, 0x70, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x44, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x42, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f,
-	0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x61, 0x70, 0x42, 0x6f, 0x6f, 0x6c, 0x42,
-	0x6f, 0x6f, 0x6c, 0x12, 0x62, 0x0a, 0x11, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x45, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
-	0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65,
-	0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5f, 0x0a, 0x10, 0x6d, 0x61, 0x70, 0x5f, 0x73,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x46, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x35, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x79,
-	0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x6d, 0x61, 0x70, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x78, 0x0a, 0x19, 0x6d, 0x61, 0x70, 0x5f,
-	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x47, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d,
-	0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x16, 0x6d, 0x61, 0x70, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x6f, 0x0a, 0x16, 0x6d, 0x61, 0x70, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x49, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x13,
-	0x6d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45,
-	0x6e, 0x75, 0x6d, 0x12, 0x23, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x75, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x18, 0x6f, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x63, 0x0a, 0x14, 0x6f, 0x6e, 0x65, 0x6f,
-	0x66, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x70, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x00, 0x52, 0x12, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a,
-	0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x71, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x12, 0x21, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x62, 0x79, 0x74, 0x65,
-	0x73, 0x18, 0x72, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
-	0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x62,
-	0x6f, 0x6f, 0x6c, 0x18, 0x73, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x23, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f,
-	0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x74, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b,
-	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x21, 0x0a, 0x0b, 0x6f,
-	0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x75, 0x20, 0x01, 0x28, 0x02,
-	0x48, 0x00, 0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x23,
-	0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x76,
-	0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x65, 0x6e, 0x75,
-	0x6d, 0x18, 0x77, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65,
-	0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x45, 0x6e, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x45, 0x6e,
-	0x75, 0x6d, 0x1a, 0x62, 0x0a, 0x0d, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
-	0x61, 0x12, 0x43, 0x0a, 0x0b, 0x63, 0x6f, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73,
-	0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x72, 0x65, 0x63,
-	0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x1a, 0x40, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49,
-	0x6e, 0x74, 0x36, 0x34, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61,
-	0x70, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42,
-	0x0a, 0x14, 0x4d, 0x61, 0x70, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x55, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61, 0x70, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x53,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d, 0x61, 0x70, 0x53, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x4d, 0x61,
-	0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x07, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x07, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x1a, 0x44, 0x0a, 0x16, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x46, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x33, 0x32, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0f, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46,
-	0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x53, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x10, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x10, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x12, 0x4d, 0x61, 0x70, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x4d, 0x61, 0x70, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x4d,
-	0x61, 0x70, 0x42, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x14, 0x4d,
-	0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
-	0x41, 0x0a, 0x13, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x79, 0x74, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x7a, 0x0a, 0x1b, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x74,
-	0x0a, 0x18, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x42, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x67, 0x6f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
-	0x33, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x39, 0x0a, 0x0a, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e,
-	0x75, 0x6d, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x4f, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42,
-	0x41, 0x52, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x5a, 0x10, 0x02, 0x12, 0x10, 0x0a,
-	0x03, 0x4e, 0x45, 0x47, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x42,
-	0x0d, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x11,
-	0x0a, 0x0f, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x42, 0x12, 0x0a, 0x10,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x42, 0x14,
-	0x0a, 0x12, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x42, 0x12, 0x0a,
-	0x10, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c,
-	0x65, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62,
-	0x6f, 0x6f, 0x6c, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42,
-	0x17, 0x0a, 0x15, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e,
-	0x75, 0x6d, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x22, 0x2c, 0x0a, 0x0e, 0x46,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0c, 0x0a,
-	0x01, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x63, 0x12, 0x0c, 0x0a, 0x01, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x64, 0x2a, 0x52, 0x0a, 0x0b, 0x46, 0x6f, 0x72,
-	0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x4f, 0x52, 0x45,
-	0x49, 0x47, 0x4e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x46, 0x4f,
-	0x52, 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x46, 0x4f, 0x4f, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x46,
-	0x4f, 0x52, 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b,
-	0x46, 0x4f, 0x52, 0x45, 0x49, 0x47, 0x4e, 0x5f, 0x42, 0x41, 0x5a, 0x10, 0x06, 0x42, 0x36, 0x5a,
-	0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
-	0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
-	0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_internal_testprotos_test3_test_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test3_test_proto_rawDescData = file_internal_testprotos_test3_test_proto_rawDesc
-)
-
-func file_internal_testprotos_test3_test_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test3_test_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test3_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test3_test_proto_rawDescData)
-	})
-	return file_internal_testprotos_test3_test_proto_rawDescData
-}
-
-var file_internal_testprotos_test3_test_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_internal_testprotos_test3_test_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
-var file_internal_testprotos_test3_test_proto_goTypes = []interface{}{
-	(ForeignEnum)(0),                   // 0: goproto.proto.test3.ForeignEnum
-	(TestAllTypes_NestedEnum)(0),       // 1: goproto.proto.test3.TestAllTypes.NestedEnum
-	(*TestAllTypes)(nil),               // 2: goproto.proto.test3.TestAllTypes
-	(*ForeignMessage)(nil),             // 3: goproto.proto.test3.ForeignMessage
-	(*TestAllTypes_NestedMessage)(nil), // 4: goproto.proto.test3.TestAllTypes.NestedMessage
-	nil,                                // 5: goproto.proto.test3.TestAllTypes.MapInt32Int32Entry
-	nil,                                // 6: goproto.proto.test3.TestAllTypes.MapInt64Int64Entry
-	nil,                                // 7: goproto.proto.test3.TestAllTypes.MapUint32Uint32Entry
-	nil,                                // 8: goproto.proto.test3.TestAllTypes.MapUint64Uint64Entry
-	nil,                                // 9: goproto.proto.test3.TestAllTypes.MapSint32Sint32Entry
-	nil,                                // 10: goproto.proto.test3.TestAllTypes.MapSint64Sint64Entry
-	nil,                                // 11: goproto.proto.test3.TestAllTypes.MapFixed32Fixed32Entry
-	nil,                                // 12: goproto.proto.test3.TestAllTypes.MapFixed64Fixed64Entry
-	nil,                                // 13: goproto.proto.test3.TestAllTypes.MapSfixed32Sfixed32Entry
-	nil,                                // 14: goproto.proto.test3.TestAllTypes.MapSfixed64Sfixed64Entry
-	nil,                                // 15: goproto.proto.test3.TestAllTypes.MapInt32FloatEntry
-	nil,                                // 16: goproto.proto.test3.TestAllTypes.MapInt32DoubleEntry
-	nil,                                // 17: goproto.proto.test3.TestAllTypes.MapBoolBoolEntry
-	nil,                                // 18: goproto.proto.test3.TestAllTypes.MapStringStringEntry
-	nil,                                // 19: goproto.proto.test3.TestAllTypes.MapStringBytesEntry
-	nil,                                // 20: goproto.proto.test3.TestAllTypes.MapStringNestedMessageEntry
-	nil,                                // 21: goproto.proto.test3.TestAllTypes.MapStringNestedEnumEntry
-	(*ImportMessage)(nil),              // 22: goproto.proto.test3.ImportMessage
-	(ImportEnum)(0),                    // 23: goproto.proto.test3.ImportEnum
-}
-var file_internal_testprotos_test3_test_proto_depIdxs = []int32{
-	4,  // 0: goproto.proto.test3.TestAllTypes.singular_nested_message:type_name -> goproto.proto.test3.TestAllTypes.NestedMessage
-	3,  // 1: goproto.proto.test3.TestAllTypes.singular_foreign_message:type_name -> goproto.proto.test3.ForeignMessage
-	22, // 2: goproto.proto.test3.TestAllTypes.singular_import_message:type_name -> goproto.proto.test3.ImportMessage
-	1,  // 3: goproto.proto.test3.TestAllTypes.singular_nested_enum:type_name -> goproto.proto.test3.TestAllTypes.NestedEnum
-	0,  // 4: goproto.proto.test3.TestAllTypes.singular_foreign_enum:type_name -> goproto.proto.test3.ForeignEnum
-	23, // 5: goproto.proto.test3.TestAllTypes.singular_import_enum:type_name -> goproto.proto.test3.ImportEnum
-	4,  // 6: goproto.proto.test3.TestAllTypes.optional_nested_message:type_name -> goproto.proto.test3.TestAllTypes.NestedMessage
-	3,  // 7: goproto.proto.test3.TestAllTypes.optional_foreign_message:type_name -> goproto.proto.test3.ForeignMessage
-	22, // 8: goproto.proto.test3.TestAllTypes.optional_import_message:type_name -> goproto.proto.test3.ImportMessage
-	1,  // 9: goproto.proto.test3.TestAllTypes.optional_nested_enum:type_name -> goproto.proto.test3.TestAllTypes.NestedEnum
-	0,  // 10: goproto.proto.test3.TestAllTypes.optional_foreign_enum:type_name -> goproto.proto.test3.ForeignEnum
-	23, // 11: goproto.proto.test3.TestAllTypes.optional_import_enum:type_name -> goproto.proto.test3.ImportEnum
-	4,  // 12: goproto.proto.test3.TestAllTypes.repeated_nested_message:type_name -> goproto.proto.test3.TestAllTypes.NestedMessage
-	3,  // 13: goproto.proto.test3.TestAllTypes.repeated_foreign_message:type_name -> goproto.proto.test3.ForeignMessage
-	22, // 14: goproto.proto.test3.TestAllTypes.repeated_importmessage:type_name -> goproto.proto.test3.ImportMessage
-	1,  // 15: goproto.proto.test3.TestAllTypes.repeated_nested_enum:type_name -> goproto.proto.test3.TestAllTypes.NestedEnum
-	0,  // 16: goproto.proto.test3.TestAllTypes.repeated_foreign_enum:type_name -> goproto.proto.test3.ForeignEnum
-	23, // 17: goproto.proto.test3.TestAllTypes.repeated_importenum:type_name -> goproto.proto.test3.ImportEnum
-	5,  // 18: goproto.proto.test3.TestAllTypes.map_int32_int32:type_name -> goproto.proto.test3.TestAllTypes.MapInt32Int32Entry
-	6,  // 19: goproto.proto.test3.TestAllTypes.map_int64_int64:type_name -> goproto.proto.test3.TestAllTypes.MapInt64Int64Entry
-	7,  // 20: goproto.proto.test3.TestAllTypes.map_uint32_uint32:type_name -> goproto.proto.test3.TestAllTypes.MapUint32Uint32Entry
-	8,  // 21: goproto.proto.test3.TestAllTypes.map_uint64_uint64:type_name -> goproto.proto.test3.TestAllTypes.MapUint64Uint64Entry
-	9,  // 22: goproto.proto.test3.TestAllTypes.map_sint32_sint32:type_name -> goproto.proto.test3.TestAllTypes.MapSint32Sint32Entry
-	10, // 23: goproto.proto.test3.TestAllTypes.map_sint64_sint64:type_name -> goproto.proto.test3.TestAllTypes.MapSint64Sint64Entry
-	11, // 24: goproto.proto.test3.TestAllTypes.map_fixed32_fixed32:type_name -> goproto.proto.test3.TestAllTypes.MapFixed32Fixed32Entry
-	12, // 25: goproto.proto.test3.TestAllTypes.map_fixed64_fixed64:type_name -> goproto.proto.test3.TestAllTypes.MapFixed64Fixed64Entry
-	13, // 26: goproto.proto.test3.TestAllTypes.map_sfixed32_sfixed32:type_name -> goproto.proto.test3.TestAllTypes.MapSfixed32Sfixed32Entry
-	14, // 27: goproto.proto.test3.TestAllTypes.map_sfixed64_sfixed64:type_name -> goproto.proto.test3.TestAllTypes.MapSfixed64Sfixed64Entry
-	15, // 28: goproto.proto.test3.TestAllTypes.map_int32_float:type_name -> goproto.proto.test3.TestAllTypes.MapInt32FloatEntry
-	16, // 29: goproto.proto.test3.TestAllTypes.map_int32_double:type_name -> goproto.proto.test3.TestAllTypes.MapInt32DoubleEntry
-	17, // 30: goproto.proto.test3.TestAllTypes.map_bool_bool:type_name -> goproto.proto.test3.TestAllTypes.MapBoolBoolEntry
-	18, // 31: goproto.proto.test3.TestAllTypes.map_string_string:type_name -> goproto.proto.test3.TestAllTypes.MapStringStringEntry
-	19, // 32: goproto.proto.test3.TestAllTypes.map_string_bytes:type_name -> goproto.proto.test3.TestAllTypes.MapStringBytesEntry
-	20, // 33: goproto.proto.test3.TestAllTypes.map_string_nested_message:type_name -> goproto.proto.test3.TestAllTypes.MapStringNestedMessageEntry
-	21, // 34: goproto.proto.test3.TestAllTypes.map_string_nested_enum:type_name -> goproto.proto.test3.TestAllTypes.MapStringNestedEnumEntry
-	4,  // 35: goproto.proto.test3.TestAllTypes.oneof_nested_message:type_name -> goproto.proto.test3.TestAllTypes.NestedMessage
-	1,  // 36: goproto.proto.test3.TestAllTypes.oneof_enum:type_name -> goproto.proto.test3.TestAllTypes.NestedEnum
-	2,  // 37: goproto.proto.test3.TestAllTypes.NestedMessage.corecursive:type_name -> goproto.proto.test3.TestAllTypes
-	4,  // 38: goproto.proto.test3.TestAllTypes.MapStringNestedMessageEntry.value:type_name -> goproto.proto.test3.TestAllTypes.NestedMessage
-	1,  // 39: goproto.proto.test3.TestAllTypes.MapStringNestedEnumEntry.value:type_name -> goproto.proto.test3.TestAllTypes.NestedEnum
-	40, // [40:40] is the sub-list for method output_type
-	40, // [40:40] is the sub-list for method input_type
-	40, // [40:40] is the sub-list for extension type_name
-	40, // [40:40] is the sub-list for extension extendee
-	0,  // [0:40] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test3_test_proto_init() }
-func file_internal_testprotos_test3_test_proto_init() {
-	if File_internal_testprotos_test3_test_proto != nil {
-		return
-	}
-	file_internal_testprotos_test3_test_import_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test3_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test3_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ForeignMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_test3_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TestAllTypes_NestedMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_internal_testprotos_test3_test_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*TestAllTypes_OneofUint32)(nil),
-		(*TestAllTypes_OneofNestedMessage)(nil),
-		(*TestAllTypes_OneofString)(nil),
-		(*TestAllTypes_OneofBytes)(nil),
-		(*TestAllTypes_OneofBool)(nil),
-		(*TestAllTypes_OneofUint64)(nil),
-		(*TestAllTypes_OneofFloat)(nil),
-		(*TestAllTypes_OneofDouble)(nil),
-		(*TestAllTypes_OneofEnum)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test3_test_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   20,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test3_test_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test3_test_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_test3_test_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_test3_test_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_test3_test_proto = out.File
-	file_internal_testprotos_test3_test_proto_rawDesc = nil
-	file_internal_testprotos_test3_test_proto_goTypes = nil
-	file_internal_testprotos_test3_test_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_extension.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_extension.pb.go
deleted file mode 100644
index 3105af8204b..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_extension.pb.go
+++ /dev/null
@@ -1,650 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test3/test_extension.proto
-
-package test3
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
-	reflect "reflect"
-)
-
-var file_internal_testprotos_test3_test_extension_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         1001,
-		Name:          "goproto.proto.test3.optional_int32",
-		Tag:           "varint,1001,opt,name=optional_int32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         1002,
-		Name:          "goproto.proto.test3.optional_int64",
-		Tag:           "varint,1002,opt,name=optional_int64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         1003,
-		Name:          "goproto.proto.test3.optional_uint32",
-		Tag:           "varint,1003,opt,name=optional_uint32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         1004,
-		Name:          "goproto.proto.test3.optional_uint64",
-		Tag:           "varint,1004,opt,name=optional_uint64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         1005,
-		Name:          "goproto.proto.test3.optional_sint32",
-		Tag:           "zigzag32,1005,opt,name=optional_sint32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         1006,
-		Name:          "goproto.proto.test3.optional_sint64",
-		Tag:           "zigzag64,1006,opt,name=optional_sint64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         1007,
-		Name:          "goproto.proto.test3.optional_fixed32",
-		Tag:           "fixed32,1007,opt,name=optional_fixed32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         1008,
-		Name:          "goproto.proto.test3.optional_fixed64",
-		Tag:           "fixed64,1008,opt,name=optional_fixed64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         1009,
-		Name:          "goproto.proto.test3.optional_sfixed32",
-		Tag:           "fixed32,1009,opt,name=optional_sfixed32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         1010,
-		Name:          "goproto.proto.test3.optional_sfixed64",
-		Tag:           "fixed64,1010,opt,name=optional_sfixed64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*float32)(nil),
-		Field:         1011,
-		Name:          "goproto.proto.test3.optional_float",
-		Tag:           "fixed32,1011,opt,name=optional_float",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*float64)(nil),
-		Field:         1012,
-		Name:          "goproto.proto.test3.optional_double",
-		Tag:           "fixed64,1012,opt,name=optional_double",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         1013,
-		Name:          "goproto.proto.test3.optional_bool",
-		Tag:           "varint,1013,opt,name=optional_bool",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         1014,
-		Name:          "goproto.proto.test3.optional_string",
-		Tag:           "bytes,1014,opt,name=optional_string",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: ([]byte)(nil),
-		Field:         1015,
-		Name:          "goproto.proto.test3.optional_bytes",
-		Tag:           "bytes,1015,opt,name=optional_bytes",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*ForeignMessage)(nil),
-		Field:         1016,
-		Name:          "goproto.proto.test3.optional_foreign_message",
-		Tag:           "bytes,1016,opt,name=optional_foreign_message",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*ForeignEnum)(nil),
-		Field:         1017,
-		Name:          "goproto.proto.test3.optional_foreign_enum",
-		Tag:           "varint,1017,opt,name=optional_foreign_enum,enum=goproto.proto.test3.ForeignEnum",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         2001,
-		Name:          "goproto.proto.test3.optional_optional_int32",
-		Tag:           "varint,2001,opt,name=optional_optional_int32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         2002,
-		Name:          "goproto.proto.test3.optional_optional_int64",
-		Tag:           "varint,2002,opt,name=optional_optional_int64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         2003,
-		Name:          "goproto.proto.test3.optional_optional_uint32",
-		Tag:           "varint,2003,opt,name=optional_optional_uint32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         2004,
-		Name:          "goproto.proto.test3.optional_optional_uint64",
-		Tag:           "varint,2004,opt,name=optional_optional_uint64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         2005,
-		Name:          "goproto.proto.test3.optional_optional_sint32",
-		Tag:           "zigzag32,2005,opt,name=optional_optional_sint32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         2006,
-		Name:          "goproto.proto.test3.optional_optional_sint64",
-		Tag:           "zigzag64,2006,opt,name=optional_optional_sint64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint32)(nil),
-		Field:         2007,
-		Name:          "goproto.proto.test3.optional_optional_fixed32",
-		Tag:           "fixed32,2007,opt,name=optional_optional_fixed32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*uint64)(nil),
-		Field:         2008,
-		Name:          "goproto.proto.test3.optional_optional_fixed64",
-		Tag:           "fixed64,2008,opt,name=optional_optional_fixed64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int32)(nil),
-		Field:         2009,
-		Name:          "goproto.proto.test3.optional_optional_sfixed32",
-		Tag:           "fixed32,2009,opt,name=optional_optional_sfixed32",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*int64)(nil),
-		Field:         2010,
-		Name:          "goproto.proto.test3.optional_optional_sfixed64",
-		Tag:           "fixed64,2010,opt,name=optional_optional_sfixed64",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*float32)(nil),
-		Field:         2011,
-		Name:          "goproto.proto.test3.optional_optional_float",
-		Tag:           "fixed32,2011,opt,name=optional_optional_float",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*float64)(nil),
-		Field:         2012,
-		Name:          "goproto.proto.test3.optional_optional_double",
-		Tag:           "fixed64,2012,opt,name=optional_optional_double",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         2013,
-		Name:          "goproto.proto.test3.optional_optional_bool",
-		Tag:           "varint,2013,opt,name=optional_optional_bool",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         2014,
-		Name:          "goproto.proto.test3.optional_optional_string",
-		Tag:           "bytes,2014,opt,name=optional_optional_string",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: ([]byte)(nil),
-		Field:         2015,
-		Name:          "goproto.proto.test3.optional_optional_bytes",
-		Tag:           "bytes,2015,opt,name=optional_optional_bytes",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*ForeignMessage)(nil),
-		Field:         2016,
-		Name:          "goproto.proto.test3.optional_optional_foreign_message",
-		Tag:           "bytes,2016,opt,name=optional_optional_foreign_message",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*ForeignEnum)(nil),
-		Field:         2017,
-		Name:          "goproto.proto.test3.optional_optional_foreign_enum",
-		Tag:           "varint,2017,opt,name=optional_optional_foreign_enum,enum=goproto.proto.test3.ForeignEnum",
-		Filename:      "internal/testprotos/test3/test_extension.proto",
-	},
-}
-
-// Extension fields to descriptorpb.MessageOptions.
-var (
-	// optional int32 optional_int32 = 1001;
-	E_OptionalInt32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[0]
-	// optional int64 optional_int64 = 1002;
-	E_OptionalInt64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[1]
-	// optional uint32 optional_uint32 = 1003;
-	E_OptionalUint32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[2]
-	// optional uint64 optional_uint64 = 1004;
-	E_OptionalUint64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[3]
-	// optional sint32 optional_sint32 = 1005;
-	E_OptionalSint32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[4]
-	// optional sint64 optional_sint64 = 1006;
-	E_OptionalSint64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[5]
-	// optional fixed32 optional_fixed32 = 1007;
-	E_OptionalFixed32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[6]
-	// optional fixed64 optional_fixed64 = 1008;
-	E_OptionalFixed64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[7]
-	// optional sfixed32 optional_sfixed32 = 1009;
-	E_OptionalSfixed32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[8]
-	// optional sfixed64 optional_sfixed64 = 1010;
-	E_OptionalSfixed64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[9]
-	// optional float optional_float = 1011;
-	E_OptionalFloat = &file_internal_testprotos_test3_test_extension_proto_extTypes[10]
-	// optional double optional_double = 1012;
-	E_OptionalDouble = &file_internal_testprotos_test3_test_extension_proto_extTypes[11]
-	// optional bool optional_bool = 1013;
-	E_OptionalBool = &file_internal_testprotos_test3_test_extension_proto_extTypes[12]
-	// optional string optional_string = 1014;
-	E_OptionalString = &file_internal_testprotos_test3_test_extension_proto_extTypes[13]
-	// optional bytes optional_bytes = 1015;
-	E_OptionalBytes = &file_internal_testprotos_test3_test_extension_proto_extTypes[14]
-	// optional goproto.proto.test3.ForeignMessage optional_foreign_message = 1016;
-	E_OptionalForeignMessage = &file_internal_testprotos_test3_test_extension_proto_extTypes[15]
-	// optional goproto.proto.test3.ForeignEnum optional_foreign_enum = 1017;
-	E_OptionalForeignEnum = &file_internal_testprotos_test3_test_extension_proto_extTypes[16]
-	// optional int32 optional_optional_int32 = 2001;
-	E_OptionalOptionalInt32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[17]
-	// optional int64 optional_optional_int64 = 2002;
-	E_OptionalOptionalInt64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[18]
-	// optional uint32 optional_optional_uint32 = 2003;
-	E_OptionalOptionalUint32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[19]
-	// optional uint64 optional_optional_uint64 = 2004;
-	E_OptionalOptionalUint64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[20]
-	// optional sint32 optional_optional_sint32 = 2005;
-	E_OptionalOptionalSint32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[21]
-	// optional sint64 optional_optional_sint64 = 2006;
-	E_OptionalOptionalSint64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[22]
-	// optional fixed32 optional_optional_fixed32 = 2007;
-	E_OptionalOptionalFixed32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[23]
-	// optional fixed64 optional_optional_fixed64 = 2008;
-	E_OptionalOptionalFixed64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[24]
-	// optional sfixed32 optional_optional_sfixed32 = 2009;
-	E_OptionalOptionalSfixed32 = &file_internal_testprotos_test3_test_extension_proto_extTypes[25]
-	// optional sfixed64 optional_optional_sfixed64 = 2010;
-	E_OptionalOptionalSfixed64 = &file_internal_testprotos_test3_test_extension_proto_extTypes[26]
-	// optional float optional_optional_float = 2011;
-	E_OptionalOptionalFloat = &file_internal_testprotos_test3_test_extension_proto_extTypes[27]
-	// optional double optional_optional_double = 2012;
-	E_OptionalOptionalDouble = &file_internal_testprotos_test3_test_extension_proto_extTypes[28]
-	// optional bool optional_optional_bool = 2013;
-	E_OptionalOptionalBool = &file_internal_testprotos_test3_test_extension_proto_extTypes[29]
-	// optional string optional_optional_string = 2014;
-	E_OptionalOptionalString = &file_internal_testprotos_test3_test_extension_proto_extTypes[30]
-	// optional bytes optional_optional_bytes = 2015;
-	E_OptionalOptionalBytes = &file_internal_testprotos_test3_test_extension_proto_extTypes[31]
-	// optional goproto.proto.test3.ForeignMessage optional_optional_foreign_message = 2016;
-	E_OptionalOptionalForeignMessage = &file_internal_testprotos_test3_test_extension_proto_extTypes[32]
-	// optional goproto.proto.test3.ForeignEnum optional_optional_foreign_enum = 2017;
-	E_OptionalOptionalForeignEnum = &file_internal_testprotos_test3_test_extension_proto_extTypes[33]
-)
-
-var File_internal_testprotos_test3_test_extension_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test3_test_extension_proto_rawDesc = []byte{
-	0x0a, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
-	0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x13, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x33, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73,
-	0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x47, 0x0a,
-	0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x47, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x3a,
-	0x49, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x3a, 0x49, 0x0a, 0x0f, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1f, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xec,
-	0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x49, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xed, 0x07, 0x20, 0x01, 0x28, 0x11,
-	0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x3a, 0x49, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0xee, 0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x3a, 0x4b, 0x0a, 0x10, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xef, 0x07, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x4b, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf0, 0x07,
-	0x20, 0x01, 0x28, 0x06, 0x52, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x3a, 0x4d, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf1, 0x07, 0x20, 0x01,
-	0x28, 0x0f, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x3a, 0x4d, 0x0a, 0x11, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28,
-	0x10, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x3a, 0x47, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x66, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf3, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0d, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x3a, 0x49, 0x0a, 0x0f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xf4, 0x07, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x3a, 0x45, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf5, 0x07, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0c, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x3a, 0x49,
-	0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0xf6, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3a, 0x47, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf7, 0x07, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x79, 0x74,
-	0x65, 0x73, 0x3a, 0x7f, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66,
-	0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1f,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xf8, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72,
-	0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x16, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x3a, 0x76, 0x0a, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x1f, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf9, 0x07,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69,
-	0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x13, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x5b, 0x0a, 0x17, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd1, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x88, 0x01, 0x01, 0x3a, 0x5b, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd2, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x74,
-	0x36, 0x34, 0x88, 0x01, 0x01, 0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0xd3, 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x88, 0x01, 0x01, 0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0xd4, 0x0f, 0x20, 0x01, 0x28, 0x04, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x88, 0x01, 0x01, 0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xd5, 0x0f, 0x20, 0x01, 0x28, 0x11, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x88,
-	0x01, 0x01, 0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1f,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xd6, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x88, 0x01,
-	0x01, 0x3a, 0x5f, 0x0a, 0x19, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x1f,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xd7, 0x0f, 0x20, 0x01, 0x28, 0x07, 0x52, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x88,
-	0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x19, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xd8, 0x0f, 0x20, 0x01, 0x28, 0x06, 0x52, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34,
-	0x88, 0x01, 0x01, 0x3a, 0x61, 0x0a, 0x1a, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33,
-	0x32, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0xd9, 0x0f, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x88, 0x01, 0x01, 0x3a, 0x61, 0x0a, 0x1a, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xda, 0x0f, 0x20, 0x01, 0x28, 0x10, 0x52, 0x18, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x88, 0x01, 0x01, 0x3a, 0x5b, 0x0a, 0x17, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66,
-	0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xdb, 0x0f, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x46, 0x6c,
-	0x6f, 0x61, 0x74, 0x88, 0x01, 0x01, 0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x64, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0xdc, 0x0f, 0x20, 0x01, 0x28, 0x01, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x44, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x59, 0x0a, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12,
-	0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0xdd, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x6f, 0x6f, 0x6c, 0x88, 0x01, 0x01,
-	0x3a, 0x5d, 0x0a, 0x18, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1f, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xde, 0x0f,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x3a,
-	0x5b, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xdf, 0x0f, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x15, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x3a, 0x93, 0x01, 0x0a,
-	0x21, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0xe0, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33,
-	0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
-	0x1e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88,
-	0x01, 0x01, 0x3a, 0x8a, 0x01, 0x0a, 0x1e, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e,
-	0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe1, 0x0f, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65,
-	0x73, 0x74, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x52,
-	0x1b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x46, 0x6f, 0x72, 0x65, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x88, 0x01, 0x01, 0x42,
-	0x36, 0x5a, 0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var file_internal_testprotos_test3_test_extension_proto_goTypes = []interface{}{
-	(*descriptorpb.MessageOptions)(nil), // 0: google.protobuf.MessageOptions
-	(*ForeignMessage)(nil),              // 1: goproto.proto.test3.ForeignMessage
-	(ForeignEnum)(0),                    // 2: goproto.proto.test3.ForeignEnum
-}
-var file_internal_testprotos_test3_test_extension_proto_depIdxs = []int32{
-	0,  // 0: goproto.proto.test3.optional_int32:extendee -> google.protobuf.MessageOptions
-	0,  // 1: goproto.proto.test3.optional_int64:extendee -> google.protobuf.MessageOptions
-	0,  // 2: goproto.proto.test3.optional_uint32:extendee -> google.protobuf.MessageOptions
-	0,  // 3: goproto.proto.test3.optional_uint64:extendee -> google.protobuf.MessageOptions
-	0,  // 4: goproto.proto.test3.optional_sint32:extendee -> google.protobuf.MessageOptions
-	0,  // 5: goproto.proto.test3.optional_sint64:extendee -> google.protobuf.MessageOptions
-	0,  // 6: goproto.proto.test3.optional_fixed32:extendee -> google.protobuf.MessageOptions
-	0,  // 7: goproto.proto.test3.optional_fixed64:extendee -> google.protobuf.MessageOptions
-	0,  // 8: goproto.proto.test3.optional_sfixed32:extendee -> google.protobuf.MessageOptions
-	0,  // 9: goproto.proto.test3.optional_sfixed64:extendee -> google.protobuf.MessageOptions
-	0,  // 10: goproto.proto.test3.optional_float:extendee -> google.protobuf.MessageOptions
-	0,  // 11: goproto.proto.test3.optional_double:extendee -> google.protobuf.MessageOptions
-	0,  // 12: goproto.proto.test3.optional_bool:extendee -> google.protobuf.MessageOptions
-	0,  // 13: goproto.proto.test3.optional_string:extendee -> google.protobuf.MessageOptions
-	0,  // 14: goproto.proto.test3.optional_bytes:extendee -> google.protobuf.MessageOptions
-	0,  // 15: goproto.proto.test3.optional_foreign_message:extendee -> google.protobuf.MessageOptions
-	0,  // 16: goproto.proto.test3.optional_foreign_enum:extendee -> google.protobuf.MessageOptions
-	0,  // 17: goproto.proto.test3.optional_optional_int32:extendee -> google.protobuf.MessageOptions
-	0,  // 18: goproto.proto.test3.optional_optional_int64:extendee -> google.protobuf.MessageOptions
-	0,  // 19: goproto.proto.test3.optional_optional_uint32:extendee -> google.protobuf.MessageOptions
-	0,  // 20: goproto.proto.test3.optional_optional_uint64:extendee -> google.protobuf.MessageOptions
-	0,  // 21: goproto.proto.test3.optional_optional_sint32:extendee -> google.protobuf.MessageOptions
-	0,  // 22: goproto.proto.test3.optional_optional_sint64:extendee -> google.protobuf.MessageOptions
-	0,  // 23: goproto.proto.test3.optional_optional_fixed32:extendee -> google.protobuf.MessageOptions
-	0,  // 24: goproto.proto.test3.optional_optional_fixed64:extendee -> google.protobuf.MessageOptions
-	0,  // 25: goproto.proto.test3.optional_optional_sfixed32:extendee -> google.protobuf.MessageOptions
-	0,  // 26: goproto.proto.test3.optional_optional_sfixed64:extendee -> google.protobuf.MessageOptions
-	0,  // 27: goproto.proto.test3.optional_optional_float:extendee -> google.protobuf.MessageOptions
-	0,  // 28: goproto.proto.test3.optional_optional_double:extendee -> google.protobuf.MessageOptions
-	0,  // 29: goproto.proto.test3.optional_optional_bool:extendee -> google.protobuf.MessageOptions
-	0,  // 30: goproto.proto.test3.optional_optional_string:extendee -> google.protobuf.MessageOptions
-	0,  // 31: goproto.proto.test3.optional_optional_bytes:extendee -> google.protobuf.MessageOptions
-	0,  // 32: goproto.proto.test3.optional_optional_foreign_message:extendee -> google.protobuf.MessageOptions
-	0,  // 33: goproto.proto.test3.optional_optional_foreign_enum:extendee -> google.protobuf.MessageOptions
-	1,  // 34: goproto.proto.test3.optional_foreign_message:type_name -> goproto.proto.test3.ForeignMessage
-	2,  // 35: goproto.proto.test3.optional_foreign_enum:type_name -> goproto.proto.test3.ForeignEnum
-	1,  // 36: goproto.proto.test3.optional_optional_foreign_message:type_name -> goproto.proto.test3.ForeignMessage
-	2,  // 37: goproto.proto.test3.optional_optional_foreign_enum:type_name -> goproto.proto.test3.ForeignEnum
-	38, // [38:38] is the sub-list for method output_type
-	38, // [38:38] is the sub-list for method input_type
-	34, // [34:38] is the sub-list for extension type_name
-	0,  // [0:34] is the sub-list for extension extendee
-	0,  // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test3_test_extension_proto_init() }
-func file_internal_testprotos_test3_test_extension_proto_init() {
-	if File_internal_testprotos_test3_test_extension_proto != nil {
-		return
-	}
-	file_internal_testprotos_test3_test_proto_init()
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test3_test_extension_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   0,
-			NumExtensions: 34,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test3_test_extension_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test3_test_extension_proto_depIdxs,
-		ExtensionInfos:    file_internal_testprotos_test3_test_extension_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_test3_test_extension_proto = out.File
-	file_internal_testprotos_test3_test_extension_proto_rawDesc = nil
-	file_internal_testprotos_test3_test_extension_proto_goTypes = nil
-	file_internal_testprotos_test3_test_extension_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_import.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_import.pb.go
deleted file mode 100644
index 5fc60438b6a..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test3/test_import.pb.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/test3/test_import.proto
-
-package test3
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type ImportEnum int32
-
-const (
-	ImportEnum_IMPORT_ZERO ImportEnum = 0
-)
-
-// Enum value maps for ImportEnum.
-var (
-	ImportEnum_name = map[int32]string{
-		0: "IMPORT_ZERO",
-	}
-	ImportEnum_value = map[string]int32{
-		"IMPORT_ZERO": 0,
-	}
-)
-
-func (x ImportEnum) Enum() *ImportEnum {
-	p := new(ImportEnum)
-	*p = x
-	return p
-}
-
-func (x ImportEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ImportEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_test3_test_import_proto_enumTypes[0].Descriptor()
-}
-
-func (ImportEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_test3_test_import_proto_enumTypes[0]
-}
-
-func (x ImportEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ImportEnum.Descriptor instead.
-func (ImportEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_import_proto_rawDescGZIP(), []int{0}
-}
-
-type ImportMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ImportMessage) Reset() {
-	*x = ImportMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_test3_test_import_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ImportMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ImportMessage) ProtoMessage() {}
-
-func (x *ImportMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_test3_test_import_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ImportMessage.ProtoReflect.Descriptor instead.
-func (*ImportMessage) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_test3_test_import_proto_rawDescGZIP(), []int{0}
-}
-
-var File_internal_testprotos_test3_test_import_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_test3_test_import_proto_rawDesc = []byte{
-	0x0a, 0x2b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
-	0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x67,
-	0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73,
-	0x74, 0x33, 0x22, 0x0f, 0x0a, 0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2a, 0x1d, 0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75,
-	0x6d, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f,
-	0x10, 0x00, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c,
-	0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_internal_testprotos_test3_test_import_proto_rawDescOnce sync.Once
-	file_internal_testprotos_test3_test_import_proto_rawDescData = file_internal_testprotos_test3_test_import_proto_rawDesc
-)
-
-func file_internal_testprotos_test3_test_import_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_test3_test_import_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_test3_test_import_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_test3_test_import_proto_rawDescData)
-	})
-	return file_internal_testprotos_test3_test_import_proto_rawDescData
-}
-
-var file_internal_testprotos_test3_test_import_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_internal_testprotos_test3_test_import_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_internal_testprotos_test3_test_import_proto_goTypes = []interface{}{
-	(ImportEnum)(0),       // 0: goproto.proto.test3.ImportEnum
-	(*ImportMessage)(nil), // 1: goproto.proto.test3.ImportMessage
-}
-var file_internal_testprotos_test3_test_import_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_test3_test_import_proto_init() }
-func file_internal_testprotos_test3_test_import_proto_init() {
-	if File_internal_testprotos_test3_test_import_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_test3_test_import_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ImportMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_test3_test_import_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_test3_test_import_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_test3_test_import_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_test3_test_import_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_test3_test_import_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_test3_test_import_proto = out.File
-	file_internal_testprotos_test3_test_import_proto_rawDesc = nil
-	file_internal_testprotos_test3_test_import_proto_goTypes = nil
-	file_internal_testprotos_test3_test_import_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/test3/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/test3/ya.make
deleted file mode 100644
index 7ede6e2d8e0..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/test3/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(
-    test.pb.go
-    test_extension.pb.go
-    test_import.pb.go
-)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/test.pb.go
deleted file mode 100644
index ec254718545..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/test.pb.go
+++ /dev/null
@@ -1,2576 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Test Protobuf definitions with proto2 syntax.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/textpb2/test.proto
-
-package textpb2
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Enum int32
-
-const (
-	Enum_ONE Enum = 1
-	Enum_TWO Enum = 2
-	Enum_TEN Enum = 10
-)
-
-// Enum value maps for Enum.
-var (
-	Enum_name = map[int32]string{
-		1:  "ONE",
-		2:  "TWO",
-		10: "TEN",
-	}
-	Enum_value = map[string]int32{
-		"ONE": 1,
-		"TWO": 2,
-		"TEN": 10,
-	}
-)
-
-func (x Enum) Enum() *Enum {
-	p := new(Enum)
-	*p = x
-	return p
-}
-
-func (x Enum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_textpb2_test_proto_enumTypes[0].Descriptor()
-}
-
-func (Enum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_textpb2_test_proto_enumTypes[0]
-}
-
-func (x Enum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enum(num)
-	return nil
-}
-
-// Deprecated: Use Enum.Descriptor instead.
-func (Enum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{0}
-}
-
-type Enums_NestedEnum int32
-
-const (
-	Enums_UNO  Enums_NestedEnum = 1
-	Enums_DOS  Enums_NestedEnum = 2
-	Enums_DIEZ Enums_NestedEnum = 10
-)
-
-// Enum value maps for Enums_NestedEnum.
-var (
-	Enums_NestedEnum_name = map[int32]string{
-		1:  "UNO",
-		2:  "DOS",
-		10: "DIEZ",
-	}
-	Enums_NestedEnum_value = map[string]int32{
-		"UNO":  1,
-		"DOS":  2,
-		"DIEZ": 10,
-	}
-)
-
-func (x Enums_NestedEnum) Enum() *Enums_NestedEnum {
-	p := new(Enums_NestedEnum)
-	*p = x
-	return p
-}
-
-func (x Enums_NestedEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enums_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_textpb2_test_proto_enumTypes[1].Descriptor()
-}
-
-func (Enums_NestedEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_textpb2_test_proto_enumTypes[1]
-}
-
-func (x Enums_NestedEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *Enums_NestedEnum) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = Enums_NestedEnum(num)
-	return nil
-}
-
-// Deprecated: Use Enums_NestedEnum.Descriptor instead.
-func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{1, 0}
-}
-
-// Scalars contains optional scalar fields.
-type Scalars struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptBool     *bool    `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32    *int32   `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64    *int64   `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32   *uint32  `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64   *uint64  `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptSint32   *int32   `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
-	OptSint64   *int64   `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
-	OptFixed32  *uint32  `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
-	OptFixed64  *uint64  `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
-	OptSfixed32 *int32   `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
-	OptSfixed64 *int64   `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
-	OptFloat    *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble   *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptBytes    []byte   `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptString   *string  `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-}
-
-func (x *Scalars) Reset() {
-	*x = Scalars{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Scalars) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Scalars) ProtoMessage() {}
-
-func (x *Scalars) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Scalars.ProtoReflect.Descriptor instead.
-func (*Scalars) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Scalars) GetOptBool() bool {
-	if x != nil && x.OptBool != nil {
-		return *x.OptBool
-	}
-	return false
-}
-
-func (x *Scalars) GetOptInt32() int32 {
-	if x != nil && x.OptInt32 != nil {
-		return *x.OptInt32
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptInt64() int64 {
-	if x != nil && x.OptInt64 != nil {
-		return *x.OptInt64
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptUint32() uint32 {
-	if x != nil && x.OptUint32 != nil {
-		return *x.OptUint32
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptUint64() uint64 {
-	if x != nil && x.OptUint64 != nil {
-		return *x.OptUint64
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptSint32() int32 {
-	if x != nil && x.OptSint32 != nil {
-		return *x.OptSint32
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptSint64() int64 {
-	if x != nil && x.OptSint64 != nil {
-		return *x.OptSint64
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptFixed32() uint32 {
-	if x != nil && x.OptFixed32 != nil {
-		return *x.OptFixed32
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptFixed64() uint64 {
-	if x != nil && x.OptFixed64 != nil {
-		return *x.OptFixed64
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptSfixed32() int32 {
-	if x != nil && x.OptSfixed32 != nil {
-		return *x.OptSfixed32
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptSfixed64() int64 {
-	if x != nil && x.OptSfixed64 != nil {
-		return *x.OptSfixed64
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptFloat() float32 {
-	if x != nil && x.OptFloat != nil {
-		return *x.OptFloat
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptDouble() float64 {
-	if x != nil && x.OptDouble != nil {
-		return *x.OptDouble
-	}
-	return 0
-}
-
-func (x *Scalars) GetOptBytes() []byte {
-	if x != nil {
-		return x.OptBytes
-	}
-	return nil
-}
-
-func (x *Scalars) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-// Message contains enum fields.
-type Enums struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptEnum       *Enum              `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"`
-	RptEnum       []Enum             `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"`
-	OptNestedEnum *Enums_NestedEnum  `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"`
-	RptNestedEnum []Enums_NestedEnum `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"`
-}
-
-func (x *Enums) Reset() {
-	*x = Enums{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Enums) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Enums) ProtoMessage() {}
-
-func (x *Enums) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Enums.ProtoReflect.Descriptor instead.
-func (*Enums) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Enums) GetOptEnum() Enum {
-	if x != nil && x.OptEnum != nil {
-		return *x.OptEnum
-	}
-	return Enum_ONE
-}
-
-func (x *Enums) GetRptEnum() []Enum {
-	if x != nil {
-		return x.RptEnum
-	}
-	return nil
-}
-
-func (x *Enums) GetOptNestedEnum() Enums_NestedEnum {
-	if x != nil && x.OptNestedEnum != nil {
-		return *x.OptNestedEnum
-	}
-	return Enums_UNO
-}
-
-func (x *Enums) GetRptNestedEnum() []Enums_NestedEnum {
-	if x != nil {
-		return x.RptNestedEnum
-	}
-	return nil
-}
-
-// Message contains repeated fields.
-type Repeats struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RptBool   []bool    `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
-	RptInt32  []int32   `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
-	RptInt64  []int64   `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
-	RptUint32 []uint32  `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
-	RptUint64 []uint64  `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
-	RptFloat  []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
-	RptDouble []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
-	RptString []string  `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
-	RptBytes  [][]byte  `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
-}
-
-func (x *Repeats) Reset() {
-	*x = Repeats{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Repeats) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Repeats) ProtoMessage() {}
-
-func (x *Repeats) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Repeats.ProtoReflect.Descriptor instead.
-func (*Repeats) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Repeats) GetRptBool() []bool {
-	if x != nil {
-		return x.RptBool
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptInt32() []int32 {
-	if x != nil {
-		return x.RptInt32
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptInt64() []int64 {
-	if x != nil {
-		return x.RptInt64
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptUint32() []uint32 {
-	if x != nil {
-		return x.RptUint32
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptUint64() []uint64 {
-	if x != nil {
-		return x.RptUint64
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptFloat() []float32 {
-	if x != nil {
-		return x.RptFloat
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptDouble() []float64 {
-	if x != nil {
-		return x.RptDouble
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptString() []string {
-	if x != nil {
-		return x.RptString
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptBytes() [][]byte {
-	if x != nil {
-		return x.RptBytes
-	}
-	return nil
-}
-
-// Message contains map fields.
-type Maps struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Int32ToStr  map[int32]string   `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	StrToNested map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (x *Maps) Reset() {
-	*x = Maps{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Maps) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Maps) ProtoMessage() {}
-
-func (x *Maps) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Maps.ProtoReflect.Descriptor instead.
-func (*Maps) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Maps) GetInt32ToStr() map[int32]string {
-	if x != nil {
-		return x.Int32ToStr
-	}
-	return nil
-}
-
-func (x *Maps) GetStrToNested() map[string]*Nested {
-	if x != nil {
-		return x.StrToNested
-	}
-	return nil
-}
-
-// Message type used as submessage.
-type Nested struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-}
-
-func (x *Nested) Reset() {
-	*x = Nested{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nested) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nested) ProtoMessage() {}
-
-func (x *Nested) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
-func (*Nested) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Nested) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-func (x *Nested) GetOptNested() *Nested {
-	if x != nil {
-		return x.OptNested
-	}
-	return nil
-}
-
-// Message contains message and group fields.
-type Nests struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptNested *Nested           `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	Optgroup  *Nests_OptGroup   `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
-	RptNested []*Nested         `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	Rptgroup  []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
-}
-
-func (x *Nests) Reset() {
-	*x = Nests{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nests) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nests) ProtoMessage() {}
-
-func (x *Nests) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nests.ProtoReflect.Descriptor instead.
-func (*Nests) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Nests) GetOptNested() *Nested {
-	if x != nil {
-		return x.OptNested
-	}
-	return nil
-}
-
-func (x *Nests) GetOptgroup() *Nests_OptGroup {
-	if x != nil {
-		return x.Optgroup
-	}
-	return nil
-}
-
-func (x *Nests) GetRptNested() []*Nested {
-	if x != nil {
-		return x.RptNested
-	}
-	return nil
-}
-
-func (x *Nests) GetRptgroup() []*Nests_RptGroup {
-	if x != nil {
-		return x.Rptgroup
-	}
-	return nil
-}
-
-// Message contains required fields.
-type Requireds struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ReqBool     *bool    `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
-	ReqSfixed64 *int64   `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
-	ReqDouble   *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
-	ReqString   *string  `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	ReqEnum     *Enum    `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
-	ReqNested   *Nested  `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
-}
-
-func (x *Requireds) Reset() {
-	*x = Requireds{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Requireds) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Requireds) ProtoMessage() {}
-
-func (x *Requireds) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Requireds.ProtoReflect.Descriptor instead.
-func (*Requireds) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *Requireds) GetReqBool() bool {
-	if x != nil && x.ReqBool != nil {
-		return *x.ReqBool
-	}
-	return false
-}
-
-func (x *Requireds) GetReqSfixed64() int64 {
-	if x != nil && x.ReqSfixed64 != nil {
-		return *x.ReqSfixed64
-	}
-	return 0
-}
-
-func (x *Requireds) GetReqDouble() float64 {
-	if x != nil && x.ReqDouble != nil {
-		return *x.ReqDouble
-	}
-	return 0
-}
-
-func (x *Requireds) GetReqString() string {
-	if x != nil && x.ReqString != nil {
-		return *x.ReqString
-	}
-	return ""
-}
-
-func (x *Requireds) GetReqEnum() Enum {
-	if x != nil && x.ReqEnum != nil {
-		return *x.ReqEnum
-	}
-	return Enum_ONE
-}
-
-func (x *Requireds) GetReqNested() *Nested {
-	if x != nil {
-		return x.ReqNested
-	}
-	return nil
-}
-
-// Message contains both required and optional fields.
-type PartialRequired struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	OptString *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-}
-
-func (x *PartialRequired) Reset() {
-	*x = PartialRequired{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartialRequired) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartialRequired) ProtoMessage() {}
-
-func (x *PartialRequired) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PartialRequired.ProtoReflect.Descriptor instead.
-func (*PartialRequired) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *PartialRequired) GetReqString() string {
-	if x != nil && x.ReqString != nil {
-		return *x.ReqString
-	}
-	return ""
-}
-
-func (x *PartialRequired) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-type NestedWithRequired struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-}
-
-func (x *NestedWithRequired) Reset() {
-	*x = NestedWithRequired{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NestedWithRequired) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NestedWithRequired) ProtoMessage() {}
-
-func (x *NestedWithRequired) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NestedWithRequired.ProtoReflect.Descriptor instead.
-func (*NestedWithRequired) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *NestedWithRequired) GetReqString() string {
-	if x != nil && x.ReqString != nil {
-		return *x.ReqString
-	}
-	return ""
-}
-
-type IndirectRequired struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptNested   *NestedWithRequired            `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	RptNested   []*NestedWithRequired          `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	StrToNested map[string]*NestedWithRequired `protobuf:"bytes,3,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Types that are assignable to Union:
-	//
-	//	*IndirectRequired_OneofNested
-	Union isIndirectRequired_Union `protobuf_oneof:"union"`
-}
-
-func (x *IndirectRequired) Reset() {
-	*x = IndirectRequired{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IndirectRequired) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IndirectRequired) ProtoMessage() {}
-
-func (x *IndirectRequired) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IndirectRequired.ProtoReflect.Descriptor instead.
-func (*IndirectRequired) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *IndirectRequired) GetOptNested() *NestedWithRequired {
-	if x != nil {
-		return x.OptNested
-	}
-	return nil
-}
-
-func (x *IndirectRequired) GetRptNested() []*NestedWithRequired {
-	if x != nil {
-		return x.RptNested
-	}
-	return nil
-}
-
-func (x *IndirectRequired) GetStrToNested() map[string]*NestedWithRequired {
-	if x != nil {
-		return x.StrToNested
-	}
-	return nil
-}
-
-func (m *IndirectRequired) GetUnion() isIndirectRequired_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (x *IndirectRequired) GetOneofNested() *NestedWithRequired {
-	if x, ok := x.GetUnion().(*IndirectRequired_OneofNested); ok {
-		return x.OneofNested
-	}
-	return nil
-}
-
-type isIndirectRequired_Union interface {
-	isIndirectRequired_Union()
-}
-
-type IndirectRequired_OneofNested struct {
-	OneofNested *NestedWithRequired `protobuf:"bytes,4,opt,name=oneof_nested,json=oneofNested,oneof"`
-}
-
-func (*IndirectRequired_OneofNested) isIndirectRequired_Union() {}
-
-type Extensions struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-
-	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBool   *bool   `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32  *int32  `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-}
-
-func (x *Extensions) Reset() {
-	*x = Extensions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Extensions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Extensions) ProtoMessage() {}
-
-func (x *Extensions) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Extensions.ProtoReflect.Descriptor instead.
-func (*Extensions) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *Extensions) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-func (x *Extensions) GetOptBool() bool {
-	if x != nil && x.OptBool != nil {
-		return *x.OptBool
-	}
-	return false
-}
-
-func (x *Extensions) GetOptInt32() int32 {
-	if x != nil && x.OptInt32 != nil {
-		return *x.OptInt32
-	}
-	return 0
-}
-
-type ExtensionsContainer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ExtensionsContainer) Reset() {
-	*x = ExtensionsContainer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExtensionsContainer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExtensionsContainer) ProtoMessage() {}
-
-func (x *ExtensionsContainer) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExtensionsContainer.ProtoReflect.Descriptor instead.
-func (*ExtensionsContainer) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{11}
-}
-
-type MessageSet struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *MessageSet) Reset() {
-	*x = MessageSet{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MessageSet) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MessageSet) ProtoMessage() {}
-
-func (x *MessageSet) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MessageSet.ProtoReflect.Descriptor instead.
-func (*MessageSet) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{12}
-}
-
-type MessageSetExtension struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-}
-
-func (x *MessageSetExtension) Reset() {
-	*x = MessageSetExtension{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MessageSetExtension) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MessageSetExtension) ProtoMessage() {}
-
-func (x *MessageSetExtension) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MessageSetExtension.ProtoReflect.Descriptor instead.
-func (*MessageSetExtension) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *MessageSetExtension) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-type FakeMessageSet struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
-}
-
-func (x *FakeMessageSet) Reset() {
-	*x = FakeMessageSet{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FakeMessageSet) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FakeMessageSet) ProtoMessage() {}
-
-func (x *FakeMessageSet) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FakeMessageSet.ProtoReflect.Descriptor instead.
-func (*FakeMessageSet) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{14}
-}
-
-type FakeMessageSetExtension struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-}
-
-func (x *FakeMessageSetExtension) Reset() {
-	*x = FakeMessageSetExtension{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FakeMessageSetExtension) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FakeMessageSetExtension) ProtoMessage() {}
-
-func (x *FakeMessageSetExtension) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FakeMessageSetExtension.ProtoReflect.Descriptor instead.
-func (*FakeMessageSetExtension) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *FakeMessageSetExtension) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-// Message contains well-known type fields.
-type KnownTypes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptBool      *wrapperspb.BoolValue   `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32     *wrapperspb.Int32Value  `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64     *wrapperspb.Int64Value  `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32    *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64    *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptFloat     *wrapperspb.FloatValue  `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble    *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptString    *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBytes     *wrapperspb.BytesValue  `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptDuration  *durationpb.Duration    `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
-	OptTimestamp *timestamppb.Timestamp  `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
-	OptStruct    *structpb.Struct        `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
-	OptList      *structpb.ListValue     `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
-	OptValue     *structpb.Value         `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
-	OptNull      *structpb.NullValue     `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
-	OptEmpty     *emptypb.Empty          `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
-	OptAny       *anypb.Any              `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
-	OptFieldmask *fieldmaskpb.FieldMask  `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
-}
-
-func (x *KnownTypes) Reset() {
-	*x = KnownTypes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *KnownTypes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*KnownTypes) ProtoMessage() {}
-
-func (x *KnownTypes) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use KnownTypes.ProtoReflect.Descriptor instead.
-func (*KnownTypes) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *KnownTypes) GetOptBool() *wrapperspb.BoolValue {
-	if x != nil {
-		return x.OptBool
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptInt32() *wrapperspb.Int32Value {
-	if x != nil {
-		return x.OptInt32
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptInt64() *wrapperspb.Int64Value {
-	if x != nil {
-		return x.OptInt64
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptUint32() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.OptUint32
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptUint64() *wrapperspb.UInt64Value {
-	if x != nil {
-		return x.OptUint64
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptFloat() *wrapperspb.FloatValue {
-	if x != nil {
-		return x.OptFloat
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptDouble() *wrapperspb.DoubleValue {
-	if x != nil {
-		return x.OptDouble
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptString() *wrapperspb.StringValue {
-	if x != nil {
-		return x.OptString
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptBytes() *wrapperspb.BytesValue {
-	if x != nil {
-		return x.OptBytes
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptDuration() *durationpb.Duration {
-	if x != nil {
-		return x.OptDuration
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptTimestamp() *timestamppb.Timestamp {
-	if x != nil {
-		return x.OptTimestamp
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptStruct() *structpb.Struct {
-	if x != nil {
-		return x.OptStruct
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptList() *structpb.ListValue {
-	if x != nil {
-		return x.OptList
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptValue() *structpb.Value {
-	if x != nil {
-		return x.OptValue
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptNull() structpb.NullValue {
-	if x != nil && x.OptNull != nil {
-		return *x.OptNull
-	}
-	return structpb.NullValue(0)
-}
-
-func (x *KnownTypes) GetOptEmpty() *emptypb.Empty {
-	if x != nil {
-		return x.OptEmpty
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptAny() *anypb.Any {
-	if x != nil {
-		return x.OptAny
-	}
-	return nil
-}
-
-func (x *KnownTypes) GetOptFieldmask() *fieldmaskpb.FieldMask {
-	if x != nil {
-		return x.OptFieldmask
-	}
-	return nil
-}
-
-type Nests_OptGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptString      *string                        `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptNested      *Nested                        `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	Optnestedgroup *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"`
-}
-
-func (x *Nests_OptGroup) Reset() {
-	*x = Nests_OptGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nests_OptGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nests_OptGroup) ProtoMessage() {}
-
-func (x *Nests_OptGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nests_OptGroup.ProtoReflect.Descriptor instead.
-func (*Nests_OptGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{5, 0}
-}
-
-func (x *Nests_OptGroup) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-func (x *Nests_OptGroup) GetOptNested() *Nested {
-	if x != nil {
-		return x.OptNested
-	}
-	return nil
-}
-
-func (x *Nests_OptGroup) GetOptnestedgroup() *Nests_OptGroup_OptNestedGroup {
-	if x != nil {
-		return x.Optnestedgroup
-	}
-	return nil
-}
-
-type Nests_RptGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RptString []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
-}
-
-func (x *Nests_RptGroup) Reset() {
-	*x = Nests_RptGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nests_RptGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nests_RptGroup) ProtoMessage() {}
-
-func (x *Nests_RptGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nests_RptGroup.ProtoReflect.Descriptor instead.
-func (*Nests_RptGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{5, 1}
-}
-
-func (x *Nests_RptGroup) GetRptString() []string {
-	if x != nil {
-		return x.RptString
-	}
-	return nil
-}
-
-type Nests_OptGroup_OptNestedGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptFixed32 *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
-}
-
-func (x *Nests_OptGroup_OptNestedGroup) Reset() {
-	*x = Nests_OptGroup_OptNestedGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nests_OptGroup_OptNestedGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nests_OptGroup_OptNestedGroup) ProtoMessage() {}
-
-func (x *Nests_OptGroup_OptNestedGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb2_test_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nests_OptGroup_OptNestedGroup.ProtoReflect.Descriptor instead.
-func (*Nests_OptGroup_OptNestedGroup) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb2_test_proto_rawDescGZIP(), []int{5, 0, 0}
-}
-
-func (x *Nests_OptGroup_OptNestedGroup) GetOptFixed32() uint32 {
-	if x != nil && x.OptFixed32 != nil {
-		return *x.OptFixed32
-	}
-	return 0
-}
-
-var file_internal_testprotos_textpb2_test_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         21,
-		Name:          "pb2.opt_ext_bool",
-		Tag:           "varint,21,opt,name=opt_ext_bool",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         22,
-		Name:          "pb2.opt_ext_string",
-		Tag:           "bytes,22,opt,name=opt_ext_string",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*Enum)(nil),
-		Field:         23,
-		Name:          "pb2.opt_ext_enum",
-		Tag:           "varint,23,opt,name=opt_ext_enum,enum=pb2.Enum",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*Nested)(nil),
-		Field:         24,
-		Name:          "pb2.opt_ext_nested",
-		Tag:           "bytes,24,opt,name=opt_ext_nested",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*PartialRequired)(nil),
-		Field:         25,
-		Name:          "pb2.opt_ext_partial",
-		Tag:           "bytes,25,opt,name=opt_ext_partial",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]uint32)(nil),
-		Field:         31,
-		Name:          "pb2.rpt_ext_fixed32",
-		Tag:           "fixed32,31,rep,name=rpt_ext_fixed32",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]Enum)(nil),
-		Field:         32,
-		Name:          "pb2.rpt_ext_enum",
-		Tag:           "varint,32,rep,name=rpt_ext_enum,enum=pb2.Enum",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]*Nested)(nil),
-		Field:         33,
-		Name:          "pb2.rpt_ext_nested",
-		Tag:           "bytes,33,rep,name=rpt_ext_nested",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*MessageSet)(nil),
-		ExtensionType: (*FakeMessageSetExtension)(nil),
-		Field:         50,
-		Name:          "pb2.message_set_extension",
-		Tag:           "bytes,50,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         51,
-		Name:          "pb2.ExtensionsContainer.opt_ext_bool",
-		Tag:           "varint,51,opt,name=opt_ext_bool",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*string)(nil),
-		Field:         52,
-		Name:          "pb2.ExtensionsContainer.opt_ext_string",
-		Tag:           "bytes,52,opt,name=opt_ext_string",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*Enum)(nil),
-		Field:         53,
-		Name:          "pb2.ExtensionsContainer.opt_ext_enum",
-		Tag:           "varint,53,opt,name=opt_ext_enum,enum=pb2.Enum",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*Nested)(nil),
-		Field:         54,
-		Name:          "pb2.ExtensionsContainer.opt_ext_nested",
-		Tag:           "bytes,54,opt,name=opt_ext_nested",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: (*PartialRequired)(nil),
-		Field:         55,
-		Name:          "pb2.ExtensionsContainer.opt_ext_partial",
-		Tag:           "bytes,55,opt,name=opt_ext_partial",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]string)(nil),
-		Field:         61,
-		Name:          "pb2.ExtensionsContainer.rpt_ext_string",
-		Tag:           "bytes,61,rep,name=rpt_ext_string",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]Enum)(nil),
-		Field:         62,
-		Name:          "pb2.ExtensionsContainer.rpt_ext_enum",
-		Tag:           "varint,62,rep,name=rpt_ext_enum,enum=pb2.Enum",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*Extensions)(nil),
-		ExtensionType: ([]*Nested)(nil),
-		Field:         63,
-		Name:          "pb2.ExtensionsContainer.rpt_ext_nested",
-		Tag:           "bytes,63,rep,name=rpt_ext_nested",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*MessageSet)(nil),
-		ExtensionType: (*MessageSetExtension)(nil),
-		Field:         10,
-		Name:          "pb2.MessageSetExtension.message_set_extension",
-		Tag:           "bytes,10,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*MessageSet)(nil),
-		ExtensionType: (*MessageSetExtension)(nil),
-		Field:         20,
-		Name:          "pb2.MessageSetExtension.not_message_set_extension",
-		Tag:           "bytes,20,opt,name=not_message_set_extension",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*MessageSet)(nil),
-		ExtensionType: (*Nested)(nil),
-		Field:         30,
-		Name:          "pb2.MessageSetExtension.ext_nested",
-		Tag:           "bytes,30,opt,name=ext_nested",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-	{
-		ExtendedType:  (*FakeMessageSet)(nil),
-		ExtensionType: (*FakeMessageSetExtension)(nil),
-		Field:         10,
-		Name:          "pb2.FakeMessageSetExtension.message_set_extension",
-		Tag:           "bytes,10,opt,name=message_set_extension",
-		Filename:      "internal/testprotos/textpb2/test.proto",
-	},
-}
-
-// Extension fields to Extensions.
-var (
-	// optional bool opt_ext_bool = 21;
-	E_OptExtBool = &file_internal_testprotos_textpb2_test_proto_extTypes[0]
-	// optional string opt_ext_string = 22;
-	E_OptExtString = &file_internal_testprotos_textpb2_test_proto_extTypes[1]
-	// optional pb2.Enum opt_ext_enum = 23;
-	E_OptExtEnum = &file_internal_testprotos_textpb2_test_proto_extTypes[2]
-	// optional pb2.Nested opt_ext_nested = 24;
-	E_OptExtNested = &file_internal_testprotos_textpb2_test_proto_extTypes[3]
-	// optional pb2.PartialRequired opt_ext_partial = 25;
-	E_OptExtPartial = &file_internal_testprotos_textpb2_test_proto_extTypes[4]
-	// repeated fixed32 rpt_ext_fixed32 = 31;
-	E_RptExtFixed32 = &file_internal_testprotos_textpb2_test_proto_extTypes[5]
-	// repeated pb2.Enum rpt_ext_enum = 32;
-	E_RptExtEnum = &file_internal_testprotos_textpb2_test_proto_extTypes[6]
-	// repeated pb2.Nested rpt_ext_nested = 33;
-	E_RptExtNested = &file_internal_testprotos_textpb2_test_proto_extTypes[7]
-	// optional bool opt_ext_bool = 51;
-	E_ExtensionsContainer_OptExtBool = &file_internal_testprotos_textpb2_test_proto_extTypes[9]
-	// optional string opt_ext_string = 52;
-	E_ExtensionsContainer_OptExtString = &file_internal_testprotos_textpb2_test_proto_extTypes[10]
-	// optional pb2.Enum opt_ext_enum = 53;
-	E_ExtensionsContainer_OptExtEnum = &file_internal_testprotos_textpb2_test_proto_extTypes[11]
-	// optional pb2.Nested opt_ext_nested = 54;
-	E_ExtensionsContainer_OptExtNested = &file_internal_testprotos_textpb2_test_proto_extTypes[12]
-	// optional pb2.PartialRequired opt_ext_partial = 55;
-	E_ExtensionsContainer_OptExtPartial = &file_internal_testprotos_textpb2_test_proto_extTypes[13]
-	// repeated string rpt_ext_string = 61;
-	E_ExtensionsContainer_RptExtString = &file_internal_testprotos_textpb2_test_proto_extTypes[14]
-	// repeated pb2.Enum rpt_ext_enum = 62;
-	E_ExtensionsContainer_RptExtEnum = &file_internal_testprotos_textpb2_test_proto_extTypes[15]
-	// repeated pb2.Nested rpt_ext_nested = 63;
-	E_ExtensionsContainer_RptExtNested = &file_internal_testprotos_textpb2_test_proto_extTypes[16]
-)
-
-// Extension fields to MessageSet.
-var (
-	// optional pb2.FakeMessageSetExtension message_set_extension = 50;
-	E_MessageSetExtension = &file_internal_testprotos_textpb2_test_proto_extTypes[8]
-	// optional pb2.MessageSetExtension message_set_extension = 10;
-	E_MessageSetExtension_MessageSetExtension = &file_internal_testprotos_textpb2_test_proto_extTypes[17]
-	// optional pb2.MessageSetExtension not_message_set_extension = 20;
-	E_MessageSetExtension_NotMessageSetExtension = &file_internal_testprotos_textpb2_test_proto_extTypes[18]
-	// optional pb2.Nested ext_nested = 30;
-	E_MessageSetExtension_ExtNested = &file_internal_testprotos_textpb2_test_proto_extTypes[19]
-)
-
-// Extension fields to FakeMessageSet.
-var (
-	// optional pb2.FakeMessageSetExtension message_set_extension = 10;
-	E_FakeMessageSetExtension_MessageSetExtension = &file_internal_testprotos_textpb2_test_proto_extTypes[20]
-)
-
-var File_internal_testprotos_textpb2_test_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_textpb2_test_proto_rawDesc = []byte{
-	0x0a, 0x26, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62, 0x32, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x70, 0x62, 0x32, 0x1a, 0x19, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61,
-	0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73,
-	0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xda, 0x03, 0x0a, 0x07, 0x53, 0x63, 0x61, 0x6c, 0x61,
-	0x72, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x1b, 0x0a,
-	0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70,
-	0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f,
-	0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6f, 0x70, 0x74,
-	0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x18, 0x06, 0x20, 0x01, 0x28, 0x11, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x69, 0x6e,
-	0x74, 0x36, 0x34, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64,
-	0x33, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x46, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x36, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x06, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x46, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x0b, 0x6f, 0x70, 0x74,
-	0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f,
-	0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x10, 0x52, 0x0b,
-	0x6f, 0x70, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1b, 0x0a, 0x09, 0x6f,
-	0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08,
-	0x6f, 0x70, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x6f, 0x70,
-	0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x62,
-	0x79, 0x74, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x22, 0xfb, 0x01, 0x0a, 0x05, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x12, 0x24, 0x0a,
-	0x08, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x45,
-	0x6e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x08, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d,
-	0x52, 0x07, 0x72, 0x70, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x3d, 0x0a, 0x0f, 0x6f, 0x70, 0x74,
-	0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x3d, 0x0a, 0x0f, 0x72, 0x70, 0x74, 0x5f,
-	0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0e, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0d, 0x72, 0x70, 0x74, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x22, 0x28, 0x0a, 0x0a, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x07, 0x0a, 0x03, 0x55, 0x4e, 0x4f, 0x10, 0x01, 0x12, 0x07,
-	0x0a, 0x03, 0x44, 0x4f, 0x53, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x49, 0x45, 0x5a, 0x10,
-	0x0a, 0x22, 0x94, 0x02, 0x0a, 0x07, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x73, 0x12, 0x19, 0x0a,
-	0x08, 0x72, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x08, 0x52,
-	0x07, 0x72, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x70, 0x74,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x08, 0x72, 0x70, 0x74, 0x49, 0x6e, 0x74,
-	0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x05, 0x20, 0x03, 0x28, 0x04, 0x52, 0x09, 0x72, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x06, 0x20,
-	0x03, 0x28, 0x02, 0x52, 0x08, 0x72, 0x70, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1d, 0x0a,
-	0x0a, 0x72, 0x70, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x01, 0x52, 0x09, 0x72, 0x70, 0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x72, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x09, 0x72, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x72,
-	0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08,
-	0x72, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x8f, 0x02, 0x0a, 0x04, 0x4d, 0x61, 0x70,
-	0x73, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x74,
-	0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x61,
-	0x70, 0x73, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x6f, 0x53, 0x74, 0x72, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x6f, 0x53, 0x74, 0x72, 0x12, 0x3e,
-	0x0a, 0x0d, 0x73, 0x74, 0x72, 0x5f, 0x74, 0x6f, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x61, 0x70, 0x73,
-	0x2e, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x1a, 0x3d,
-	0x0a, 0x0f, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x6f, 0x53, 0x74, 0x72, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4b, 0x0a,
-	0x10, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x53, 0x0a, 0x06, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22,
-	0xd3, 0x03, 0x0a, 0x05, 0x4e, 0x65, 0x73, 0x74, 0x73, 0x12, 0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
-	0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x2f, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0a, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x08, 0x6f, 0x70,
-	0x74, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2a, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x6e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32,
-	0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x72, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x12, 0x2f, 0x0a, 0x08, 0x72, 0x70, 0x74, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x0a, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x73,
-	0x2e, 0x52, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x08, 0x72, 0x70, 0x74, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x1a, 0xd4, 0x01, 0x0a, 0x08, 0x4f, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12,
-	0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x4a, 0x0a, 0x0e, 0x6f,
-	0x70, 0x74, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0a, 0x32, 0x22, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x73, 0x2e,
-	0x4f, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x4f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x6f, 0x70, 0x74, 0x6e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x31, 0x0a, 0x0e, 0x4f, 0x70, 0x74, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x70, 0x74,
-	0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x01, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0a,
-	0x6f, 0x70, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x1a, 0x29, 0x0a, 0x08, 0x52, 0x70,
-	0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x70, 0x74, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f,
-	0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0xd9, 0x01, 0x0a, 0x09, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
-	0x65, 0x64, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18,
-	0x01, 0x20, 0x02, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x71, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x21,
-	0x0a, 0x0c, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x02,
-	0x20, 0x02, 0x28, 0x10, 0x52, 0x0b, 0x72, 0x65, 0x71, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18,
-	0x03, 0x20, 0x02, 0x28, 0x01, 0x52, 0x09, 0x72, 0x65, 0x71, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65,
-	0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x04,
-	0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12,
-	0x24, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x02, 0x28,
-	0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x07, 0x72, 0x65,
-	0x71, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x6e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x02, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x72, 0x65, 0x71, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x22, 0x4f, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x22, 0x33, 0x0a, 0x12, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68,
-	0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f,
-	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65,
-	0x71, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xee, 0x02, 0x0a, 0x10, 0x49, 0x6e, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x0a,
-	0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x17, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74,
-	0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-	0x64, 0x52, 0x09, 0x72, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x4a, 0x0a, 0x0d,
-	0x73, 0x74, 0x72, 0x5f, 0x74, 0x6f, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x49, 0x6e, 0x64, 0x69, 0x72, 0x65,
-	0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2e, 0x53, 0x74, 0x72, 0x54, 0x6f,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x73, 0x74, 0x72,
-	0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x3c, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f,
-	0x66, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x1a, 0x57, 0x0a, 0x10, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62,
-	0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42,
-	0x07, 0x0a, 0x05, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x22, 0x69, 0x0a, 0x0a, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f,
-	0x6c, 0x18, 0x65, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c,
-	0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x2a, 0x04, 0x08,
-	0x14, 0x10, 0x65, 0x22, 0x89, 0x04, 0x0a, 0x13, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x32, 0x31, 0x0a, 0x0c, 0x6f,
-	0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62,
-	0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x33, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x32, 0x35,
-	0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x34, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x3c, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74,
-	0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x35, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70,
-	0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x45,
-	0x6e, 0x75, 0x6d, 0x32, 0x42, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x36, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70,
-	0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78,
-	0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x4d, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x5f, 0x65,
-	0x78, 0x74, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32,
-	0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x37, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x52,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x32, 0x35, 0x0a, 0x0e, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78,
-	0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x3d, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0c, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x3c, 0x0a,
-	0x0c, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e,
-	0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x3e,
-	0x20, 0x03, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52,
-	0x0a, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x32, 0x42, 0x0a, 0x0e, 0x72,
-	0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e,
-	0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x3f,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x52, 0x0c, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22,
-	0x1a, 0x0a, 0x0a, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x2a, 0x08, 0x08,
-	0x04, 0x10, 0xff, 0xff, 0xff, 0xff, 0x07, 0x3a, 0x02, 0x08, 0x01, 0x22, 0xb6, 0x02, 0x0a, 0x13,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x32, 0x5d, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65,
-	0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x62,
-	0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x32, 0x64, 0x0a, 0x19, 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f,
-	0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18,
-	0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52,
-	0x16, 0x6e, 0x6f, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x3b, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x5f, 0x6e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70,
-	0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x65, 0x78, 0x74, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x22, 0x1a, 0x0a, 0x0e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x2a, 0x08, 0x08, 0x04, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02,
-	0x22, 0x9f, 0x01, 0x0a, 0x17, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a,
-	0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x65, 0x0a, 0x15, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x22, 0x9e, 0x08, 0x0a, 0x0a, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65,
-	0x73, 0x12, 0x35, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x07, 0x6f, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x3b, 0x0a, 0x0a,
-	0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09,
-	0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
-	0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x6f, 0x70, 0x74,
-	0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x6c,
-	0x6f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x6c, 0x6f, 0x61,
-	0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74,
-	0x12, 0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x3b, 0x0a,
-	0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70,
-	0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x42, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x6f, 0x70, 0x74, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x12, 0x36, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63,
-	0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x35, 0x0a, 0x08, 0x6f,
-	0x70, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x33, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f,
-	0x70, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x6e,
-	0x75, 0x6c, 0x6c, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4e, 0x75, 0x6c, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x33,
-	0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x1e, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x12, 0x2d, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x5f, 0x61, 0x6e, 0x79, 0x18, 0x20,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x6f, 0x70, 0x74, 0x41,
-	0x6e, 0x79, 0x12, 0x3f, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x6d,
-	0x61, 0x73, 0x6b, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x6d,
-	0x61, 0x73, 0x6b, 0x2a, 0x21, 0x0a, 0x04, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x07, 0x0a, 0x03, 0x4f,
-	0x4e, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x12, 0x07, 0x0a,
-	0x03, 0x54, 0x45, 0x4e, 0x10, 0x0a, 0x3a, 0x31, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78,
-	0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x6f,
-	0x70, 0x74, 0x45, 0x78, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x3a, 0x35, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
-	0x5f, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0f, 0x2e, 0x70, 0x62,
-	0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x16, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x3a, 0x3c, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d,
-	0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e,
-	0x75, 0x6d, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x42,
-	0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64,
-	0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x3a, 0x4d, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61,
-	0x72, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70,
-	0x62, 0x32, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
-	0x65, 0x64, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61,
-	0x6c, 0x3a, 0x37, 0x0a, 0x0f, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x33, 0x32, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x07, 0x52, 0x0d, 0x72, 0x70, 0x74,
-	0x45, 0x78, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x3a, 0x3c, 0x0a, 0x0c, 0x72, 0x70,
-	0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32,
-	0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x20, 0x20, 0x03, 0x28,
-	0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, 0x72, 0x70,
-	0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x42, 0x0a, 0x0e, 0x72, 0x70, 0x74, 0x5f,
-	0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32,
-	0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x21, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x0c,
-	0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x3a, 0x61, 0x0a, 0x15,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70,
-	0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65,
-	0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42,
-	0x38, 0x5a, 0x36, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62, 0x32,
-}
-
-var (
-	file_internal_testprotos_textpb2_test_proto_rawDescOnce sync.Once
-	file_internal_testprotos_textpb2_test_proto_rawDescData = file_internal_testprotos_textpb2_test_proto_rawDesc
-)
-
-func file_internal_testprotos_textpb2_test_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_textpb2_test_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_textpb2_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_textpb2_test_proto_rawDescData)
-	})
-	return file_internal_testprotos_textpb2_test_proto_rawDescData
-}
-
-var file_internal_testprotos_textpb2_test_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_internal_testprotos_textpb2_test_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
-var file_internal_testprotos_textpb2_test_proto_goTypes = []interface{}{
-	(Enum)(0),                             // 0: pb2.Enum
-	(Enums_NestedEnum)(0),                 // 1: pb2.Enums.NestedEnum
-	(*Scalars)(nil),                       // 2: pb2.Scalars
-	(*Enums)(nil),                         // 3: pb2.Enums
-	(*Repeats)(nil),                       // 4: pb2.Repeats
-	(*Maps)(nil),                          // 5: pb2.Maps
-	(*Nested)(nil),                        // 6: pb2.Nested
-	(*Nests)(nil),                         // 7: pb2.Nests
-	(*Requireds)(nil),                     // 8: pb2.Requireds
-	(*PartialRequired)(nil),               // 9: pb2.PartialRequired
-	(*NestedWithRequired)(nil),            // 10: pb2.NestedWithRequired
-	(*IndirectRequired)(nil),              // 11: pb2.IndirectRequired
-	(*Extensions)(nil),                    // 12: pb2.Extensions
-	(*ExtensionsContainer)(nil),           // 13: pb2.ExtensionsContainer
-	(*MessageSet)(nil),                    // 14: pb2.MessageSet
-	(*MessageSetExtension)(nil),           // 15: pb2.MessageSetExtension
-	(*FakeMessageSet)(nil),                // 16: pb2.FakeMessageSet
-	(*FakeMessageSetExtension)(nil),       // 17: pb2.FakeMessageSetExtension
-	(*KnownTypes)(nil),                    // 18: pb2.KnownTypes
-	nil,                                   // 19: pb2.Maps.Int32ToStrEntry
-	nil,                                   // 20: pb2.Maps.StrToNestedEntry
-	(*Nests_OptGroup)(nil),                // 21: pb2.Nests.OptGroup
-	(*Nests_RptGroup)(nil),                // 22: pb2.Nests.RptGroup
-	(*Nests_OptGroup_OptNestedGroup)(nil), // 23: pb2.Nests.OptGroup.OptNestedGroup
-	nil,                                   // 24: pb2.IndirectRequired.StrToNestedEntry
-	(*wrapperspb.BoolValue)(nil),          // 25: google.protobuf.BoolValue
-	(*wrapperspb.Int32Value)(nil),         // 26: google.protobuf.Int32Value
-	(*wrapperspb.Int64Value)(nil),         // 27: google.protobuf.Int64Value
-	(*wrapperspb.UInt32Value)(nil),        // 28: google.protobuf.UInt32Value
-	(*wrapperspb.UInt64Value)(nil),        // 29: google.protobuf.UInt64Value
-	(*wrapperspb.FloatValue)(nil),         // 30: google.protobuf.FloatValue
-	(*wrapperspb.DoubleValue)(nil),        // 31: google.protobuf.DoubleValue
-	(*wrapperspb.StringValue)(nil),        // 32: google.protobuf.StringValue
-	(*wrapperspb.BytesValue)(nil),         // 33: google.protobuf.BytesValue
-	(*durationpb.Duration)(nil),           // 34: google.protobuf.Duration
-	(*timestamppb.Timestamp)(nil),         // 35: google.protobuf.Timestamp
-	(*structpb.Struct)(nil),               // 36: google.protobuf.Struct
-	(*structpb.ListValue)(nil),            // 37: google.protobuf.ListValue
-	(*structpb.Value)(nil),                // 38: google.protobuf.Value
-	(structpb.NullValue)(0),               // 39: google.protobuf.NullValue
-	(*emptypb.Empty)(nil),                 // 40: google.protobuf.Empty
-	(*anypb.Any)(nil),                     // 41: google.protobuf.Any
-	(*fieldmaskpb.FieldMask)(nil),         // 42: google.protobuf.FieldMask
-}
-var file_internal_testprotos_textpb2_test_proto_depIdxs = []int32{
-	0,  // 0: pb2.Enums.opt_enum:type_name -> pb2.Enum
-	0,  // 1: pb2.Enums.rpt_enum:type_name -> pb2.Enum
-	1,  // 2: pb2.Enums.opt_nested_enum:type_name -> pb2.Enums.NestedEnum
-	1,  // 3: pb2.Enums.rpt_nested_enum:type_name -> pb2.Enums.NestedEnum
-	19, // 4: pb2.Maps.int32_to_str:type_name -> pb2.Maps.Int32ToStrEntry
-	20, // 5: pb2.Maps.str_to_nested:type_name -> pb2.Maps.StrToNestedEntry
-	6,  // 6: pb2.Nested.opt_nested:type_name -> pb2.Nested
-	6,  // 7: pb2.Nests.opt_nested:type_name -> pb2.Nested
-	21, // 8: pb2.Nests.optgroup:type_name -> pb2.Nests.OptGroup
-	6,  // 9: pb2.Nests.rpt_nested:type_name -> pb2.Nested
-	22, // 10: pb2.Nests.rptgroup:type_name -> pb2.Nests.RptGroup
-	0,  // 11: pb2.Requireds.req_enum:type_name -> pb2.Enum
-	6,  // 12: pb2.Requireds.req_nested:type_name -> pb2.Nested
-	10, // 13: pb2.IndirectRequired.opt_nested:type_name -> pb2.NestedWithRequired
-	10, // 14: pb2.IndirectRequired.rpt_nested:type_name -> pb2.NestedWithRequired
-	24, // 15: pb2.IndirectRequired.str_to_nested:type_name -> pb2.IndirectRequired.StrToNestedEntry
-	10, // 16: pb2.IndirectRequired.oneof_nested:type_name -> pb2.NestedWithRequired
-	25, // 17: pb2.KnownTypes.opt_bool:type_name -> google.protobuf.BoolValue
-	26, // 18: pb2.KnownTypes.opt_int32:type_name -> google.protobuf.Int32Value
-	27, // 19: pb2.KnownTypes.opt_int64:type_name -> google.protobuf.Int64Value
-	28, // 20: pb2.KnownTypes.opt_uint32:type_name -> google.protobuf.UInt32Value
-	29, // 21: pb2.KnownTypes.opt_uint64:type_name -> google.protobuf.UInt64Value
-	30, // 22: pb2.KnownTypes.opt_float:type_name -> google.protobuf.FloatValue
-	31, // 23: pb2.KnownTypes.opt_double:type_name -> google.protobuf.DoubleValue
-	32, // 24: pb2.KnownTypes.opt_string:type_name -> google.protobuf.StringValue
-	33, // 25: pb2.KnownTypes.opt_bytes:type_name -> google.protobuf.BytesValue
-	34, // 26: pb2.KnownTypes.opt_duration:type_name -> google.protobuf.Duration
-	35, // 27: pb2.KnownTypes.opt_timestamp:type_name -> google.protobuf.Timestamp
-	36, // 28: pb2.KnownTypes.opt_struct:type_name -> google.protobuf.Struct
-	37, // 29: pb2.KnownTypes.opt_list:type_name -> google.protobuf.ListValue
-	38, // 30: pb2.KnownTypes.opt_value:type_name -> google.protobuf.Value
-	39, // 31: pb2.KnownTypes.opt_null:type_name -> google.protobuf.NullValue
-	40, // 32: pb2.KnownTypes.opt_empty:type_name -> google.protobuf.Empty
-	41, // 33: pb2.KnownTypes.opt_any:type_name -> google.protobuf.Any
-	42, // 34: pb2.KnownTypes.opt_fieldmask:type_name -> google.protobuf.FieldMask
-	6,  // 35: pb2.Maps.StrToNestedEntry.value:type_name -> pb2.Nested
-	6,  // 36: pb2.Nests.OptGroup.opt_nested:type_name -> pb2.Nested
-	23, // 37: pb2.Nests.OptGroup.optnestedgroup:type_name -> pb2.Nests.OptGroup.OptNestedGroup
-	10, // 38: pb2.IndirectRequired.StrToNestedEntry.value:type_name -> pb2.NestedWithRequired
-	12, // 39: pb2.opt_ext_bool:extendee -> pb2.Extensions
-	12, // 40: pb2.opt_ext_string:extendee -> pb2.Extensions
-	12, // 41: pb2.opt_ext_enum:extendee -> pb2.Extensions
-	12, // 42: pb2.opt_ext_nested:extendee -> pb2.Extensions
-	12, // 43: pb2.opt_ext_partial:extendee -> pb2.Extensions
-	12, // 44: pb2.rpt_ext_fixed32:extendee -> pb2.Extensions
-	12, // 45: pb2.rpt_ext_enum:extendee -> pb2.Extensions
-	12, // 46: pb2.rpt_ext_nested:extendee -> pb2.Extensions
-	14, // 47: pb2.message_set_extension:extendee -> pb2.MessageSet
-	12, // 48: pb2.ExtensionsContainer.opt_ext_bool:extendee -> pb2.Extensions
-	12, // 49: pb2.ExtensionsContainer.opt_ext_string:extendee -> pb2.Extensions
-	12, // 50: pb2.ExtensionsContainer.opt_ext_enum:extendee -> pb2.Extensions
-	12, // 51: pb2.ExtensionsContainer.opt_ext_nested:extendee -> pb2.Extensions
-	12, // 52: pb2.ExtensionsContainer.opt_ext_partial:extendee -> pb2.Extensions
-	12, // 53: pb2.ExtensionsContainer.rpt_ext_string:extendee -> pb2.Extensions
-	12, // 54: pb2.ExtensionsContainer.rpt_ext_enum:extendee -> pb2.Extensions
-	12, // 55: pb2.ExtensionsContainer.rpt_ext_nested:extendee -> pb2.Extensions
-	14, // 56: pb2.MessageSetExtension.message_set_extension:extendee -> pb2.MessageSet
-	14, // 57: pb2.MessageSetExtension.not_message_set_extension:extendee -> pb2.MessageSet
-	14, // 58: pb2.MessageSetExtension.ext_nested:extendee -> pb2.MessageSet
-	16, // 59: pb2.FakeMessageSetExtension.message_set_extension:extendee -> pb2.FakeMessageSet
-	0,  // 60: pb2.opt_ext_enum:type_name -> pb2.Enum
-	6,  // 61: pb2.opt_ext_nested:type_name -> pb2.Nested
-	9,  // 62: pb2.opt_ext_partial:type_name -> pb2.PartialRequired
-	0,  // 63: pb2.rpt_ext_enum:type_name -> pb2.Enum
-	6,  // 64: pb2.rpt_ext_nested:type_name -> pb2.Nested
-	17, // 65: pb2.message_set_extension:type_name -> pb2.FakeMessageSetExtension
-	0,  // 66: pb2.ExtensionsContainer.opt_ext_enum:type_name -> pb2.Enum
-	6,  // 67: pb2.ExtensionsContainer.opt_ext_nested:type_name -> pb2.Nested
-	9,  // 68: pb2.ExtensionsContainer.opt_ext_partial:type_name -> pb2.PartialRequired
-	0,  // 69: pb2.ExtensionsContainer.rpt_ext_enum:type_name -> pb2.Enum
-	6,  // 70: pb2.ExtensionsContainer.rpt_ext_nested:type_name -> pb2.Nested
-	15, // 71: pb2.MessageSetExtension.message_set_extension:type_name -> pb2.MessageSetExtension
-	15, // 72: pb2.MessageSetExtension.not_message_set_extension:type_name -> pb2.MessageSetExtension
-	6,  // 73: pb2.MessageSetExtension.ext_nested:type_name -> pb2.Nested
-	17, // 74: pb2.FakeMessageSetExtension.message_set_extension:type_name -> pb2.FakeMessageSetExtension
-	75, // [75:75] is the sub-list for method output_type
-	75, // [75:75] is the sub-list for method input_type
-	60, // [60:75] is the sub-list for extension type_name
-	39, // [39:60] is the sub-list for extension extendee
-	0,  // [0:39] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_textpb2_test_proto_init() }
-func file_internal_testprotos_textpb2_test_proto_init() {
-	if File_internal_testprotos_textpb2_test_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_textpb2_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Scalars); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Enums); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Repeats); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Maps); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nested); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nests); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Requireds); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartialRequired); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NestedWithRequired); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IndirectRequired); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Extensions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExtensionsContainer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageSet); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageSetExtension); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FakeMessageSet); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			case 3:
-				return &v.extensionFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FakeMessageSetExtension); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KnownTypes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nests_OptGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nests_RptGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb2_test_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nests_OptGroup_OptNestedGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_internal_testprotos_textpb2_test_proto_msgTypes[9].OneofWrappers = []interface{}{
-		(*IndirectRequired_OneofNested)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_textpb2_test_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   23,
-			NumExtensions: 21,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_textpb2_test_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_textpb2_test_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_textpb2_test_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_textpb2_test_proto_msgTypes,
-		ExtensionInfos:    file_internal_testprotos_textpb2_test_proto_extTypes,
-	}.Build()
-	File_internal_testprotos_textpb2_test_proto = out.File
-	file_internal_testprotos_textpb2_test_proto_rawDesc = nil
-	file_internal_testprotos_textpb2_test_proto_goTypes = nil
-	file_internal_testprotos_textpb2_test_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/textpb2/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/test.pb.go b/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/test.pb.go
deleted file mode 100644
index be8034c5b01..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/test.pb.go
+++ /dev/null
@@ -1,1270 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Test Protobuf definitions with proto3 syntax.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: internal/testprotos/textpb3/test.proto
-
-package textpb3
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-type Enum int32
-
-const (
-	Enum_ZERO Enum = 0
-	Enum_ONE  Enum = 1
-	Enum_TWO  Enum = 2
-	Enum_TEN  Enum = 10
-)
-
-// Enum value maps for Enum.
-var (
-	Enum_name = map[int32]string{
-		0:  "ZERO",
-		1:  "ONE",
-		2:  "TWO",
-		10: "TEN",
-	}
-	Enum_value = map[string]int32{
-		"ZERO": 0,
-		"ONE":  1,
-		"TWO":  2,
-		"TEN":  10,
-	}
-)
-
-func (x Enum) Enum() *Enum {
-	p := new(Enum)
-	*p = x
-	return p
-}
-
-func (x Enum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_textpb3_test_proto_enumTypes[0].Descriptor()
-}
-
-func (Enum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_textpb3_test_proto_enumTypes[0]
-}
-
-func (x Enum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Enum.Descriptor instead.
-func (Enum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{0}
-}
-
-type Enums_NestedEnum int32
-
-const (
-	Enums_CERO Enums_NestedEnum = 0
-	Enums_UNO  Enums_NestedEnum = 1
-	Enums_DOS  Enums_NestedEnum = 2
-	Enums_DIEZ Enums_NestedEnum = 10
-)
-
-// Enum value maps for Enums_NestedEnum.
-var (
-	Enums_NestedEnum_name = map[int32]string{
-		0:  "CERO",
-		1:  "UNO",
-		2:  "DOS",
-		10: "DIEZ",
-	}
-	Enums_NestedEnum_value = map[string]int32{
-		"CERO": 0,
-		"UNO":  1,
-		"DOS":  2,
-		"DIEZ": 10,
-	}
-)
-
-func (x Enums_NestedEnum) Enum() *Enums_NestedEnum {
-	p := new(Enums_NestedEnum)
-	*p = x
-	return p
-}
-
-func (x Enums_NestedEnum) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Enums_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
-	return file_internal_testprotos_textpb3_test_proto_enumTypes[1].Descriptor()
-}
-
-func (Enums_NestedEnum) Type() protoreflect.EnumType {
-	return &file_internal_testprotos_textpb3_test_proto_enumTypes[1]
-}
-
-func (x Enums_NestedEnum) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Enums_NestedEnum.Descriptor instead.
-func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{3, 0}
-}
-
-// Scalars contains scalar field types.
-type Scalars struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SBool     bool    `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"`
-	SInt32    int32   `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"`
-	SInt64    int64   `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"`
-	SUint32   uint32  `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"`
-	SUint64   uint64  `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"`
-	SSint32   int32   `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"`
-	SSint64   int64   `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"`
-	SFixed32  uint32  `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"`
-	SFixed64  uint64  `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"`
-	SSfixed32 int32   `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"`
-	SSfixed64 int64   `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"`
-	SFloat    float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"`
-	SDouble   float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"`
-	SBytes    []byte  `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"`
-	SString   string  `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
-}
-
-func (x *Scalars) Reset() {
-	*x = Scalars{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Scalars) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Scalars) ProtoMessage() {}
-
-func (x *Scalars) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Scalars.ProtoReflect.Descriptor instead.
-func (*Scalars) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Scalars) GetSBool() bool {
-	if x != nil {
-		return x.SBool
-	}
-	return false
-}
-
-func (x *Scalars) GetSInt32() int32 {
-	if x != nil {
-		return x.SInt32
-	}
-	return 0
-}
-
-func (x *Scalars) GetSInt64() int64 {
-	if x != nil {
-		return x.SInt64
-	}
-	return 0
-}
-
-func (x *Scalars) GetSUint32() uint32 {
-	if x != nil {
-		return x.SUint32
-	}
-	return 0
-}
-
-func (x *Scalars) GetSUint64() uint64 {
-	if x != nil {
-		return x.SUint64
-	}
-	return 0
-}
-
-func (x *Scalars) GetSSint32() int32 {
-	if x != nil {
-		return x.SSint32
-	}
-	return 0
-}
-
-func (x *Scalars) GetSSint64() int64 {
-	if x != nil {
-		return x.SSint64
-	}
-	return 0
-}
-
-func (x *Scalars) GetSFixed32() uint32 {
-	if x != nil {
-		return x.SFixed32
-	}
-	return 0
-}
-
-func (x *Scalars) GetSFixed64() uint64 {
-	if x != nil {
-		return x.SFixed64
-	}
-	return 0
-}
-
-func (x *Scalars) GetSSfixed32() int32 {
-	if x != nil {
-		return x.SSfixed32
-	}
-	return 0
-}
-
-func (x *Scalars) GetSSfixed64() int64 {
-	if x != nil {
-		return x.SSfixed64
-	}
-	return 0
-}
-
-func (x *Scalars) GetSFloat() float32 {
-	if x != nil {
-		return x.SFloat
-	}
-	return 0
-}
-
-func (x *Scalars) GetSDouble() float64 {
-	if x != nil {
-		return x.SDouble
-	}
-	return 0
-}
-
-func (x *Scalars) GetSBytes() []byte {
-	if x != nil {
-		return x.SBytes
-	}
-	return nil
-}
-
-func (x *Scalars) GetSString() string {
-	if x != nil {
-		return x.SString
-	}
-	return ""
-}
-
-// Message contains repeated fields.
-type Repeats struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RptBool   []bool    `protobuf:"varint,1,rep,packed,name=rpt_bool,json=rptBool,proto3" json:"rpt_bool,omitempty"`
-	RptInt32  []int32   `protobuf:"varint,2,rep,packed,name=rpt_int32,json=rptInt32,proto3" json:"rpt_int32,omitempty"`
-	RptInt64  []int64   `protobuf:"varint,3,rep,packed,name=rpt_int64,json=rptInt64,proto3" json:"rpt_int64,omitempty"`
-	RptUint32 []uint32  `protobuf:"varint,4,rep,packed,name=rpt_uint32,json=rptUint32,proto3" json:"rpt_uint32,omitempty"`
-	RptUint64 []uint64  `protobuf:"varint,5,rep,packed,name=rpt_uint64,json=rptUint64,proto3" json:"rpt_uint64,omitempty"`
-	RptFloat  []float32 `protobuf:"fixed32,6,rep,packed,name=rpt_float,json=rptFloat,proto3" json:"rpt_float,omitempty"`
-	RptDouble []float64 `protobuf:"fixed64,7,rep,packed,name=rpt_double,json=rptDouble,proto3" json:"rpt_double,omitempty"`
-	RptString []string  `protobuf:"bytes,8,rep,name=rpt_string,json=rptString,proto3" json:"rpt_string,omitempty"`
-	RptBytes  [][]byte  `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes,proto3" json:"rpt_bytes,omitempty"`
-}
-
-func (x *Repeats) Reset() {
-	*x = Repeats{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Repeats) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Repeats) ProtoMessage() {}
-
-func (x *Repeats) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Repeats.ProtoReflect.Descriptor instead.
-func (*Repeats) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Repeats) GetRptBool() []bool {
-	if x != nil {
-		return x.RptBool
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptInt32() []int32 {
-	if x != nil {
-		return x.RptInt32
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptInt64() []int64 {
-	if x != nil {
-		return x.RptInt64
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptUint32() []uint32 {
-	if x != nil {
-		return x.RptUint32
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptUint64() []uint64 {
-	if x != nil {
-		return x.RptUint64
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptFloat() []float32 {
-	if x != nil {
-		return x.RptFloat
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptDouble() []float64 {
-	if x != nil {
-		return x.RptDouble
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptString() []string {
-	if x != nil {
-		return x.RptString
-	}
-	return nil
-}
-
-func (x *Repeats) GetRptBytes() [][]byte {
-	if x != nil {
-		return x.RptBytes
-	}
-	return nil
-}
-
-type Proto3Optional struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OptBool    *bool    `protobuf:"varint,1,opt,name=opt_bool,json=optBool,proto3,oneof" json:"opt_bool,omitempty"`
-	OptInt32   *int32   `protobuf:"varint,2,opt,name=opt_int32,json=optInt32,proto3,oneof" json:"opt_int32,omitempty"`
-	OptInt64   *int64   `protobuf:"varint,3,opt,name=opt_int64,json=optInt64,proto3,oneof" json:"opt_int64,omitempty"`
-	OptUint32  *uint32  `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32,proto3,oneof" json:"opt_uint32,omitempty"`
-	OptUint64  *uint64  `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64,proto3,oneof" json:"opt_uint64,omitempty"`
-	OptFloat   *float32 `protobuf:"fixed32,6,opt,name=opt_float,json=optFloat,proto3,oneof" json:"opt_float,omitempty"`
-	OptDouble  *float64 `protobuf:"fixed64,7,opt,name=opt_double,json=optDouble,proto3,oneof" json:"opt_double,omitempty"`
-	OptString  *string  `protobuf:"bytes,8,opt,name=opt_string,json=optString,proto3,oneof" json:"opt_string,omitempty"`
-	OptBytes   []byte   `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes,proto3,oneof" json:"opt_bytes,omitempty"`
-	OptEnum    *Enum    `protobuf:"varint,10,opt,name=opt_enum,json=optEnum,proto3,enum=pb3.Enum,oneof" json:"opt_enum,omitempty"`
-	OptMessage *Nested  `protobuf:"bytes,11,opt,name=opt_message,json=optMessage,proto3,oneof" json:"opt_message,omitempty"`
-}
-
-func (x *Proto3Optional) Reset() {
-	*x = Proto3Optional{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Proto3Optional) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Proto3Optional) ProtoMessage() {}
-
-func (x *Proto3Optional) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Proto3Optional.ProtoReflect.Descriptor instead.
-func (*Proto3Optional) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Proto3Optional) GetOptBool() bool {
-	if x != nil && x.OptBool != nil {
-		return *x.OptBool
-	}
-	return false
-}
-
-func (x *Proto3Optional) GetOptInt32() int32 {
-	if x != nil && x.OptInt32 != nil {
-		return *x.OptInt32
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptInt64() int64 {
-	if x != nil && x.OptInt64 != nil {
-		return *x.OptInt64
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptUint32() uint32 {
-	if x != nil && x.OptUint32 != nil {
-		return *x.OptUint32
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptUint64() uint64 {
-	if x != nil && x.OptUint64 != nil {
-		return *x.OptUint64
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptFloat() float32 {
-	if x != nil && x.OptFloat != nil {
-		return *x.OptFloat
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptDouble() float64 {
-	if x != nil && x.OptDouble != nil {
-		return *x.OptDouble
-	}
-	return 0
-}
-
-func (x *Proto3Optional) GetOptString() string {
-	if x != nil && x.OptString != nil {
-		return *x.OptString
-	}
-	return ""
-}
-
-func (x *Proto3Optional) GetOptBytes() []byte {
-	if x != nil {
-		return x.OptBytes
-	}
-	return nil
-}
-
-func (x *Proto3Optional) GetOptEnum() Enum {
-	if x != nil && x.OptEnum != nil {
-		return *x.OptEnum
-	}
-	return Enum_ZERO
-}
-
-func (x *Proto3Optional) GetOptMessage() *Nested {
-	if x != nil {
-		return x.OptMessage
-	}
-	return nil
-}
-
-// Message contains enum fields.
-type Enums struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SEnum       Enum             `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"`
-	SNestedEnum Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"`
-}
-
-func (x *Enums) Reset() {
-	*x = Enums{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Enums) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Enums) ProtoMessage() {}
-
-func (x *Enums) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Enums.ProtoReflect.Descriptor instead.
-func (*Enums) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Enums) GetSEnum() Enum {
-	if x != nil {
-		return x.SEnum
-	}
-	return Enum_ZERO
-}
-
-func (x *Enums) GetSNestedEnum() Enums_NestedEnum {
-	if x != nil {
-		return x.SNestedEnum
-	}
-	return Enums_CERO
-}
-
-// Message contains nested message field.
-type Nests struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
-}
-
-func (x *Nests) Reset() {
-	*x = Nests{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nests) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nests) ProtoMessage() {}
-
-func (x *Nests) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nests.ProtoReflect.Descriptor instead.
-func (*Nests) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Nests) GetSNested() *Nested {
-	if x != nil {
-		return x.SNested
-	}
-	return nil
-}
-
-// Message type used as submessage.
-type Nested struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SString string  `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
-	SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
-}
-
-func (x *Nested) Reset() {
-	*x = Nested{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Nested) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Nested) ProtoMessage() {}
-
-func (x *Nested) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
-func (*Nested) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Nested) GetSString() string {
-	if x != nil {
-		return x.SString
-	}
-	return ""
-}
-
-func (x *Nested) GetSNested() *Nested {
-	if x != nil {
-		return x.SNested
-	}
-	return nil
-}
-
-// Message contains oneof field.
-type Oneofs struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Union:
-	//
-	//	*Oneofs_OneofEnum
-	//	*Oneofs_OneofString
-	//	*Oneofs_OneofNested
-	Union isOneofs_Union `protobuf_oneof:"union"`
-}
-
-func (x *Oneofs) Reset() {
-	*x = Oneofs{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Oneofs) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Oneofs) ProtoMessage() {}
-
-func (x *Oneofs) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Oneofs.ProtoReflect.Descriptor instead.
-func (*Oneofs) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{6}
-}
-
-func (m *Oneofs) GetUnion() isOneofs_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (x *Oneofs) GetOneofEnum() Enum {
-	if x, ok := x.GetUnion().(*Oneofs_OneofEnum); ok {
-		return x.OneofEnum
-	}
-	return Enum_ZERO
-}
-
-func (x *Oneofs) GetOneofString() string {
-	if x, ok := x.GetUnion().(*Oneofs_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (x *Oneofs) GetOneofNested() *Nested {
-	if x, ok := x.GetUnion().(*Oneofs_OneofNested); ok {
-		return x.OneofNested
-	}
-	return nil
-}
-
-type isOneofs_Union interface {
-	isOneofs_Union()
-}
-
-type Oneofs_OneofEnum struct {
-	OneofEnum Enum `protobuf:"varint,1,opt,name=oneof_enum,json=oneofEnum,proto3,enum=pb3.Enum,oneof"`
-}
-
-type Oneofs_OneofString struct {
-	OneofString string `protobuf:"bytes,2,opt,name=oneof_string,json=oneofString,proto3,oneof"`
-}
-
-type Oneofs_OneofNested struct {
-	OneofNested *Nested `protobuf:"bytes,3,opt,name=oneof_nested,json=oneofNested,proto3,oneof"`
-}
-
-func (*Oneofs_OneofEnum) isOneofs_Union() {}
-
-func (*Oneofs_OneofString) isOneofs_Union() {}
-
-func (*Oneofs_OneofNested) isOneofs_Union() {}
-
-// Message contains map fields.
-type Maps struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Int32ToStr   map[int32]string   `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	BoolToUint32 map[bool]uint32    `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Uint64ToEnum map[uint64]Enum    `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"`
-	StrToNested  map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	StrToOneofs  map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *Maps) Reset() {
-	*x = Maps{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Maps) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Maps) ProtoMessage() {}
-
-func (x *Maps) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Maps.ProtoReflect.Descriptor instead.
-func (*Maps) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *Maps) GetInt32ToStr() map[int32]string {
-	if x != nil {
-		return x.Int32ToStr
-	}
-	return nil
-}
-
-func (x *Maps) GetBoolToUint32() map[bool]uint32 {
-	if x != nil {
-		return x.BoolToUint32
-	}
-	return nil
-}
-
-func (x *Maps) GetUint64ToEnum() map[uint64]Enum {
-	if x != nil {
-		return x.Uint64ToEnum
-	}
-	return nil
-}
-
-func (x *Maps) GetStrToNested() map[string]*Nested {
-	if x != nil {
-		return x.StrToNested
-	}
-	return nil
-}
-
-func (x *Maps) GetStrToOneofs() map[string]*Oneofs {
-	if x != nil {
-		return x.StrToOneofs
-	}
-	return nil
-}
-
-// Message for testing json_name option.
-type JSONNames struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SString string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
-}
-
-func (x *JSONNames) Reset() {
-	*x = JSONNames{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JSONNames) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JSONNames) ProtoMessage() {}
-
-func (x *JSONNames) ProtoReflect() protoreflect.Message {
-	mi := &file_internal_testprotos_textpb3_test_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JSONNames.ProtoReflect.Descriptor instead.
-func (*JSONNames) Descriptor() ([]byte, []int) {
-	return file_internal_testprotos_textpb3_test_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *JSONNames) GetSString() string {
-	if x != nil {
-		return x.SString
-	}
-	return ""
-}
-
-var File_internal_testprotos_textpb3_test_proto protoreflect.FileDescriptor
-
-var file_internal_testprotos_textpb3_test_proto_rawDesc = []byte{
-	0x0a, 0x26, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62, 0x33, 0x2f, 0x74, 0x65,
-	0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x70, 0x62, 0x33, 0x22, 0x9e, 0x03,
-	0x0a, 0x07, 0x53, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x5f, 0x62,
-	0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x42, 0x6f, 0x6f, 0x6c,
-	0x12, 0x17, 0x0a, 0x07, 0x73, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x73, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x5f, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x49, 0x6e, 0x74,
-	0x36, 0x34, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x73, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x19, 0x0a,
-	0x08, 0x73, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52,
-	0x07, 0x73, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f, 0x73, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x18, 0x06, 0x20, 0x01, 0x28, 0x11, 0x52, 0x07, 0x73, 0x53, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x73, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1b,
-	0x0a, 0x09, 0x73, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x07, 0x52, 0x08, 0x73, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x1b, 0x0a, 0x09, 0x73,
-	0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x06, 0x52, 0x08,
-	0x73, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x5f, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x09, 0x73, 0x53,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x5f, 0x73, 0x66, 0x69,
-	0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x10, 0x52, 0x09, 0x73, 0x53, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x5f, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x02, 0x52, 0x06, 0x73, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12,
-	0x19, 0x0a, 0x08, 0x73, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x07, 0x73, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x5f,
-	0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x42, 0x79,
-	0x74, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18,
-	0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x94,
-	0x02, 0x0a, 0x07, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x70,
-	0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x08, 0x52, 0x07, 0x72, 0x70,
-	0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x70, 0x74, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x08, 0x72, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12,
-	0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d,
-	0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x04, 0x52, 0x09, 0x72, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1b, 0x0a,
-	0x09, 0x72, 0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x02,
-	0x52, 0x08, 0x72, 0x70, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70,
-	0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x01, 0x52, 0x09,
-	0x72, 0x70, 0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72,
-	0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f,
-	0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08, 0x72, 0x70, 0x74,
-	0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0xc4, 0x04, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x12, 0x1e, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f,
-	0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x70,
-	0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x08, 0x6f,
-	0x70, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x6f, 0x70,
-	0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x48, 0x02, 0x52,
-	0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a,
-	0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d,
-	0x48, 0x03, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x88, 0x01, 0x01,
-	0x12, 0x22, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x04, 0x48, 0x04, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36,
-	0x34, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x48, 0x05, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x46, 0x6c,
-	0x6f, 0x61, 0x74, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x6f,
-	0x75, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x01, 0x48, 0x06, 0x52, 0x09, 0x6f, 0x70,
-	0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a, 0x6f, 0x70,
-	0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07,
-	0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x12, 0x20,
-	0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x0c, 0x48, 0x08, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01,
-	0x12, 0x29, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x48, 0x09, 0x52,
-	0x07, 0x6f, 0x70, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x0b, 0x6f,
-	0x70, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x48, 0x0a, 0x52,
-	0x0a, 0x6f, 0x70, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0b,
-	0x0a, 0x09, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x5f,
-	0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6f, 0x70,
-	0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x74, 0x5f,
-	0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x75,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x6c,
-	0x6f, 0x61, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x42,
-	0x0b, 0x0a, 0x09, 0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x42, 0x0e, 0x0a, 0x0c,
-	0x5f, 0x6f, 0x70, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x98, 0x01, 0x0a,
-	0x05, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x12, 0x20, 0x0a, 0x06, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x45, 0x6e, 0x75,
-	0x6d, 0x52, 0x05, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x39, 0x0a, 0x0d, 0x73, 0x5f, 0x6e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x15, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0b, 0x73, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45,
-	0x6e, 0x75, 0x6d, 0x22, 0x32, 0x0a, 0x0a, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75,
-	0x6d, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x55,
-	0x4e, 0x4f, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4f, 0x53, 0x10, 0x02, 0x12, 0x08, 0x0a,
-	0x04, 0x44, 0x49, 0x45, 0x5a, 0x10, 0x0a, 0x22, 0x2f, 0x0a, 0x05, 0x4e, 0x65, 0x73, 0x74, 0x73,
-	0x12, 0x26, 0x0a, 0x08, 0x73, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52,
-	0x07, 0x73, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x4b, 0x0a, 0x06, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a,
-	0x08, 0x73, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x07, 0x73, 0x4e,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x94, 0x01, 0x0a, 0x06, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73,
-	0x12, 0x2a, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x48,
-	0x00, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x23, 0x0a, 0x0c,
-	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x12, 0x30, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4e, 0x65,
-	0x73, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x22, 0xaf, 0x05, 0x0a,
-	0x04, 0x4d, 0x61, 0x70, 0x73, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x74,
-	0x6f, 0x5f, 0x73, 0x74, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62,
-	0x33, 0x2e, 0x4d, 0x61, 0x70, 0x73, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x6f, 0x53, 0x74,
-	0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x6f, 0x53,
-	0x74, 0x72, 0x12, 0x41, 0x0a, 0x0e, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x6f, 0x5f, 0x75, 0x69,
-	0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x62, 0x33,
-	0x2e, 0x4d, 0x61, 0x70, 0x73, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x54, 0x6f, 0x55, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x62, 0x6f, 0x6f, 0x6c, 0x54, 0x6f, 0x55,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x41, 0x0a, 0x0e, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f,
-	0x74, 0x6f, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
-	0x70, 0x62, 0x33, 0x2e, 0x4d, 0x61, 0x70, 0x73, 0x2e, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x54,
-	0x6f, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x75, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x54, 0x6f, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x3e, 0x0a, 0x0d, 0x73, 0x74, 0x72, 0x5f,
-	0x74, 0x6f, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4d, 0x61, 0x70, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x54, 0x6f,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x73, 0x74, 0x72,
-	0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x3e, 0x0a, 0x0d, 0x73, 0x74, 0x72, 0x5f,
-	0x74, 0x6f, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4d, 0x61, 0x70, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x54, 0x6f,
-	0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x73, 0x74, 0x72,
-	0x54, 0x6f, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x54, 0x6f, 0x53, 0x74, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x42, 0x6f, 0x6f, 0x6c, 0x54,
-	0x6f, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4a, 0x0a, 0x11, 0x55, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x54, 0x6f, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09,
-	0x2e, 0x70, 0x62, 0x33, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4b, 0x0a, 0x10, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73,
-	0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x1a, 0x4b, 0x0a, 0x10, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x33, 0x2e, 0x4f, 0x6e, 0x65,
-	0x6f, 0x66, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x26,
-	0x0a, 0x09, 0x4a, 0x53, 0x4f, 0x4e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x73,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66,
-	0x6f, 0x6f, 0x5f, 0x62, 0x61, 0x72, 0x2a, 0x2b, 0x0a, 0x04, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x08,
-	0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4f, 0x4e, 0x45, 0x10,
-	0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x45,
-	0x4e, 0x10, 0x0a, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f,
-	0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x70, 0x62, 0x33, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_internal_testprotos_textpb3_test_proto_rawDescOnce sync.Once
-	file_internal_testprotos_textpb3_test_proto_rawDescData = file_internal_testprotos_textpb3_test_proto_rawDesc
-)
-
-func file_internal_testprotos_textpb3_test_proto_rawDescGZIP() []byte {
-	file_internal_testprotos_textpb3_test_proto_rawDescOnce.Do(func() {
-		file_internal_testprotos_textpb3_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_testprotos_textpb3_test_proto_rawDescData)
-	})
-	return file_internal_testprotos_textpb3_test_proto_rawDescData
-}
-
-var file_internal_testprotos_textpb3_test_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_internal_testprotos_textpb3_test_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
-var file_internal_testprotos_textpb3_test_proto_goTypes = []interface{}{
-	(Enum)(0),              // 0: pb3.Enum
-	(Enums_NestedEnum)(0),  // 1: pb3.Enums.NestedEnum
-	(*Scalars)(nil),        // 2: pb3.Scalars
-	(*Repeats)(nil),        // 3: pb3.Repeats
-	(*Proto3Optional)(nil), // 4: pb3.Proto3Optional
-	(*Enums)(nil),          // 5: pb3.Enums
-	(*Nests)(nil),          // 6: pb3.Nests
-	(*Nested)(nil),         // 7: pb3.Nested
-	(*Oneofs)(nil),         // 8: pb3.Oneofs
-	(*Maps)(nil),           // 9: pb3.Maps
-	(*JSONNames)(nil),      // 10: pb3.JSONNames
-	nil,                    // 11: pb3.Maps.Int32ToStrEntry
-	nil,                    // 12: pb3.Maps.BoolToUint32Entry
-	nil,                    // 13: pb3.Maps.Uint64ToEnumEntry
-	nil,                    // 14: pb3.Maps.StrToNestedEntry
-	nil,                    // 15: pb3.Maps.StrToOneofsEntry
-}
-var file_internal_testprotos_textpb3_test_proto_depIdxs = []int32{
-	0,  // 0: pb3.Proto3Optional.opt_enum:type_name -> pb3.Enum
-	7,  // 1: pb3.Proto3Optional.opt_message:type_name -> pb3.Nested
-	0,  // 2: pb3.Enums.s_enum:type_name -> pb3.Enum
-	1,  // 3: pb3.Enums.s_nested_enum:type_name -> pb3.Enums.NestedEnum
-	7,  // 4: pb3.Nests.s_nested:type_name -> pb3.Nested
-	7,  // 5: pb3.Nested.s_nested:type_name -> pb3.Nested
-	0,  // 6: pb3.Oneofs.oneof_enum:type_name -> pb3.Enum
-	7,  // 7: pb3.Oneofs.oneof_nested:type_name -> pb3.Nested
-	11, // 8: pb3.Maps.int32_to_str:type_name -> pb3.Maps.Int32ToStrEntry
-	12, // 9: pb3.Maps.bool_to_uint32:type_name -> pb3.Maps.BoolToUint32Entry
-	13, // 10: pb3.Maps.uint64_to_enum:type_name -> pb3.Maps.Uint64ToEnumEntry
-	14, // 11: pb3.Maps.str_to_nested:type_name -> pb3.Maps.StrToNestedEntry
-	15, // 12: pb3.Maps.str_to_oneofs:type_name -> pb3.Maps.StrToOneofsEntry
-	0,  // 13: pb3.Maps.Uint64ToEnumEntry.value:type_name -> pb3.Enum
-	7,  // 14: pb3.Maps.StrToNestedEntry.value:type_name -> pb3.Nested
-	8,  // 15: pb3.Maps.StrToOneofsEntry.value:type_name -> pb3.Oneofs
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
-}
-
-func init() { file_internal_testprotos_textpb3_test_proto_init() }
-func file_internal_testprotos_textpb3_test_proto_init() {
-	if File_internal_testprotos_textpb3_test_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_internal_testprotos_textpb3_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Scalars); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Repeats); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Proto3Optional); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Enums); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nests); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Nested); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Oneofs); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Maps); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_internal_testprotos_textpb3_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JSONNames); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_internal_testprotos_textpb3_test_proto_msgTypes[2].OneofWrappers = []interface{}{}
-	file_internal_testprotos_textpb3_test_proto_msgTypes[6].OneofWrappers = []interface{}{
-		(*Oneofs_OneofEnum)(nil),
-		(*Oneofs_OneofString)(nil),
-		(*Oneofs_OneofNested)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_internal_testprotos_textpb3_test_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   14,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_internal_testprotos_textpb3_test_proto_goTypes,
-		DependencyIndexes: file_internal_testprotos_textpb3_test_proto_depIdxs,
-		EnumInfos:         file_internal_testprotos_textpb3_test_proto_enumTypes,
-		MessageInfos:      file_internal_testprotos_textpb3_test_proto_msgTypes,
-	}.Build()
-	File_internal_testprotos_textpb3_test_proto = out.File
-	file_internal_testprotos_textpb3_test_proto_rawDesc = nil
-	file_internal_testprotos_textpb3_test_proto_goTypes = nil
-	file_internal_testprotos_textpb3_test_proto_depIdxs = nil
-}
diff --git a/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/ya.make b/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/ya.make
deleted file mode 100644
index adcd14d7100..00000000000
--- a/vendor/google.golang.org/protobuf/internal/testprotos/textpb3/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(test.pb.go)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go
index 0999f29d501..d8f48faffac 100644
--- a/vendor/google.golang.org/protobuf/internal/version/version.go
+++ b/vendor/google.golang.org/protobuf/internal/version/version.go
@@ -51,7 +51,7 @@ import (
 //  10. Send out the CL for review and submit it.
 const (
 	Major      = 1
-	Minor      = 31
+	Minor      = 32
 	Patch      = 0
 	PreRelease = ""
 )
diff --git a/vendor/google.golang.org/protobuf/internal/version/ya.make b/vendor/google.golang.org/protobuf/internal/version/ya.make
index f38441d671f..ca3958ecd92 100644
--- a/vendor/google.golang.org/protobuf/internal/version/ya.make
+++ b/vendor/google.golang.org/protobuf/internal/version/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(version.go)
+SRCS(
+    version.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/proto/bench_test.go b/vendor/google.golang.org/protobuf/proto/bench_test.go
deleted file mode 100644
index 9e9a9c1b5d1..00000000000
--- a/vendor/google.golang.org/protobuf/proto/bench_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"flag"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-)
-
-// The results of these microbenchmarks are unlikely to correspond well
-// to real world performance. They are mainly useful as a quick check to
-// detect unexpected regressions and for profiling specific cases.
-
-var (
-	allowPartial = flag.Bool("allow_partial", false, "set AllowPartial")
-)
-
-// BenchmarkEncode benchmarks encoding all the test messages.
-func BenchmarkEncode(b *testing.B) {
-	for _, test := range testValidMessages {
-		for _, want := range test.decodeTo {
-			opts := proto.MarshalOptions{AllowPartial: *allowPartial}
-			b.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(b *testing.B) {
-				b.RunParallel(func(pb *testing.PB) {
-					for pb.Next() {
-						_, err := opts.Marshal(want)
-						if err != nil && !test.partial {
-							b.Fatal(err)
-						}
-					}
-				})
-			})
-		}
-	}
-}
-
-// BenchmarkDecode benchmarks decoding all the test messages.
-func BenchmarkDecode(b *testing.B) {
-	for _, test := range testValidMessages {
-		for _, want := range test.decodeTo {
-			opts := proto.UnmarshalOptions{AllowPartial: *allowPartial}
-			b.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(b *testing.B) {
-				b.RunParallel(func(pb *testing.PB) {
-					for pb.Next() {
-						m := reflect.New(reflect.TypeOf(want).Elem()).Interface().(proto.Message)
-						err := opts.Unmarshal(test.wire, m)
-						if err != nil && !test.partial {
-							b.Fatal(err)
-						}
-					}
-				})
-			})
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/checkinit_test.go b/vendor/google.golang.org/protobuf/proto/checkinit_test.go
deleted file mode 100644
index 29c9a9a4c8d..00000000000
--- a/vendor/google.golang.org/protobuf/proto/checkinit_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	weakpb "google.golang.org/protobuf/internal/testprotos/test/weak1"
-)
-
-func TestCheckInitializedErrors(t *testing.T) {
-	type test struct {
-		m    proto.Message
-		want string
-		skip bool
-	}
-	tests := []test{{
-		m:    &testpb.TestRequired{},
-		want: `goproto.proto.test.TestRequired.required_field`,
-	}, {
-		m: &testpb.TestRequiredForeign{
-			OptionalMessage: &testpb.TestRequired{},
-		},
-		want: `goproto.proto.test.TestRequired.required_field`,
-	}, {
-		m: &testpb.TestRequiredForeign{
-			RepeatedMessage: []*testpb.TestRequired{
-				{RequiredField: proto.Int32(1)},
-				{},
-			},
-		},
-		want: `goproto.proto.test.TestRequired.required_field`,
-	}, {
-		m: &testpb.TestRequiredForeign{
-			MapMessage: map[int32]*testpb.TestRequired{
-				1: {},
-			},
-		},
-		want: `goproto.proto.test.TestRequired.required_field`,
-	}, {
-		m:    &testpb.TestWeak{},
-		want: `<nil>`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		m: func() proto.Message {
-			m := &testpb.TestWeak{}
-			m.SetWeakMessage1(&weakpb.WeakImportMessage1{})
-			return m
-		}(),
-		want: `goproto.proto.test.weak.WeakImportMessage1.a`,
-		skip: !flags.ProtoLegacy,
-	}, {
-		m: func() proto.Message {
-			m := &testpb.TestWeak{}
-			m.SetWeakMessage1(&weakpb.WeakImportMessage1{
-				A: proto.Int32(1),
-			})
-			return m
-		}(),
-		want: `<nil>`,
-		skip: !flags.ProtoLegacy,
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			if tt.skip {
-				t.SkipNow()
-			}
-
-			err := proto.CheckInitialized(tt.m)
-			got := "<nil>"
-			if err != nil {
-				got = fmt.Sprintf("%q", err)
-			}
-			if !strings.Contains(got, tt.want) {
-				t.Errorf("CheckInitialized(m):\n got: %v\nwant contains: %v\nMessage:\n%v", got, tt.want, prototext.Format(tt.m))
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/decode.go b/vendor/google.golang.org/protobuf/proto/decode.go
index 48d47946bb1..e5b03b56771 100644
--- a/vendor/google.golang.org/protobuf/proto/decode.go
+++ b/vendor/google.golang.org/protobuf/proto/decode.go
@@ -69,7 +69,7 @@ func (o UnmarshalOptions) Unmarshal(b []byte, m Message) error {
 // UnmarshalState parses a wire-format message and places the result in m.
 //
 // This method permits fine-grained control over the unmarshaler.
-// Most users should use Unmarshal instead.
+// Most users should use [Unmarshal] instead.
 func (o UnmarshalOptions) UnmarshalState(in protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) {
 	if o.RecursionLimit == 0 {
 		o.RecursionLimit = protowire.DefaultRecursionLimit
diff --git a/vendor/google.golang.org/protobuf/proto/decode_test.go b/vendor/google.golang.org/protobuf/proto/decode_test.go
deleted file mode 100644
index 1b2f2166b00..00000000000
--- a/vendor/google.golang.org/protobuf/proto/decode_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protopack"
-
-	"google.golang.org/protobuf/internal/errors"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-func TestDecode(t *testing.T) {
-	for _, test := range testValidMessages {
-		if len(test.decodeTo) == 0 {
-			t.Errorf("%v: no test message types", test.desc)
-		}
-		for _, want := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
-				opts := test.unmarshalOptions
-				opts.AllowPartial = test.partial
-				wire := append(([]byte)(nil), test.wire...)
-				got := reflect.New(reflect.TypeOf(want).Elem()).Interface().(proto.Message)
-				if err := opts.Unmarshal(wire, got); err != nil {
-					t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-					return
-				}
-
-				// Aliasing check: Unmarshal shouldn't modify the original wire
-				// bytes, and modifying the original wire bytes shouldn't affect
-				// the unmarshaled message.
-				if !bytes.Equal(test.wire, wire) {
-					t.Errorf("Unmarshal unexpectedly modified its input")
-				}
-				for i := range wire {
-					wire[i] = 0
-				}
-				if !proto.Equal(got, want) && got.ProtoReflect().IsValid() && want.ProtoReflect().IsValid() {
-					t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", prototext.Format(got), prototext.Format(want))
-				}
-			})
-		}
-	}
-}
-
-func TestDecodeRequiredFieldChecks(t *testing.T) {
-	for _, test := range testValidMessages {
-		if !test.partial {
-			continue
-		}
-		for _, m := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
-				opts := test.unmarshalOptions
-				opts.AllowPartial = false
-				got := reflect.New(reflect.TypeOf(m).Elem()).Interface().(proto.Message)
-				if err := proto.Unmarshal(test.wire, got); err == nil {
-					t.Fatalf("Unmarshal succeeded (want error)\nMessage:\n%v", prototext.Format(got))
-				}
-			})
-		}
-	}
-}
-
-func TestDecodeInvalidMessages(t *testing.T) {
-	for _, test := range testInvalidMessages {
-		if len(test.decodeTo) == 0 {
-			t.Errorf("%v: no test message types", test.desc)
-		}
-		for _, want := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
-				opts := test.unmarshalOptions
-				opts.AllowPartial = test.partial
-				got := want.ProtoReflect().New().Interface()
-				if err := opts.Unmarshal(test.wire, got); err == nil {
-					t.Errorf("Unmarshal unexpectedly succeeded\ninput bytes: [%x]\nMessage:\n%v", test.wire, prototext.Format(got))
-				} else if !errors.Is(err, proto.Error) {
-					t.Errorf("Unmarshal error is not a proto.Error: %v", err)
-				}
-			})
-		}
-	}
-}
-
-func TestDecodeZeroLengthBytes(t *testing.T) {
-	// Verify that proto3 bytes fields don't give the mistaken
-	// impression that they preserve presence.
-	wire := protopack.Message{
-		protopack.Tag{94, protopack.BytesType}, protopack.Bytes(nil),
-	}.Marshal()
-	m := &test3pb.TestAllTypes{}
-	if err := proto.Unmarshal(wire, m); err != nil {
-		t.Fatal(err)
-	}
-	if m.OptionalBytes != nil {
-		t.Errorf("unmarshal zero-length proto3 bytes field: got %v, want nil", m.OptionalBytes)
-	}
-}
-
-func TestDecodeOneofNilWrapper(t *testing.T) {
-	wire := protopack.Message{
-		protopack.Tag{111, protopack.VarintType}, protopack.Varint(1111),
-	}.Marshal()
-	m := &testpb.TestAllTypes{OneofField: (*testpb.TestAllTypes_OneofUint32)(nil)}
-	if err := proto.Unmarshal(wire, m); err != nil {
-		t.Fatal(err)
-	}
-	if got := m.GetOneofUint32(); got != 1111 {
-		t.Errorf("GetOneofUint32() = %v, want %v", got, 1111)
-	}
-}
-
-func TestDecodeEmptyBytes(t *testing.T) {
-	// There's really nothing wrong with a nil entry in a [][]byte,
-	// but we take care to produce non-nil []bytes for zero-length
-	// byte strings, so test for it.
-	m := &testpb.TestAllTypes{}
-	b := protopack.Message{
-		protopack.Tag{45, protopack.BytesType}, protopack.Bytes(nil),
-	}.Marshal()
-	if err := proto.Unmarshal(b, m); err != nil {
-		t.Fatal(err)
-	}
-	if m.RepeatedBytes[0] == nil {
-		t.Errorf("unmarshaling repeated bytes field containing zero-length value: Got nil bytes, want non-nil")
-	}
-}
-
-func build(m proto.Message, opts ...buildOpt) proto.Message {
-	for _, opt := range opts {
-		opt(m)
-	}
-	return m
-}
-
-type buildOpt func(proto.Message)
-
-func unknown(raw protoreflect.RawFields) buildOpt {
-	return func(m proto.Message) {
-		m.ProtoReflect().SetUnknown(raw)
-	}
-}
-
-func extend(desc protoreflect.ExtensionType, value interface{}) buildOpt {
-	return func(m proto.Message) {
-		proto.SetExtension(m, desc, value)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/doc.go b/vendor/google.golang.org/protobuf/proto/doc.go
index ec71e717fe7..80ed16a0c29 100644
--- a/vendor/google.golang.org/protobuf/proto/doc.go
+++ b/vendor/google.golang.org/protobuf/proto/doc.go
@@ -18,27 +18,27 @@
 // This package contains functions to convert to and from the wire format,
 // an efficient binary serialization of protocol buffers.
 //
-// • Size reports the size of a message in the wire format.
+//   - [Size] reports the size of a message in the wire format.
 //
-// • Marshal converts a message to the wire format.
-// The MarshalOptions type provides more control over wire marshaling.
+//   - [Marshal] converts a message to the wire format.
+//     The [MarshalOptions] type provides more control over wire marshaling.
 //
-// • Unmarshal converts a message from the wire format.
-// The UnmarshalOptions type provides more control over wire unmarshaling.
+//   - [Unmarshal] converts a message from the wire format.
+//     The [UnmarshalOptions] type provides more control over wire unmarshaling.
 //
 // # Basic message operations
 //
-// • Clone makes a deep copy of a message.
+//   - [Clone] makes a deep copy of a message.
 //
-// • Merge merges the content of a message into another.
+//   - [Merge] merges the content of a message into another.
 //
-// • Equal compares two messages. For more control over comparisons
-// and detailed reporting of differences, see package
-// "google.golang.org/protobuf/testing/protocmp".
+//   - [Equal] compares two messages. For more control over comparisons
+//     and detailed reporting of differences, see package
+//     [google.golang.org/protobuf/testing/protocmp].
 //
-// • Reset clears the content of a message.
+//   - [Reset] clears the content of a message.
 //
-// • CheckInitialized reports whether all required fields in a message are set.
+//   - [CheckInitialized] reports whether all required fields in a message are set.
 //
 // # Optional scalar constructors
 //
@@ -46,9 +46,9 @@
 // as pointers to a value. For example, an optional string field has the
 // Go type *string.
 //
-// • Bool, Int32, Int64, Uint32, Uint64, Float32, Float64, and String
-// take a value and return a pointer to a new instance of it,
-// to simplify construction of optional field values.
+//   - [Bool], [Int32], [Int64], [Uint32], [Uint64], [Float32], [Float64], and [String]
+//     take a value and return a pointer to a new instance of it,
+//     to simplify construction of optional field values.
 //
 // Generated enum types usually have an Enum method which performs the
 // same operation.
@@ -57,29 +57,29 @@
 //
 // # Extension accessors
 //
-// • HasExtension, GetExtension, SetExtension, and ClearExtension
-// access extension field values in a protocol buffer message.
+//   - [HasExtension], [GetExtension], [SetExtension], and [ClearExtension]
+//     access extension field values in a protocol buffer message.
 //
 // Extension fields are only supported in proto2.
 //
 // # Related packages
 //
-// • Package "google.golang.org/protobuf/encoding/protojson" converts messages to
-// and from JSON.
+//   - Package [google.golang.org/protobuf/encoding/protojson] converts messages to
+//     and from JSON.
 //
-// • Package "google.golang.org/protobuf/encoding/prototext" converts messages to
-// and from the text format.
+//   - Package [google.golang.org/protobuf/encoding/prototext] converts messages to
+//     and from the text format.
 //
-// • Package "google.golang.org/protobuf/reflect/protoreflect" provides a
-// reflection interface for protocol buffer data types.
+//   - Package [google.golang.org/protobuf/reflect/protoreflect] provides a
+//     reflection interface for protocol buffer data types.
 //
-// • Package "google.golang.org/protobuf/testing/protocmp" provides features
-// to compare protocol buffer messages with the "github.com/google/go-cmp/cmp"
-// package.
+//   - Package [google.golang.org/protobuf/testing/protocmp] provides features
+//     to compare protocol buffer messages with the [github.com/google/go-cmp/cmp]
+//     package.
 //
-// • Package "google.golang.org/protobuf/types/dynamicpb" provides a dynamic
-// message type, suitable for working with messages where the protocol buffer
-// type is only known at runtime.
+//   - Package [google.golang.org/protobuf/types/dynamicpb] provides a dynamic
+//     message type, suitable for working with messages where the protocol buffer
+//     type is only known at runtime.
 //
 // This module contains additional packages for more specialized use cases.
 // Consult the individual package documentation for details.
diff --git a/vendor/google.golang.org/protobuf/proto/encode.go b/vendor/google.golang.org/protobuf/proto/encode.go
index bf7f816d0e8..4fed202f9fc 100644
--- a/vendor/google.golang.org/protobuf/proto/encode.go
+++ b/vendor/google.golang.org/protobuf/proto/encode.go
@@ -129,7 +129,7 @@ func (o MarshalOptions) MarshalAppend(b []byte, m Message) ([]byte, error) {
 // MarshalState returns the wire-format encoding of a message.
 //
 // This method permits fine-grained control over the marshaler.
-// Most users should use Marshal instead.
+// Most users should use [Marshal] instead.
 func (o MarshalOptions) MarshalState(in protoiface.MarshalInput) (protoiface.MarshalOutput, error) {
 	return o.marshal(in.Buf, in.Message)
 }
diff --git a/vendor/google.golang.org/protobuf/proto/encode_test.go b/vendor/google.golang.org/protobuf/proto/encode_test.go
deleted file mode 100644
index 67ffce4f57c..00000000000
--- a/vendor/google.golang.org/protobuf/proto/encode_test.go
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/encoding/protowire"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-
-	"google.golang.org/protobuf/internal/errors"
-	orderpb "google.golang.org/protobuf/internal/testprotos/order"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-func TestEncode(t *testing.T) {
-	for _, test := range testValidMessages {
-		for _, want := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
-				opts := proto.MarshalOptions{
-					AllowPartial: test.partial,
-				}
-				wire, err := opts.Marshal(want)
-				if err != nil {
-					t.Fatalf("Marshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-				}
-
-				size := proto.Size(want)
-				if size != len(wire) {
-					t.Errorf("Size and marshal disagree: Size(m)=%v; len(Marshal(m))=%v\nMessage:\n%v", size, len(wire), prototext.Format(want))
-				}
-
-				got := want.ProtoReflect().New().Interface()
-				uopts := proto.UnmarshalOptions{
-					AllowPartial: test.partial,
-				}
-				if err := uopts.Unmarshal(wire, got); err != nil {
-					t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-					return
-				}
-				if !proto.Equal(got, want) && got.ProtoReflect().IsValid() && want.ProtoReflect().IsValid() {
-					t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", prototext.Format(got), prototext.Format(want))
-				}
-			})
-		}
-	}
-}
-
-func TestEncodeDeterministic(t *testing.T) {
-	for _, test := range testValidMessages {
-		for _, want := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
-				opts := proto.MarshalOptions{
-					Deterministic: true,
-					AllowPartial:  test.partial,
-				}
-				wire, err := opts.Marshal(want)
-				if err != nil {
-					t.Fatalf("Marshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-				}
-				wire2, err := opts.Marshal(want)
-				if err != nil {
-					t.Fatalf("Marshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-				}
-				if !bytes.Equal(wire, wire2) {
-					t.Fatalf("deterministic marshal returned varying results:\n%v", cmp.Diff(wire, wire2))
-				}
-
-				got := want.ProtoReflect().New().Interface()
-				uopts := proto.UnmarshalOptions{
-					AllowPartial: test.partial,
-				}
-				if err := uopts.Unmarshal(wire, got); err != nil {
-					t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, prototext.Format(want))
-					return
-				}
-				if !proto.Equal(got, want) && got.ProtoReflect().IsValid() && want.ProtoReflect().IsValid() {
-					t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", prototext.Format(got), prototext.Format(want))
-				}
-			})
-		}
-	}
-}
-
-func TestEncodeRequiredFieldChecks(t *testing.T) {
-	for _, test := range testValidMessages {
-		if !test.partial {
-			continue
-		}
-		for _, m := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
-				_, err := proto.Marshal(m)
-				if err == nil {
-					t.Fatalf("Marshal succeeded (want error)\nMessage:\n%v", prototext.Format(m))
-				}
-			})
-		}
-	}
-}
-
-func TestEncodeAppend(t *testing.T) {
-	want := []byte("prefix")
-	got := append([]byte(nil), want...)
-	got, err := proto.MarshalOptions{}.MarshalAppend(got, &test3pb.TestAllTypes{
-		SingularString: "value",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.HasPrefix(got, want) {
-		t.Fatalf("MarshalAppend modified prefix: got %v, want prefix %v", got, want)
-	}
-}
-
-func TestEncodeInvalidMessages(t *testing.T) {
-	for _, test := range testInvalidMessages {
-		for _, m := range test.decodeTo {
-			if !m.ProtoReflect().IsValid() {
-				continue
-			}
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
-				opts := proto.MarshalOptions{
-					AllowPartial: test.partial,
-				}
-				got, err := opts.Marshal(m)
-				if err == nil {
-					t.Fatalf("Marshal unexpectedly succeeded\noutput bytes: [%x]\nMessage:\n%v", got, prototext.Format(m))
-				}
-				if !errors.Is(err, proto.Error) {
-					t.Fatalf("Marshal error is not a proto.Error: %v", err)
-				}
-			})
-		}
-	}
-}
-
-func TestEncodeOneofNilWrapper(t *testing.T) {
-	m := &testpb.TestAllTypes{OneofField: (*testpb.TestAllTypes_OneofUint32)(nil)}
-	b, err := proto.Marshal(m)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(b) > 0 {
-		t.Errorf("Marshal return non-empty, want empty")
-	}
-}
-
-func TestMarshalAppendAllocations(t *testing.T) {
-	m := &test3pb.TestAllTypes{SingularInt32: 1}
-	size := proto.Size(m)
-	const count = 1000
-	b := make([]byte, size)
-	// AllocsPerRun returns an integral value.
-	marshalAllocs := testing.AllocsPerRun(count, func() {
-		_, err := proto.MarshalOptions{}.MarshalAppend(b[:0], m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	b = nil
-	marshalAppendAllocs := testing.AllocsPerRun(count, func() {
-		var err error
-		b, err = proto.MarshalOptions{}.MarshalAppend(b, m)
-		if err != nil {
-			t.Fatal(err)
-		}
-	})
-	if marshalAllocs != marshalAppendAllocs {
-		t.Errorf("%v allocs/op when writing to a preallocated buffer", marshalAllocs)
-		t.Errorf("%v allocs/op when repeatedly appending to a slice", marshalAppendAllocs)
-		t.Errorf("expect amortized allocs/op to be identical")
-	}
-}
-
-func TestEncodeOrder(t *testing.T) {
-	// We make no guarantees about the stability of wire marshal output.
-	// The order in which fields are marshaled may change over time.
-	// If deterministic marshaling is not enabled, it may change over
-	// successive calls to proto.Marshal in the same binary.
-	//
-	// Unfortunately, many users have come to rely on the specific current
-	// wire marshal output. Perhaps someday we will choose to deliberately
-	// change the marshal output; until that day comes, this test verifies
-	// that we don't unintentionally change it.
-	m := &orderpb.Message{
-		Field_1:  proto.String("one"),
-		Field_2:  proto.String("two"),
-		Field_20: proto.String("twenty"),
-		Oneof_1:  &orderpb.Message_Field_10{"ten"},
-	}
-	proto.SetExtension(m, orderpb.E_Field_30, "thirty")
-	proto.SetExtension(m, orderpb.E_Field_31, "thirty-one")
-	proto.SetExtension(m, orderpb.E_Field_32, "thirty-two")
-	want := []protoreflect.FieldNumber{
-		30, 31, 32, // extensions first, in number order
-		1, 2, 20, // non-extension, non-oneof in number order
-		10, // oneofs last, undefined order
-	}
-
-	// Test with deterministic serialization, since fields are not sorted without
-	// it when -tags=protoreflect.
-	b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var got []protoreflect.FieldNumber
-	for len(b) > 0 {
-		num, _, n := protowire.ConsumeField(b)
-		if n < 0 {
-			t.Fatal(protowire.ParseError(n))
-		}
-		b = b[n:]
-		got = append(got, num)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("unexpected field marshal order:\ngot:  %v\nwant: %v\nmessage:\n%v", got, want, m)
-	}
-}
-
-func TestEncodeLarge(t *testing.T) {
-	// Encode/decode a message large enough to overflow a 32-bit size cache.
-	t.Skip("too slow and memory-hungry to run all the time")
-	size := int64(math.MaxUint32 + 1)
-	m := &testpb.TestAllTypes_NestedMessage{
-		Corecursive: &testpb.TestAllTypes{
-			OptionalBytes: make([]byte, size),
-		},
-	}
-	b, err := proto.Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	if got, want := len(b), proto.Size(m); got != want {
-		t.Fatalf("Size(m) = %v, but len(Marshal(m)) = %v", got, want)
-	}
-	if err := proto.Unmarshal(b, m); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	if got, want := int64(len(m.Corecursive.OptionalBytes)), size; got != want {
-		t.Errorf("after round-trip marshal, got len(m.OptionalBytes) = %v, want %v", got, want)
-	}
-}
-
-// TestEncodeEmpty tests for boundary conditions when producing an empty output.
-// These tests are not necessarily a statement of proper behavior,
-// but exist to detect accidental changes in behavior.
-func TestEncodeEmpty(t *testing.T) {
-	for _, m := range []proto.Message{nil, (*testpb.TestAllTypes)(nil), &testpb.TestAllTypes{}} {
-		isValid := m != nil && m.ProtoReflect().IsValid()
-
-		b, err := proto.Marshal(m)
-		if err != nil {
-			t.Errorf("proto.Marshal() = %v", err)
-		}
-		if isNil := b == nil; isNil == isValid {
-			t.Errorf("proto.Marshal() == nil: %v, want %v", isNil, !isValid)
-		}
-
-		b, err = proto.MarshalOptions{}.Marshal(m)
-		if err != nil {
-			t.Errorf("proto.MarshalOptions{}.Marshal() = %v", err)
-		}
-		if isNil := b == nil; isNil == isValid {
-			t.Errorf("proto.MarshalOptions{}.Marshal() = %v, want %v", isNil, !isValid)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/equal_test.go b/vendor/google.golang.org/protobuf/proto/equal_test.go
deleted file mode 100644
index db7ac6fe69e..00000000000
--- a/vendor/google.golang.org/protobuf/proto/equal_test.go
+++ /dev/null
@@ -1,669 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"math"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/pragma"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protopack"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-func TestEqual(t *testing.T) {
-	identicalPtrPb := &testpb.TestAllTypes{MapStringString: map[string]string{"a": "b", "c": "d"}}
-
-	type incomparableMessage struct {
-		*testpb.TestAllTypes
-		pragma.DoNotCompare
-	}
-
-	tests := []struct {
-		x, y proto.Message
-		eq   bool
-	}{
-		{
-			x:  nil,
-			y:  nil,
-			eq: true,
-		}, {
-			x:  (*testpb.TestAllTypes)(nil),
-			y:  nil,
-			eq: false,
-		}, {
-			x:  (*testpb.TestAllTypes)(nil),
-			y:  (*testpb.TestAllTypes)(nil),
-			eq: true,
-		}, {
-			x:  new(testpb.TestAllTypes),
-			y:  (*testpb.TestAllTypes)(nil),
-			eq: false,
-		}, {
-			x:  new(testpb.TestAllTypes),
-			y:  new(testpb.TestAllTypes),
-			eq: true,
-		}, {
-			x:  (*testpb.TestAllTypes)(nil),
-			y:  (*testpb.TestAllExtensions)(nil),
-			eq: false,
-		}, {
-			x:  (*testpb.TestAllTypes)(nil),
-			y:  new(testpb.TestAllExtensions),
-			eq: false,
-		}, {
-			x:  new(testpb.TestAllTypes),
-			y:  new(testpb.TestAllExtensions),
-			eq: false,
-		},
-
-		// Identical input pointers
-		{
-			x:  identicalPtrPb,
-			y:  identicalPtrPb,
-			eq: true,
-		},
-
-		// Incomparable types. The top-level types are not actually directly
-		// compared (which would panic), but rather the comparison happens on the
-		// objects returned by ProtoReflect(). These tests are here just to ensure
-		// that any short-circuit checks do not accidentally try to compare
-		// incomparable top-level types.
-		{
-			x:  incomparableMessage{TestAllTypes: identicalPtrPb},
-			y:  incomparableMessage{TestAllTypes: identicalPtrPb},
-			eq: true,
-		},
-		{
-			x:  identicalPtrPb,
-			y:  incomparableMessage{TestAllTypes: identicalPtrPb},
-			eq: true,
-		},
-		{
-			x:  identicalPtrPb,
-			y:  &incomparableMessage{TestAllTypes: identicalPtrPb},
-			eq: true,
-		},
-
-		// Proto2 scalars.
-		{
-			x: &testpb.TestAllTypes{OptionalInt32: proto.Int32(1)},
-			y: &testpb.TestAllTypes{OptionalInt32: proto.Int32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalInt64: proto.Int64(1)},
-			y: &testpb.TestAllTypes{OptionalInt64: proto.Int64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalUint32: proto.Uint32(1)},
-			y: &testpb.TestAllTypes{OptionalUint32: proto.Uint32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalUint64: proto.Uint64(1)},
-			y: &testpb.TestAllTypes{OptionalUint64: proto.Uint64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalSint32: proto.Int32(1)},
-			y: &testpb.TestAllTypes{OptionalSint32: proto.Int32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalSint64: proto.Int64(1)},
-			y: &testpb.TestAllTypes{OptionalSint64: proto.Int64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalFixed32: proto.Uint32(1)},
-			y: &testpb.TestAllTypes{OptionalFixed32: proto.Uint32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalFixed64: proto.Uint64(1)},
-			y: &testpb.TestAllTypes{OptionalFixed64: proto.Uint64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalSfixed32: proto.Int32(1)},
-			y: &testpb.TestAllTypes{OptionalSfixed32: proto.Int32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalSfixed64: proto.Int64(1)},
-			y: &testpb.TestAllTypes{OptionalSfixed64: proto.Int64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalFloat: proto.Float32(1)},
-			y: &testpb.TestAllTypes{OptionalFloat: proto.Float32(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalDouble: proto.Float64(1)},
-			y: &testpb.TestAllTypes{OptionalDouble: proto.Float64(2)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalFloat: proto.Float32(float32(math.NaN()))},
-			y: &testpb.TestAllTypes{OptionalFloat: proto.Float32(0)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalDouble: proto.Float64(float64(math.NaN()))},
-			y: &testpb.TestAllTypes{OptionalDouble: proto.Float64(0)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalBool: proto.Bool(true)},
-			y: &testpb.TestAllTypes{OptionalBool: proto.Bool(false)},
-		}, {
-			x: &testpb.TestAllTypes{OptionalString: proto.String("a")},
-			y: &testpb.TestAllTypes{OptionalString: proto.String("b")},
-		}, {
-			x: &testpb.TestAllTypes{OptionalBytes: []byte("a")},
-			y: &testpb.TestAllTypes{OptionalBytes: []byte("b")},
-		}, {
-			x: &testpb.TestAllTypes{OptionalNestedEnum: testpb.TestAllTypes_FOO.Enum()},
-			y: &testpb.TestAllTypes{OptionalNestedEnum: testpb.TestAllTypes_BAR.Enum()},
-		}, {
-			x:  &testpb.TestAllTypes{OptionalInt32: proto.Int32(2)},
-			y:  &testpb.TestAllTypes{OptionalInt32: proto.Int32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalInt64: proto.Int64(2)},
-			y:  &testpb.TestAllTypes{OptionalInt64: proto.Int64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalUint32: proto.Uint32(2)},
-			y:  &testpb.TestAllTypes{OptionalUint32: proto.Uint32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalUint64: proto.Uint64(2)},
-			y:  &testpb.TestAllTypes{OptionalUint64: proto.Uint64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalSint32: proto.Int32(2)},
-			y:  &testpb.TestAllTypes{OptionalSint32: proto.Int32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalSint64: proto.Int64(2)},
-			y:  &testpb.TestAllTypes{OptionalSint64: proto.Int64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalFixed32: proto.Uint32(2)},
-			y:  &testpb.TestAllTypes{OptionalFixed32: proto.Uint32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalFixed64: proto.Uint64(2)},
-			y:  &testpb.TestAllTypes{OptionalFixed64: proto.Uint64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalSfixed32: proto.Int32(2)},
-			y:  &testpb.TestAllTypes{OptionalSfixed32: proto.Int32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalSfixed64: proto.Int64(2)},
-			y:  &testpb.TestAllTypes{OptionalSfixed64: proto.Int64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalFloat: proto.Float32(2)},
-			y:  &testpb.TestAllTypes{OptionalFloat: proto.Float32(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalDouble: proto.Float64(2)},
-			y:  &testpb.TestAllTypes{OptionalDouble: proto.Float64(2)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalFloat: proto.Float32(float32(math.NaN()))},
-			y:  &testpb.TestAllTypes{OptionalFloat: proto.Float32(float32(math.NaN()))},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalDouble: proto.Float64(float64(math.NaN()))},
-			y:  &testpb.TestAllTypes{OptionalDouble: proto.Float64(float64(math.NaN()))},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalBool: proto.Bool(true)},
-			y:  &testpb.TestAllTypes{OptionalBool: proto.Bool(true)},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalString: proto.String("abc")},
-			y:  &testpb.TestAllTypes{OptionalString: proto.String("abc")},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalBytes: []byte("abc")},
-			y:  &testpb.TestAllTypes{OptionalBytes: []byte("abc")},
-			eq: true,
-		}, {
-			x:  &testpb.TestAllTypes{OptionalNestedEnum: testpb.TestAllTypes_FOO.Enum()},
-			y:  &testpb.TestAllTypes{OptionalNestedEnum: testpb.TestAllTypes_FOO.Enum()},
-			eq: true,
-		},
-
-		// Proto2 presence.
-		{
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalInt32: proto.Int32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalInt64: proto.Int64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalUint32: proto.Uint32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalUint64: proto.Uint64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalSint32: proto.Int32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalSint64: proto.Int64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalFixed32: proto.Uint32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalFixed64: proto.Uint64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalSfixed32: proto.Int32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalSfixed64: proto.Int64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalFloat: proto.Float32(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalDouble: proto.Float64(0)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalBool: proto.Bool(false)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalString: proto.String("")},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalBytes: []byte{}},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalNestedEnum: testpb.TestAllTypes_FOO.Enum()},
-		},
-
-		// Proto3 presence.
-		{
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalInt32: proto.Int32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalInt64: proto.Int64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalUint32: proto.Uint32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalUint64: proto.Uint64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalSint32: proto.Int32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalSint64: proto.Int64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalFixed32: proto.Uint32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalFixed64: proto.Uint64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalSfixed32: proto.Int32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalSfixed64: proto.Int64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalFloat: proto.Float32(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalDouble: proto.Float64(0)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalBool: proto.Bool(false)},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalString: proto.String("")},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalBytes: []byte{}},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalNestedEnum: test3pb.TestAllTypes_FOO.Enum()},
-		},
-
-		// Proto2 default values are not considered by Equal, so the following are still unequal.
-		{
-			x: &testpb.TestAllTypes{DefaultInt32: proto.Int32(81)},
-			y: &testpb.TestAllTypes{},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultInt32: proto.Int32(81)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultInt64: proto.Int64(82)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultUint32: proto.Uint32(83)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultUint64: proto.Uint64(84)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultSint32: proto.Int32(-85)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultSint64: proto.Int64(86)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultFixed32: proto.Uint32(87)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultFixed64: proto.Uint64(88)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultSfixed32: proto.Int32(89)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultSfixed64: proto.Int64(-90)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultFloat: proto.Float32(91.5)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultDouble: proto.Float64(92e3)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultBool: proto.Bool(true)},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultString: proto.String("hello")},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultBytes: []byte("world")},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{DefaultNestedEnum: testpb.TestAllTypes_BAR.Enum()},
-		},
-
-		// Groups.
-		{
-			x: &testpb.TestAllTypes{Optionalgroup: &testpb.TestAllTypes_OptionalGroup{
-				A: proto.Int32(1),
-			}},
-			y: &testpb.TestAllTypes{Optionalgroup: &testpb.TestAllTypes_OptionalGroup{
-				A: proto.Int32(2),
-			}},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{Optionalgroup: &testpb.TestAllTypes_OptionalGroup{}},
-		},
-
-		// Messages.
-		{
-			x: &testpb.TestAllTypes{OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-				A: proto.Int32(1),
-			}},
-			y: &testpb.TestAllTypes{OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-				A: proto.Int32(2),
-			}},
-		}, {
-			x: &testpb.TestAllTypes{},
-			y: &testpb.TestAllTypes{OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{}},
-		}, {
-			x: &test3pb.TestAllTypes{},
-			y: &test3pb.TestAllTypes{OptionalNestedMessage: &test3pb.TestAllTypes_NestedMessage{}},
-		},
-
-		// Lists.
-		{
-			x: &testpb.TestAllTypes{RepeatedInt32: []int32{1}},
-			y: &testpb.TestAllTypes{RepeatedInt32: []int32{1, 2}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedInt32: []int32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedInt32: []int32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedInt64: []int64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedInt64: []int64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedUint32: []uint32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedUint32: []uint32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedUint64: []uint64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedUint64: []uint64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedSint32: []int32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedSint32: []int32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedSint64: []int64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedSint64: []int64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedFixed32: []uint32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedFixed32: []uint32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedFixed64: []uint64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedFixed64: []uint64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedSfixed32: []int32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedSfixed32: []int32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedSfixed64: []int64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedSfixed64: []int64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedFloat: []float32{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedFloat: []float32{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedDouble: []float64{1, 2}},
-			y: &testpb.TestAllTypes{RepeatedDouble: []float64{1, 3}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedBool: []bool{true, false}},
-			y: &testpb.TestAllTypes{RepeatedBool: []bool{true, true}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedString: []string{"a", "b"}},
-			y: &testpb.TestAllTypes{RepeatedString: []string{"a", "c"}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedBytes: [][]byte{[]byte("a"), []byte("b")}},
-			y: &testpb.TestAllTypes{RepeatedBytes: [][]byte{[]byte("a"), []byte("c")}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedNestedEnum: []testpb.TestAllTypes_NestedEnum{testpb.TestAllTypes_FOO}},
-			y: &testpb.TestAllTypes{RepeatedNestedEnum: []testpb.TestAllTypes_NestedEnum{testpb.TestAllTypes_BAR}},
-		}, {
-			x: &testpb.TestAllTypes{Repeatedgroup: []*testpb.TestAllTypes_RepeatedGroup{
-				{A: proto.Int32(1)},
-				{A: proto.Int32(2)},
-			}},
-			y: &testpb.TestAllTypes{Repeatedgroup: []*testpb.TestAllTypes_RepeatedGroup{
-				{A: proto.Int32(1)},
-				{A: proto.Int32(3)},
-			}},
-		}, {
-			x: &testpb.TestAllTypes{RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{
-				{A: proto.Int32(1)},
-				{A: proto.Int32(2)},
-			}},
-			y: &testpb.TestAllTypes{RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{
-				{A: proto.Int32(1)},
-				{A: proto.Int32(3)},
-			}},
-		},
-
-		// Maps: various configurations.
-		{
-			x: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2}},
-			y: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{3: 4}},
-		}, {
-			x: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2}},
-			y: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2, 3: 4}},
-		}, {
-			x: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2}},
-		},
-
-		// Maps: various types.
-		{
-			x: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapInt32Int32: map[int32]int32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapInt64Int64: map[int64]int64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapInt64Int64: map[int64]int64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapUint32Uint32: map[uint32]uint32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapUint32Uint32: map[uint32]uint32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapUint64Uint64: map[uint64]uint64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapUint64Uint64: map[uint64]uint64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapSint32Sint32: map[int32]int32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapSint32Sint32: map[int32]int32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapSint64Sint64: map[int64]int64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapSint64Sint64: map[int64]int64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapFixed32Fixed32: map[uint32]uint32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapFixed32Fixed32: map[uint32]uint32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapFixed64Fixed64: map[uint64]uint64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapFixed64Fixed64: map[uint64]uint64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapSfixed32Sfixed32: map[int32]int32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapSfixed32Sfixed32: map[int32]int32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapSfixed64Sfixed64: map[int64]int64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapSfixed64Sfixed64: map[int64]int64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapInt32Float: map[int32]float32{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapInt32Float: map[int32]float32{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapInt32Double: map[int32]float64{1: 2, 3: 4}},
-			y: &testpb.TestAllTypes{MapInt32Double: map[int32]float64{1: 2, 3: 5}},
-		}, {
-			x: &testpb.TestAllTypes{MapBoolBool: map[bool]bool{true: false, false: true}},
-			y: &testpb.TestAllTypes{MapBoolBool: map[bool]bool{true: false, false: false}},
-		}, {
-			x: &testpb.TestAllTypes{MapStringString: map[string]string{"a": "b", "c": "d"}},
-			y: &testpb.TestAllTypes{MapStringString: map[string]string{"a": "b", "c": "e"}},
-		}, {
-			x: &testpb.TestAllTypes{MapStringBytes: map[string][]byte{"a": []byte("b"), "c": []byte("d")}},
-			y: &testpb.TestAllTypes{MapStringBytes: map[string][]byte{"a": []byte("b"), "c": []byte("e")}},
-		}, {
-			x: &testpb.TestAllTypes{MapStringNestedMessage: map[string]*testpb.TestAllTypes_NestedMessage{
-				"a": {A: proto.Int32(1)},
-				"b": {A: proto.Int32(2)},
-			}},
-			y: &testpb.TestAllTypes{MapStringNestedMessage: map[string]*testpb.TestAllTypes_NestedMessage{
-				"a": {A: proto.Int32(1)},
-				"b": {A: proto.Int32(3)},
-			}},
-		}, {
-			x: &testpb.TestAllTypes{MapStringNestedEnum: map[string]testpb.TestAllTypes_NestedEnum{
-				"a": testpb.TestAllTypes_FOO,
-				"b": testpb.TestAllTypes_BAR,
-			}},
-			y: &testpb.TestAllTypes{MapStringNestedEnum: map[string]testpb.TestAllTypes_NestedEnum{
-				"a": testpb.TestAllTypes_FOO,
-				"b": testpb.TestAllTypes_BAZ,
-			}},
-		},
-
-		// Extensions.
-		{
-			x: build(&testpb.TestAllExtensions{},
-				extend(testpb.E_OptionalInt32, int32(1)),
-			),
-			y: build(&testpb.TestAllExtensions{},
-				extend(testpb.E_OptionalInt32, int32(2)),
-			),
-		}, {
-			x: &testpb.TestAllExtensions{},
-			y: build(&testpb.TestAllExtensions{},
-				extend(testpb.E_OptionalInt32, int32(2)),
-			),
-		},
-
-		// Unknown fields.
-		{
-			x: build(&testpb.TestAllTypes{}, unknown(protopack.Message{
-				protopack.Tag{100000, protopack.VarintType}, protopack.Varint(1),
-			}.Marshal())),
-			y: build(&testpb.TestAllTypes{}, unknown(protopack.Message{
-				protopack.Tag{100000, protopack.VarintType}, protopack.Varint(2),
-			}.Marshal())),
-		}, {
-			x: build(&testpb.TestAllTypes{}, unknown(protopack.Message{
-				protopack.Tag{100000, protopack.VarintType}, protopack.Varint(1),
-			}.Marshal())),
-			y: &testpb.TestAllTypes{},
-		},
-	}
-
-	for _, tt := range tests {
-		if !tt.eq && !proto.Equal(tt.x, tt.x) {
-			t.Errorf("Equal(x, x) = false, want true\n==== x ====\n%v", prototext.Format(tt.x))
-		}
-		if !tt.eq && !proto.Equal(tt.y, tt.y) {
-			t.Errorf("Equal(y, y) = false, want true\n==== y ====\n%v", prototext.Format(tt.y))
-		}
-		if eq := proto.Equal(tt.x, tt.y); eq != tt.eq {
-			t.Errorf("Equal(x, y) = %v, want %v\n==== x ====\n%v==== y ====\n%v", eq, tt.eq, prototext.Format(tt.x), prototext.Format(tt.y))
-		}
-	}
-}
-
-func BenchmarkEqualWithSmallEmpty(b *testing.B) {
-	x := &testpb.ForeignMessage{}
-	y := &testpb.ForeignMessage{}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, y)
-	}
-}
-
-func BenchmarkEqualWithIdenticalPtrEmpty(b *testing.B) {
-	x := &testpb.ForeignMessage{}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, x)
-	}
-}
-
-func BenchmarkEqualWithLargeEmpty(b *testing.B) {
-	x := &testpb.TestAllTypes{}
-	y := &testpb.TestAllTypes{}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, y)
-	}
-}
-
-func makeNested(depth int) *testpb.TestAllTypes {
-	if depth <= 0 {
-		return nil
-	}
-	return &testpb.TestAllTypes{
-		OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-			Corecursive: makeNested(depth - 1),
-		},
-	}
-}
-
-func BenchmarkEqualWithDeeplyNestedEqual(b *testing.B) {
-	x := makeNested(20)
-	y := makeNested(20)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, y)
-	}
-}
-
-func BenchmarkEqualWithDeeplyNestedDifferent(b *testing.B) {
-	x := makeNested(20)
-	y := makeNested(21)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, y)
-	}
-}
-
-func BenchmarkEqualWithDeeplyNestedIdenticalPtr(b *testing.B) {
-	x := makeNested(20)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		proto.Equal(x, x)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/extension.go b/vendor/google.golang.org/protobuf/proto/extension.go
index 5f293cda869..17899a3a767 100644
--- a/vendor/google.golang.org/protobuf/proto/extension.go
+++ b/vendor/google.golang.org/protobuf/proto/extension.go
@@ -26,7 +26,7 @@ func HasExtension(m Message, xt protoreflect.ExtensionType) bool {
 }
 
 // ClearExtension clears an extension field such that subsequent
-// HasExtension calls return false.
+// [HasExtension] calls return false.
 // It panics if m is invalid or if xt does not extend m.
 func ClearExtension(m Message, xt protoreflect.ExtensionType) {
 	m.ProtoReflect().Clear(xt.TypeDescriptor())
diff --git a/vendor/google.golang.org/protobuf/proto/extension_test.go b/vendor/google.golang.org/protobuf/proto/extension_test.go
deleted file mode 100644
index 8bf5da5279b..00000000000
--- a/vendor/google.golang.org/protobuf/proto/extension_test.go
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"fmt"
-	"reflect"
-	"sync"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	legacy1pb "google.golang.org/protobuf/internal/testprotos/legacy/proto2_20160225_2fc053c5"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-	descpb "google.golang.org/protobuf/types/descriptorpb"
-)
-
-func TestExtensionFuncs(t *testing.T) {
-	for _, test := range []struct {
-		message     proto.Message
-		ext         protoreflect.ExtensionType
-		wantDefault interface{}
-		value       interface{}
-	}{
-		{
-			message:     &testpb.TestAllExtensions{},
-			ext:         testpb.E_OptionalInt32,
-			wantDefault: int32(0),
-			value:       int32(1),
-		},
-		{
-			message:     &testpb.TestAllExtensions{},
-			ext:         testpb.E_RepeatedString,
-			wantDefault: ([]string)(nil),
-			value:       []string{"a", "b", "c"},
-		},
-		{
-			message:     protoimpl.X.MessageOf(&legacy1pb.Message{}).Interface(),
-			ext:         legacy1pb.E_Message_ExtensionOptionalBool,
-			wantDefault: false,
-			value:       true,
-		},
-	} {
-		desc := fmt.Sprintf("Extension %v, value %v", test.ext.TypeDescriptor().FullName(), test.value)
-		if proto.HasExtension(test.message, test.ext) {
-			t.Errorf("%v:\nbefore setting extension HasExtension(...) = true, want false", desc)
-		}
-		got := proto.GetExtension(test.message, test.ext)
-		if d := cmp.Diff(test.wantDefault, got); d != "" {
-			t.Errorf("%v:\nbefore setting extension GetExtension(...) returns unexpected value (-want,+got):\n%v", desc, d)
-		}
-		proto.SetExtension(test.message, test.ext, test.value)
-		if !proto.HasExtension(test.message, test.ext) {
-			t.Errorf("%v:\nafter setting extension HasExtension(...) = false, want true", desc)
-		}
-		got = proto.GetExtension(test.message, test.ext)
-		if d := cmp.Diff(test.value, got); d != "" {
-			t.Errorf("%v:\nafter setting extension GetExtension(...) returns unexpected value (-want,+got):\n%v", desc, d)
-		}
-		proto.ClearExtension(test.message, test.ext)
-		if proto.HasExtension(test.message, test.ext) {
-			t.Errorf("%v:\nafter clearing extension HasExtension(...) = true, want false", desc)
-		}
-	}
-}
-
-func TestIsValid(t *testing.T) {
-	tests := []struct {
-		xt   protoreflect.ExtensionType
-		vi   interface{}
-		want bool
-	}{
-		{testpb.E_OptionalBool, nil, false},
-		{testpb.E_OptionalBool, bool(true), true},
-		{testpb.E_OptionalBool, new(bool), false},
-		{testpb.E_OptionalInt32, nil, false},
-		{testpb.E_OptionalInt32, int32(0), true},
-		{testpb.E_OptionalInt32, new(int32), false},
-		{testpb.E_OptionalInt64, nil, false},
-		{testpb.E_OptionalInt64, int64(0), true},
-		{testpb.E_OptionalInt64, new(int64), false},
-		{testpb.E_OptionalUint32, nil, false},
-		{testpb.E_OptionalUint32, uint32(0), true},
-		{testpb.E_OptionalUint32, new(uint32), false},
-		{testpb.E_OptionalUint64, nil, false},
-		{testpb.E_OptionalUint64, uint64(0), true},
-		{testpb.E_OptionalUint64, new(uint64), false},
-		{testpb.E_OptionalFloat, nil, false},
-		{testpb.E_OptionalFloat, float32(0), true},
-		{testpb.E_OptionalFloat, new(float32), false},
-		{testpb.E_OptionalDouble, nil, false},
-		{testpb.E_OptionalDouble, float64(0), true},
-		{testpb.E_OptionalDouble, new(float32), false},
-		{testpb.E_OptionalString, nil, false},
-		{testpb.E_OptionalString, string(""), true},
-		{testpb.E_OptionalString, new(string), false},
-		{testpb.E_OptionalNestedEnum, nil, false},
-		{testpb.E_OptionalNestedEnum, testpb.TestAllTypes_BAZ, true},
-		{testpb.E_OptionalNestedEnum, testpb.TestAllTypes_BAZ.Enum(), false},
-		{testpb.E_OptionalNestedMessage, nil, false},
-		{testpb.E_OptionalNestedMessage, (*testpb.TestAllExtensions_NestedMessage)(nil), true},
-		{testpb.E_OptionalNestedMessage, new(testpb.TestAllExtensions_NestedMessage), true},
-		{testpb.E_OptionalNestedMessage, new(testpb.TestAllExtensions), false},
-		{testpb.E_RepeatedBool, nil, false},
-		{testpb.E_RepeatedBool, []bool(nil), true},
-		{testpb.E_RepeatedBool, []bool{}, true},
-		{testpb.E_RepeatedBool, []bool{false}, true},
-		{testpb.E_RepeatedBool, []*bool{}, false},
-		{testpb.E_RepeatedInt32, nil, false},
-		{testpb.E_RepeatedInt32, []int32(nil), true},
-		{testpb.E_RepeatedInt32, []int32{}, true},
-		{testpb.E_RepeatedInt32, []int32{0}, true},
-		{testpb.E_RepeatedInt32, []*int32{}, false},
-		{testpb.E_RepeatedInt64, nil, false},
-		{testpb.E_RepeatedInt64, []int64(nil), true},
-		{testpb.E_RepeatedInt64, []int64{}, true},
-		{testpb.E_RepeatedInt64, []int64{0}, true},
-		{testpb.E_RepeatedInt64, []*int64{}, false},
-		{testpb.E_RepeatedUint32, nil, false},
-		{testpb.E_RepeatedUint32, []uint32(nil), true},
-		{testpb.E_RepeatedUint32, []uint32{}, true},
-		{testpb.E_RepeatedUint32, []uint32{0}, true},
-		{testpb.E_RepeatedUint32, []*uint32{}, false},
-		{testpb.E_RepeatedUint64, nil, false},
-		{testpb.E_RepeatedUint64, []uint64(nil), true},
-		{testpb.E_RepeatedUint64, []uint64{}, true},
-		{testpb.E_RepeatedUint64, []uint64{0}, true},
-		{testpb.E_RepeatedUint64, []*uint64{}, false},
-		{testpb.E_RepeatedFloat, nil, false},
-		{testpb.E_RepeatedFloat, []float32(nil), true},
-		{testpb.E_RepeatedFloat, []float32{}, true},
-		{testpb.E_RepeatedFloat, []float32{0}, true},
-		{testpb.E_RepeatedFloat, []*float32{}, false},
-		{testpb.E_RepeatedDouble, nil, false},
-		{testpb.E_RepeatedDouble, []float64(nil), true},
-		{testpb.E_RepeatedDouble, []float64{}, true},
-		{testpb.E_RepeatedDouble, []float64{0}, true},
-		{testpb.E_RepeatedDouble, []*float64{}, false},
-		{testpb.E_RepeatedString, nil, false},
-		{testpb.E_RepeatedString, []string(nil), true},
-		{testpb.E_RepeatedString, []string{}, true},
-		{testpb.E_RepeatedString, []string{""}, true},
-		{testpb.E_RepeatedString, []*string{}, false},
-		{testpb.E_RepeatedNestedEnum, nil, false},
-		{testpb.E_RepeatedNestedEnum, []testpb.TestAllTypes_NestedEnum(nil), true},
-		{testpb.E_RepeatedNestedEnum, []testpb.TestAllTypes_NestedEnum{}, true},
-		{testpb.E_RepeatedNestedEnum, []testpb.TestAllTypes_NestedEnum{0}, true},
-		{testpb.E_RepeatedNestedEnum, []*testpb.TestAllTypes_NestedEnum{}, false},
-		{testpb.E_RepeatedNestedMessage, nil, false},
-		{testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions_NestedMessage(nil), true},
-		{testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions_NestedMessage{}, true},
-		{testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions_NestedMessage{{}}, true},
-		{testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions{}, false},
-	}
-
-	for _, tt := range tests {
-		// Check the results of IsValidInterface.
-		got := tt.xt.IsValidInterface(tt.vi)
-		if got != tt.want {
-			t.Errorf("%v.IsValidInterface() = %v, want %v", tt.xt.TypeDescriptor().FullName(), got, tt.want)
-		}
-		if !got {
-			continue
-		}
-
-		// Set the extension value and verify the results of Has.
-		wantHas := true
-		pv := tt.xt.ValueOf(tt.vi)
-		switch v := pv.Interface().(type) {
-		case protoreflect.List:
-			wantHas = v.Len() > 0
-		case protoreflect.Message:
-			wantHas = v.IsValid()
-		}
-		m := &testpb.TestAllExtensions{}
-		proto.SetExtension(m, tt.xt, tt.vi)
-		gotHas := proto.HasExtension(m, tt.xt)
-		if gotHas != wantHas {
-			t.Errorf("HasExtension(%q) = %v, want %v", tt.xt.TypeDescriptor().FullName(), gotHas, wantHas)
-		}
-
-		// Check consistency of IsValidInterface and IsValidValue.
-		got = tt.xt.IsValidValue(pv)
-		if got != tt.want {
-			t.Errorf("%v.IsValidValue() = %v, want %v", tt.xt.TypeDescriptor().FullName(), got, tt.want)
-		}
-		if !got {
-			continue
-		}
-
-		// Use of reflect.DeepEqual is intentional.
-		// We really do want to ensure that the memory layout is identical.
-		vi := tt.xt.InterfaceOf(pv)
-		if !reflect.DeepEqual(vi, tt.vi) {
-			t.Errorf("InterfaceOf(ValueOf(...)) round-trip mismatch: got %v, want %v", vi, tt.vi)
-		}
-	}
-}
-
-func TestExtensionRanger(t *testing.T) {
-	tests := []struct {
-		msg  proto.Message
-		want map[protoreflect.ExtensionType]interface{}
-	}{{
-		msg: &testpb.TestAllExtensions{},
-		want: map[protoreflect.ExtensionType]interface{}{
-			testpb.E_OptionalInt32:         int32(5),
-			testpb.E_OptionalString:        string("hello"),
-			testpb.E_OptionalNestedMessage: &testpb.TestAllExtensions_NestedMessage{},
-			testpb.E_OptionalNestedEnum:    testpb.TestAllTypes_BAZ,
-			testpb.E_RepeatedFloat:         []float32{+32.32, -32.32},
-			testpb.E_RepeatedNestedMessage: []*testpb.TestAllExtensions_NestedMessage{{}},
-			testpb.E_RepeatedNestedEnum:    []testpb.TestAllTypes_NestedEnum{testpb.TestAllTypes_BAZ},
-		},
-	}, {
-		msg: &descpb.MessageOptions{},
-		want: map[protoreflect.ExtensionType]interface{}{
-			test3pb.E_OptionalInt32:          int32(5),
-			test3pb.E_OptionalString:         string("hello"),
-			test3pb.E_OptionalForeignMessage: &test3pb.ForeignMessage{},
-			test3pb.E_OptionalForeignEnum:    test3pb.ForeignEnum_FOREIGN_BAR,
-
-			test3pb.E_OptionalOptionalInt32:          int32(5),
-			test3pb.E_OptionalOptionalString:         string("hello"),
-			test3pb.E_OptionalOptionalForeignMessage: &test3pb.ForeignMessage{},
-			test3pb.E_OptionalOptionalForeignEnum:    test3pb.ForeignEnum_FOREIGN_BAR,
-		},
-	}}
-
-	for _, tt := range tests {
-		for xt, v := range tt.want {
-			proto.SetExtension(tt.msg, xt, v)
-		}
-
-		got := make(map[protoreflect.ExtensionType]interface{})
-		proto.RangeExtensions(tt.msg, func(xt protoreflect.ExtensionType, v interface{}) bool {
-			got[xt] = v
-			return true
-		})
-
-		if diff := cmp.Diff(tt.want, got, protocmp.Transform()); diff != "" {
-			t.Errorf("proto.RangeExtensions mismatch (-want +got):\n%s", diff)
-		}
-	}
-}
-
-func TestExtensionGetRace(t *testing.T) {
-	// Concurrently fetch an extension value while marshaling the message containing it.
-	// Create the message with proto.Unmarshal to give lazy extension decoding (if present)
-	// a chance to occur.
-	want := int32(42)
-	m1 := &testpb.TestAllExtensions{}
-	proto.SetExtension(m1, testpb.E_OptionalNestedMessage, &testpb.TestAllExtensions_NestedMessage{A: proto.Int32(want)})
-	b, err := proto.Marshal(m1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	m := &testpb.TestAllExtensions{}
-	if err := proto.Unmarshal(b, m); err != nil {
-		t.Fatal(err)
-	}
-	var wg sync.WaitGroup
-	for i := 0; i < 3; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			if _, err := proto.Marshal(m); err != nil {
-				t.Error(err)
-			}
-		}()
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			got := proto.GetExtension(m, testpb.E_OptionalNestedMessage).(*testpb.TestAllExtensions_NestedMessage).GetA()
-			if got != want {
-				t.Errorf("GetExtension(optional_nested_message).a = %v, want %v", got, want)
-			}
-		}()
-	}
-	wg.Wait()
-}
diff --git a/vendor/google.golang.org/protobuf/proto/gotest/ya.make b/vendor/google.golang.org/protobuf/proto/gotest/ya.make
deleted file mode 100644
index 6958868f1d4..00000000000
--- a/vendor/google.golang.org/protobuf/proto/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/proto)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/proto/merge.go b/vendor/google.golang.org/protobuf/proto/merge.go
index d761ab331d1..3c6fe57807b 100644
--- a/vendor/google.golang.org/protobuf/proto/merge.go
+++ b/vendor/google.golang.org/protobuf/proto/merge.go
@@ -21,7 +21,7 @@ import (
 // The unknown fields of src are appended to the unknown fields of dst.
 //
 // It is semantically equivalent to unmarshaling the encoded form of src
-// into dst with the UnmarshalOptions.Merge option specified.
+// into dst with the [UnmarshalOptions.Merge] option specified.
 func Merge(dst, src Message) {
 	// TODO: Should nil src be treated as semantically equivalent to a
 	// untyped, read-only, empty message? What about a nil dst?
diff --git a/vendor/google.golang.org/protobuf/proto/merge_test.go b/vendor/google.golang.org/protobuf/proto/merge_test.go
deleted file mode 100644
index 05978cb2f1a..00000000000
--- a/vendor/google.golang.org/protobuf/proto/merge_test.go
+++ /dev/null
@@ -1,905 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"fmt"
-	"reflect"
-	"sync"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/protobuild"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protocmp"
-	"google.golang.org/protobuf/testing/protopack"
-	"google.golang.org/protobuf/types/dynamicpb"
-
-	legacypb "google.golang.org/protobuf/internal/testprotos/legacy"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-type testMerge struct {
-	desc  string
-	dst   protobuild.Message
-	src   protobuild.Message
-	want  protobuild.Message // if dst and want are nil, want = src
-	types []proto.Message
-}
-
-var testMerges = []testMerge{{
-	desc: "clone a large message",
-	src: protobuild.Message{
-		"optional_int32":       1001,
-		"optional_int64":       1002,
-		"optional_uint32":      1003,
-		"optional_uint64":      1004,
-		"optional_sint32":      1005,
-		"optional_sint64":      1006,
-		"optional_fixed32":     1007,
-		"optional_fixed64":     1008,
-		"optional_sfixed32":    1009,
-		"optional_sfixed64":    1010,
-		"optional_float":       1011.5,
-		"optional_double":      1012.5,
-		"optional_bool":        true,
-		"optional_string":      "string",
-		"optional_bytes":       []byte("bytes"),
-		"optional_nested_enum": 1,
-		"optional_nested_message": protobuild.Message{
-			"a": 100,
-		},
-		"repeated_int32":       []int32{1001, 2001},
-		"repeated_int64":       []int64{1002, 2002},
-		"repeated_uint32":      []uint32{1003, 2003},
-		"repeated_uint64":      []uint64{1004, 2004},
-		"repeated_sint32":      []int32{1005, 2005},
-		"repeated_sint64":      []int64{1006, 2006},
-		"repeated_fixed32":     []uint32{1007, 2007},
-		"repeated_fixed64":     []uint64{1008, 2008},
-		"repeated_sfixed32":    []int32{1009, 2009},
-		"repeated_sfixed64":    []int64{1010, 2010},
-		"repeated_float":       []float32{1011.5, 2011.5},
-		"repeated_double":      []float64{1012.5, 2012.5},
-		"repeated_bool":        []bool{true, false},
-		"repeated_string":      []string{"foo", "bar"},
-		"repeated_bytes":       []string{"FOO", "BAR"},
-		"repeated_nested_enum": []string{"FOO", "BAR"},
-		"repeated_nested_message": []protobuild.Message{
-			{"a": 200},
-			{"a": 300},
-		},
-	},
-}, {
-	desc: "clone maps",
-	src: protobuild.Message{
-		"map_int32_int32":       map[int32]int32{1056: 1156, 2056: 2156},
-		"map_int64_int64":       map[int64]int64{1057: 1157, 2057: 2157},
-		"map_uint32_uint32":     map[uint32]uint32{1058: 1158, 2058: 2158},
-		"map_uint64_uint64":     map[uint64]uint64{1059: 1159, 2059: 2159},
-		"map_sint32_sint32":     map[int32]int32{1060: 1160, 2060: 2160},
-		"map_sint64_sint64":     map[int64]int64{1061: 1161, 2061: 2161},
-		"map_fixed32_fixed32":   map[uint32]uint32{1062: 1162, 2062: 2162},
-		"map_fixed64_fixed64":   map[uint64]uint64{1063: 1163, 2063: 2163},
-		"map_sfixed32_sfixed32": map[int32]int32{1064: 1164, 2064: 2164},
-		"map_sfixed64_sfixed64": map[int64]int64{1065: 1165, 2065: 2165},
-		"map_int32_float":       map[int32]float32{1066: 1166.5, 2066: 2166.5},
-		"map_int32_double":      map[int32]float64{1067: 1167.5, 2067: 2167.5},
-		"map_bool_bool":         map[bool]bool{true: false, false: true},
-		"map_string_string":     map[string]string{"69.1.key": "69.1.val", "69.2.key": "69.2.val"},
-		"map_string_bytes":      map[string][]byte{"70.1.key": []byte("70.1.val"), "70.2.key": []byte("70.2.val")},
-		"map_string_nested_message": map[string]protobuild.Message{
-			"71.1.key": {"a": 1171},
-			"71.2.key": {"a": 2171},
-		},
-		"map_string_nested_enum": map[string]string{"73.1.key": "FOO", "73.2.key": "BAR"},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof uint32",
-	src: protobuild.Message{
-		"oneof_uint32": 1111,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof string",
-	src: protobuild.Message{
-		"oneof_string": "string",
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof bytes",
-	src: protobuild.Message{
-		"oneof_bytes": "bytes",
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof bool",
-	src: protobuild.Message{
-		"oneof_bool": true,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof uint64",
-	src: protobuild.Message{
-		"oneof_uint64": 100,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof float",
-	src: protobuild.Message{
-		"oneof_float": 100,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof double",
-	src: protobuild.Message{
-		"oneof_double": 1111,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof enum",
-	src: protobuild.Message{
-		"oneof_enum": 1,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof message",
-	src: protobuild.Message{
-		"oneof_nested_message": protobuild.Message{
-			"a": 1,
-		},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "clone oneof group",
-	src: protobuild.Message{
-		"oneofgroup": protobuild.Message{
-			"a": 1,
-		},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}},
-}, {
-	desc: "merge bytes",
-	dst: protobuild.Message{
-		"optional_bytes":   []byte{1, 2, 3},
-		"repeated_bytes":   [][]byte{{1, 2}, {3, 4}},
-		"map_string_bytes": map[string][]byte{"alpha": {1, 2, 3}},
-	},
-	src: protobuild.Message{
-		"optional_bytes":   []byte{4, 5, 6},
-		"repeated_bytes":   [][]byte{{5, 6}, {7, 8}},
-		"map_string_bytes": map[string][]byte{"alpha": {4, 5, 6}, "bravo": {1, 2, 3}},
-	},
-	want: protobuild.Message{
-		"optional_bytes":   []byte{4, 5, 6},
-		"repeated_bytes":   [][]byte{{1, 2}, {3, 4}, {5, 6}, {7, 8}},
-		"map_string_bytes": map[string][]byte{"alpha": {4, 5, 6}, "bravo": {1, 2, 3}},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "merge singular fields",
-	dst: protobuild.Message{
-		"optional_int32":       1,
-		"optional_int64":       1,
-		"optional_uint32":      1,
-		"optional_uint64":      1,
-		"optional_sint32":      1,
-		"optional_sint64":      1,
-		"optional_fixed32":     1,
-		"optional_fixed64":     1,
-		"optional_sfixed32":    1,
-		"optional_sfixed64":    1,
-		"optional_float":       1,
-		"optional_double":      1,
-		"optional_bool":        false,
-		"optional_string":      "1",
-		"optional_bytes":       "1",
-		"optional_nested_enum": 1,
-		"optional_nested_message": protobuild.Message{
-			"a": 1,
-			"corecursive": protobuild.Message{
-				"optional_int64": 1,
-			},
-		},
-	},
-	src: protobuild.Message{
-		"optional_int32":       2,
-		"optional_int64":       2,
-		"optional_uint32":      2,
-		"optional_uint64":      2,
-		"optional_sint32":      2,
-		"optional_sint64":      2,
-		"optional_fixed32":     2,
-		"optional_fixed64":     2,
-		"optional_sfixed32":    2,
-		"optional_sfixed64":    2,
-		"optional_float":       2,
-		"optional_double":      2,
-		"optional_bool":        true,
-		"optional_string":      "2",
-		"optional_bytes":       "2",
-		"optional_nested_enum": 2,
-		"optional_nested_message": protobuild.Message{
-			"a": 2,
-			"corecursive": protobuild.Message{
-				"optional_int64": 2,
-			},
-		},
-	},
-	want: protobuild.Message{
-		"optional_int32":       2,
-		"optional_int64":       2,
-		"optional_uint32":      2,
-		"optional_uint64":      2,
-		"optional_sint32":      2,
-		"optional_sint64":      2,
-		"optional_fixed32":     2,
-		"optional_fixed64":     2,
-		"optional_sfixed32":    2,
-		"optional_sfixed64":    2,
-		"optional_float":       2,
-		"optional_double":      2,
-		"optional_bool":        true,
-		"optional_string":      "2",
-		"optional_bytes":       "2",
-		"optional_nested_enum": 2,
-		"optional_nested_message": protobuild.Message{
-			"a": 2,
-			"corecursive": protobuild.Message{
-				"optional_int64": 2,
-			},
-		},
-	},
-}, {
-	desc: "no merge of empty singular fields",
-	dst: protobuild.Message{
-		"optional_int32":       1,
-		"optional_int64":       1,
-		"optional_uint32":      1,
-		"optional_uint64":      1,
-		"optional_sint32":      1,
-		"optional_sint64":      1,
-		"optional_fixed32":     1,
-		"optional_fixed64":     1,
-		"optional_sfixed32":    1,
-		"optional_sfixed64":    1,
-		"optional_float":       1,
-		"optional_double":      1,
-		"optional_bool":        false,
-		"optional_string":      "1",
-		"optional_bytes":       "1",
-		"optional_nested_enum": 1,
-		"optional_nested_message": protobuild.Message{
-			"a": 1,
-			"corecursive": protobuild.Message{
-				"optional_int64": 1,
-			},
-		},
-	},
-	src: protobuild.Message{
-		"optional_nested_message": protobuild.Message{
-			"a": 1,
-			"corecursive": protobuild.Message{
-				"optional_int32": 2,
-			},
-		},
-	},
-	want: protobuild.Message{
-		"optional_int32":       1,
-		"optional_int64":       1,
-		"optional_uint32":      1,
-		"optional_uint64":      1,
-		"optional_sint32":      1,
-		"optional_sint64":      1,
-		"optional_fixed32":     1,
-		"optional_fixed64":     1,
-		"optional_sfixed32":    1,
-		"optional_sfixed64":    1,
-		"optional_float":       1,
-		"optional_double":      1,
-		"optional_bool":        false,
-		"optional_string":      "1",
-		"optional_bytes":       "1",
-		"optional_nested_enum": 1,
-		"optional_nested_message": protobuild.Message{
-			"a": 1,
-			"corecursive": protobuild.Message{
-				"optional_int32": 2,
-				"optional_int64": 1,
-			},
-		},
-	},
-}, {
-	desc: "merge list fields",
-	dst: protobuild.Message{
-		"repeated_int32":       []int32{1, 2, 3},
-		"repeated_int64":       []int64{1, 2, 3},
-		"repeated_uint32":      []uint32{1, 2, 3},
-		"repeated_uint64":      []uint64{1, 2, 3},
-		"repeated_sint32":      []int32{1, 2, 3},
-		"repeated_sint64":      []int64{1, 2, 3},
-		"repeated_fixed32":     []uint32{1, 2, 3},
-		"repeated_fixed64":     []uint64{1, 2, 3},
-		"repeated_sfixed32":    []int32{1, 2, 3},
-		"repeated_sfixed64":    []int64{1, 2, 3},
-		"repeated_float":       []float32{1, 2, 3},
-		"repeated_double":      []float64{1, 2, 3},
-		"repeated_bool":        []bool{true},
-		"repeated_string":      []string{"a", "b", "c"},
-		"repeated_bytes":       []string{"a", "b", "c"},
-		"repeated_nested_enum": []int{1, 2, 3},
-		"repeated_nested_message": []protobuild.Message{
-			{"a": 100},
-			{"a": 200},
-		},
-	},
-	src: protobuild.Message{
-		"repeated_int32":       []int32{4, 5, 6},
-		"repeated_int64":       []int64{4, 5, 6},
-		"repeated_uint32":      []uint32{4, 5, 6},
-		"repeated_uint64":      []uint64{4, 5, 6},
-		"repeated_sint32":      []int32{4, 5, 6},
-		"repeated_sint64":      []int64{4, 5, 6},
-		"repeated_fixed32":     []uint32{4, 5, 6},
-		"repeated_fixed64":     []uint64{4, 5, 6},
-		"repeated_sfixed32":    []int32{4, 5, 6},
-		"repeated_sfixed64":    []int64{4, 5, 6},
-		"repeated_float":       []float32{4, 5, 6},
-		"repeated_double":      []float64{4, 5, 6},
-		"repeated_bool":        []bool{false},
-		"repeated_string":      []string{"d", "e", "f"},
-		"repeated_bytes":       []string{"d", "e", "f"},
-		"repeated_nested_enum": []int{4, 5, 6},
-		"repeated_nested_message": []protobuild.Message{
-			{"a": 300},
-			{"a": 400},
-		},
-	},
-	want: protobuild.Message{
-		"repeated_int32":       []int32{1, 2, 3, 4, 5, 6},
-		"repeated_int64":       []int64{1, 2, 3, 4, 5, 6},
-		"repeated_uint32":      []uint32{1, 2, 3, 4, 5, 6},
-		"repeated_uint64":      []uint64{1, 2, 3, 4, 5, 6},
-		"repeated_sint32":      []int32{1, 2, 3, 4, 5, 6},
-		"repeated_sint64":      []int64{1, 2, 3, 4, 5, 6},
-		"repeated_fixed32":     []uint32{1, 2, 3, 4, 5, 6},
-		"repeated_fixed64":     []uint64{1, 2, 3, 4, 5, 6},
-		"repeated_sfixed32":    []int32{1, 2, 3, 4, 5, 6},
-		"repeated_sfixed64":    []int64{1, 2, 3, 4, 5, 6},
-		"repeated_float":       []float32{1, 2, 3, 4, 5, 6},
-		"repeated_double":      []float64{1, 2, 3, 4, 5, 6},
-		"repeated_bool":        []bool{true, false},
-		"repeated_string":      []string{"a", "b", "c", "d", "e", "f"},
-		"repeated_bytes":       []string{"a", "b", "c", "d", "e", "f"},
-		"repeated_nested_enum": []int{1, 2, 3, 4, 5, 6},
-		"repeated_nested_message": []protobuild.Message{
-			{"a": 100},
-			{"a": 200},
-			{"a": 300},
-			{"a": 400},
-		},
-	},
-}, {
-	desc: "merge map fields",
-	dst: protobuild.Message{
-		"map_int32_int32":       map[int]int{1: 1, 3: 1},
-		"map_int64_int64":       map[int]int{1: 1, 3: 1},
-		"map_uint32_uint32":     map[int]int{1: 1, 3: 1},
-		"map_uint64_uint64":     map[int]int{1: 1, 3: 1},
-		"map_sint32_sint32":     map[int]int{1: 1, 3: 1},
-		"map_sint64_sint64":     map[int]int{1: 1, 3: 1},
-		"map_fixed32_fixed32":   map[int]int{1: 1, 3: 1},
-		"map_fixed64_fixed64":   map[int]int{1: 1, 3: 1},
-		"map_sfixed32_sfixed32": map[int]int{1: 1, 3: 1},
-		"map_sfixed64_sfixed64": map[int]int{1: 1, 3: 1},
-		"map_int32_float":       map[int]int{1: 1, 3: 1},
-		"map_int32_double":      map[int]int{1: 1, 3: 1},
-		"map_bool_bool":         map[bool]bool{true: true},
-		"map_string_string":     map[string]string{"a": "1", "ab": "1"},
-		"map_string_bytes":      map[string]string{"a": "1", "ab": "1"},
-		"map_string_nested_message": map[string]protobuild.Message{
-			"a": {"a": 1},
-			"ab": {
-				"a": 1,
-				"corecursive": protobuild.Message{
-					"map_int32_int32": map[int]int{1: 1, 3: 1},
-				},
-			},
-		},
-		"map_string_nested_enum": map[string]int{"a": 1, "ab": 1},
-	},
-	src: protobuild.Message{
-		"map_int32_int32":       map[int]int{2: 2, 3: 2},
-		"map_int64_int64":       map[int]int{2: 2, 3: 2},
-		"map_uint32_uint32":     map[int]int{2: 2, 3: 2},
-		"map_uint64_uint64":     map[int]int{2: 2, 3: 2},
-		"map_sint32_sint32":     map[int]int{2: 2, 3: 2},
-		"map_sint64_sint64":     map[int]int{2: 2, 3: 2},
-		"map_fixed32_fixed32":   map[int]int{2: 2, 3: 2},
-		"map_fixed64_fixed64":   map[int]int{2: 2, 3: 2},
-		"map_sfixed32_sfixed32": map[int]int{2: 2, 3: 2},
-		"map_sfixed64_sfixed64": map[int]int{2: 2, 3: 2},
-		"map_int32_float":       map[int]int{2: 2, 3: 2},
-		"map_int32_double":      map[int]int{2: 2, 3: 2},
-		"map_bool_bool":         map[bool]bool{false: false},
-		"map_string_string":     map[string]string{"b": "2", "ab": "2"},
-		"map_string_bytes":      map[string]string{"b": "2", "ab": "2"},
-		"map_string_nested_message": map[string]protobuild.Message{
-			"b": {"a": 2},
-			"ab": {
-				"a": 2,
-				"corecursive": protobuild.Message{
-					"map_int32_int32": map[int]int{2: 2, 3: 2},
-				},
-			},
-		},
-		"map_string_nested_enum": map[string]int{"b": 2, "ab": 2},
-	},
-	want: protobuild.Message{
-		"map_int32_int32":       map[int]int{1: 1, 2: 2, 3: 2},
-		"map_int64_int64":       map[int]int{1: 1, 2: 2, 3: 2},
-		"map_uint32_uint32":     map[int]int{1: 1, 2: 2, 3: 2},
-		"map_uint64_uint64":     map[int]int{1: 1, 2: 2, 3: 2},
-		"map_sint32_sint32":     map[int]int{1: 1, 2: 2, 3: 2},
-		"map_sint64_sint64":     map[int]int{1: 1, 2: 2, 3: 2},
-		"map_fixed32_fixed32":   map[int]int{1: 1, 2: 2, 3: 2},
-		"map_fixed64_fixed64":   map[int]int{1: 1, 2: 2, 3: 2},
-		"map_sfixed32_sfixed32": map[int]int{1: 1, 2: 2, 3: 2},
-		"map_sfixed64_sfixed64": map[int]int{1: 1, 2: 2, 3: 2},
-		"map_int32_float":       map[int]int{1: 1, 2: 2, 3: 2},
-		"map_int32_double":      map[int]int{1: 1, 2: 2, 3: 2},
-		"map_bool_bool":         map[bool]bool{true: true, false: false},
-		"map_string_string":     map[string]string{"a": "1", "b": "2", "ab": "2"},
-		"map_string_bytes":      map[string]string{"a": "1", "b": "2", "ab": "2"},
-		"map_string_nested_message": map[string]protobuild.Message{
-			"a": {"a": 1},
-			"b": {"a": 2},
-			"ab": {
-				"a": 2,
-				"corecursive": protobuild.Message{
-					// The map item "ab" was entirely replaced, so
-					// this does not contain 1:1 from dst.
-					"map_int32_int32": map[int]int{2: 2, 3: 2},
-				},
-			},
-		},
-		"map_string_nested_enum": map[string]int{"a": 1, "b": 2, "ab": 2},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "merge oneof message fields",
-	dst: protobuild.Message{
-		"oneof_nested_message": protobuild.Message{
-			"a": 100,
-		},
-	},
-	src: protobuild.Message{
-		"oneof_nested_message": protobuild.Message{
-			"corecursive": protobuild.Message{
-				"optional_int64": 1000,
-			},
-		},
-	},
-	want: protobuild.Message{
-		"oneof_nested_message": protobuild.Message{
-			"a": 100,
-			"corecursive": protobuild.Message{
-				"optional_int64": 1000,
-			},
-		},
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "merge oneof scalar fields",
-	dst: protobuild.Message{
-		"oneof_uint32": 100,
-	},
-	src: protobuild.Message{
-		"oneof_float": 3.14152,
-	},
-	want: protobuild.Message{
-		"oneof_float": 3.14152,
-	},
-	types: []proto.Message{&testpb.TestAllTypes{}, &test3pb.TestAllTypes{}},
-}, {
-	desc: "merge unknown fields",
-	dst: protobuild.Message{
-		protobuild.Unknown: protopack.Message{
-			protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-		}.Marshal(),
-	},
-	src: protobuild.Message{
-		protobuild.Unknown: protopack.Message{
-			protopack.Tag{Number: 500000, Type: protopack.VarintType}, protopack.Svarint(-50),
-		}.Marshal(),
-	},
-	want: protobuild.Message{
-		protobuild.Unknown: protopack.Message{
-			protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-			protopack.Tag{Number: 500000, Type: protopack.VarintType}, protopack.Svarint(-50),
-		}.Marshal(),
-	},
-}, {
-	desc: "clone legacy message",
-	src: protobuild.Message{"f1": protobuild.Message{
-		"optional_int32":        1,
-		"optional_int64":        1,
-		"optional_uint32":       1,
-		"optional_uint64":       1,
-		"optional_sint32":       1,
-		"optional_sint64":       1,
-		"optional_fixed32":      1,
-		"optional_fixed64":      1,
-		"optional_sfixed32":     1,
-		"optional_sfixed64":     1,
-		"optional_float":        1,
-		"optional_double":       1,
-		"optional_bool":         true,
-		"optional_string":       "string",
-		"optional_bytes":        "bytes",
-		"optional_sibling_enum": 1,
-		"optional_sibling_message": protobuild.Message{
-			"f1": "value",
-		},
-		"repeated_int32":        []int32{1},
-		"repeated_int64":        []int64{1},
-		"repeated_uint32":       []uint32{1},
-		"repeated_uint64":       []uint64{1},
-		"repeated_sint32":       []int32{1},
-		"repeated_sint64":       []int64{1},
-		"repeated_fixed32":      []uint32{1},
-		"repeated_fixed64":      []uint64{1},
-		"repeated_sfixed32":     []int32{1},
-		"repeated_sfixed64":     []int64{1},
-		"repeated_float":        []float32{1},
-		"repeated_double":       []float64{1},
-		"repeated_bool":         []bool{true},
-		"repeated_string":       []string{"string"},
-		"repeated_bytes":        []string{"bytes"},
-		"repeated_sibling_enum": []int{1},
-		"repeated_sibling_message": []protobuild.Message{
-			{"f1": "1"},
-		},
-		"map_bool_int32":    map[bool]int{true: 1},
-		"map_bool_int64":    map[bool]int{true: 1},
-		"map_bool_uint32":   map[bool]int{true: 1},
-		"map_bool_uint64":   map[bool]int{true: 1},
-		"map_bool_sint32":   map[bool]int{true: 1},
-		"map_bool_sint64":   map[bool]int{true: 1},
-		"map_bool_fixed32":  map[bool]int{true: 1},
-		"map_bool_fixed64":  map[bool]int{true: 1},
-		"map_bool_sfixed32": map[bool]int{true: 1},
-		"map_bool_sfixed64": map[bool]int{true: 1},
-		"map_bool_float":    map[bool]int{true: 1},
-		"map_bool_double":   map[bool]int{true: 1},
-		"map_bool_bool":     map[bool]bool{true: false},
-		"map_bool_string":   map[bool]string{true: "1"},
-		"map_bool_bytes":    map[bool]string{true: "1"},
-		"map_bool_sibling_message": map[bool]protobuild.Message{
-			true: {"f1": "1"},
-		},
-		"map_bool_sibling_enum": map[bool]int{true: 1},
-		"oneof_sibling_message": protobuild.Message{
-			"f1": "1",
-		},
-	}},
-	types: []proto.Message{&legacypb.Legacy{}},
-}}
-
-func TestMerge(t *testing.T) {
-	for _, tt := range testMerges {
-		for _, mt := range templateMessages(tt.types...) {
-			t.Run(fmt.Sprintf("%s (%v)", tt.desc, mt.Descriptor().FullName()), func(t *testing.T) {
-				dst := mt.New().Interface()
-				tt.dst.Build(dst.ProtoReflect())
-
-				src := mt.New().Interface()
-				tt.src.Build(src.ProtoReflect())
-
-				want := mt.New().Interface()
-				if tt.dst == nil && tt.want == nil {
-					tt.src.Build(want.ProtoReflect())
-				} else {
-					tt.want.Build(want.ProtoReflect())
-				}
-
-				// Merge should be semantically equivalent to unmarshaling the
-				// encoded form of src into the current dst.
-				b1, err := proto.MarshalOptions{AllowPartial: true}.Marshal(dst)
-				if err != nil {
-					t.Fatalf("Marshal(dst) error: %v", err)
-				}
-				b2, err := proto.MarshalOptions{AllowPartial: true}.Marshal(src)
-				if err != nil {
-					t.Fatalf("Marshal(src) error: %v", err)
-				}
-				unmarshaled := dst.ProtoReflect().New().Interface()
-				err = proto.UnmarshalOptions{AllowPartial: true}.Unmarshal(append(b1, b2...), unmarshaled)
-				if err != nil {
-					t.Fatalf("Unmarshal() error: %v", err)
-				}
-				if !proto.Equal(unmarshaled, want) {
-					t.Fatalf("Unmarshal(Marshal(dst)+Marshal(src)) mismatch:\n got %v\nwant %v\ndiff (-want,+got):\n%v", unmarshaled, want, cmp.Diff(want, unmarshaled, protocmp.Transform()))
-				}
-
-				// Test heterogeneous MessageTypes by merging into a
-				// dynamic message.
-				ddst := dynamicpb.NewMessage(mt.Descriptor())
-				tt.dst.Build(ddst.ProtoReflect())
-				proto.Merge(ddst, src)
-				if !proto.Equal(ddst, want) {
-					t.Fatalf("Merge() into dynamic message mismatch:\n got %v\nwant %v\ndiff (-want,+got):\n%v", ddst, want, cmp.Diff(want, ddst, protocmp.Transform()))
-				}
-
-				proto.Merge(dst, src)
-				if !proto.Equal(dst, want) {
-					t.Fatalf("Merge() mismatch:\n got %v\nwant %v\ndiff (-want,+got):\n%v", dst, want, cmp.Diff(want, dst, protocmp.Transform()))
-				}
-				mutateValue(protoreflect.ValueOfMessage(src.ProtoReflect()))
-				if !proto.Equal(dst, want) {
-					t.Fatalf("mutation observed after modifying source:\n got %v\nwant %v\ndiff (-want,+got):\n%v", dst, want, cmp.Diff(want, dst, protocmp.Transform()))
-				}
-			})
-		}
-	}
-}
-
-func TestMergeFromNil(t *testing.T) {
-	dst := &testpb.TestAllTypes{}
-	proto.Merge(dst, (*testpb.TestAllTypes)(nil))
-	if !proto.Equal(dst, &testpb.TestAllTypes{}) {
-		t.Errorf("destination should be empty after merging from nil message; got:\n%v", prototext.Format(dst))
-	}
-}
-
-// TestMergeAberrant tests inputs that are beyond the protobuf data model.
-// Just because there is a test for the current behavior does not mean that
-// this will behave the same way in the future.
-func TestMergeAberrant(t *testing.T) {
-	tests := []struct {
-		label string
-		dst   proto.Message
-		src   proto.Message
-		check func(proto.Message) bool
-	}{{
-		label: "Proto2EmptyBytes",
-		dst:   &testpb.TestAllTypes{OptionalBytes: nil},
-		src:   &testpb.TestAllTypes{OptionalBytes: []byte{}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).OptionalBytes != nil
-		},
-	}, {
-		label: "Proto3EmptyBytes",
-		dst:   &test3pb.TestAllTypes{SingularBytes: nil},
-		src:   &test3pb.TestAllTypes{SingularBytes: []byte{}},
-		check: func(m proto.Message) bool {
-			return m.(*test3pb.TestAllTypes).SingularBytes == nil
-		},
-	}, {
-		label: "EmptyList",
-		dst:   &testpb.TestAllTypes{RepeatedInt32: nil},
-		src:   &testpb.TestAllTypes{RepeatedInt32: []int32{}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).RepeatedInt32 == nil
-		},
-	}, {
-		label: "ListWithNilBytes",
-		dst:   &testpb.TestAllTypes{RepeatedBytes: nil},
-		src:   &testpb.TestAllTypes{RepeatedBytes: [][]byte{nil}},
-		check: func(m proto.Message) bool {
-			return reflect.DeepEqual(m.(*testpb.TestAllTypes).RepeatedBytes, [][]byte{{}})
-		},
-	}, {
-		label: "ListWithEmptyBytes",
-		dst:   &testpb.TestAllTypes{RepeatedBytes: nil},
-		src:   &testpb.TestAllTypes{RepeatedBytes: [][]byte{{}}},
-		check: func(m proto.Message) bool {
-			return reflect.DeepEqual(m.(*testpb.TestAllTypes).RepeatedBytes, [][]byte{{}})
-		},
-	}, {
-		label: "ListWithNilMessage",
-		dst:   &testpb.TestAllTypes{RepeatedNestedMessage: nil},
-		src:   &testpb.TestAllTypes{RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{nil}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).RepeatedNestedMessage[0] != nil
-		},
-	}, {
-		label: "EmptyMap",
-		dst:   &testpb.TestAllTypes{MapStringString: nil},
-		src:   &testpb.TestAllTypes{MapStringString: map[string]string{}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).MapStringString == nil
-		},
-	}, {
-		label: "MapWithNilBytes",
-		dst:   &testpb.TestAllTypes{MapStringBytes: nil},
-		src:   &testpb.TestAllTypes{MapStringBytes: map[string][]byte{"k": nil}},
-		check: func(m proto.Message) bool {
-			return reflect.DeepEqual(m.(*testpb.TestAllTypes).MapStringBytes, map[string][]byte{"k": {}})
-		},
-	}, {
-		label: "MapWithEmptyBytes",
-		dst:   &testpb.TestAllTypes{MapStringBytes: nil},
-		src:   &testpb.TestAllTypes{MapStringBytes: map[string][]byte{"k": {}}},
-		check: func(m proto.Message) bool {
-			return reflect.DeepEqual(m.(*testpb.TestAllTypes).MapStringBytes, map[string][]byte{"k": {}})
-		},
-	}, {
-		label: "MapWithNilMessage",
-		dst:   &testpb.TestAllTypes{MapStringNestedMessage: nil},
-		src:   &testpb.TestAllTypes{MapStringNestedMessage: map[string]*testpb.TestAllTypes_NestedMessage{"k": nil}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).MapStringNestedMessage["k"] != nil
-		},
-	}, {
-		label: "OneofWithTypedNilWrapper",
-		dst:   &testpb.TestAllTypes{OneofField: nil},
-		src:   &testpb.TestAllTypes{OneofField: (*testpb.TestAllTypes_OneofNestedMessage)(nil)},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).OneofField == nil
-		},
-	}, {
-		label: "OneofWithNilMessage",
-		dst:   &testpb.TestAllTypes{OneofField: nil},
-		src:   &testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofNestedMessage{OneofNestedMessage: nil}},
-		check: func(m proto.Message) bool {
-			return m.(*testpb.TestAllTypes).OneofField.(*testpb.TestAllTypes_OneofNestedMessage).OneofNestedMessage != nil
-		},
-		// TODO: extension, nil message
-		// TODO: repeated extension, nil
-		// TODO: extension bytes
-		// TODO: repeated extension, nil message
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.label, func(t *testing.T) {
-			var pass bool
-			func() {
-				defer func() { recover() }()
-				proto.Merge(tt.dst, tt.src)
-				pass = tt.check(tt.dst)
-			}()
-			if !pass {
-				t.Error("check failed")
-			}
-		})
-	}
-}
-
-func TestMergeRace(t *testing.T) {
-	dst := new(testpb.TestAllTypes)
-	srcs := []*testpb.TestAllTypes{
-		{OptionalInt32: proto.Int32(1)},
-		{OptionalString: proto.String("hello")},
-		{RepeatedInt32: []int32{2, 3, 4}},
-		{RepeatedString: []string{"goodbye"}},
-		{MapStringString: map[string]string{"key": "value"}},
-		{OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-			A: proto.Int32(5),
-		}},
-		func() *testpb.TestAllTypes {
-			m := new(testpb.TestAllTypes)
-			m.ProtoReflect().SetUnknown(protopack.Message{
-				protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-			}.Marshal())
-			return m
-		}(),
-	}
-
-	// It should be safe to concurrently merge non-overlapping fields.
-	var wg sync.WaitGroup
-	defer wg.Wait()
-	for _, src := range srcs {
-		wg.Add(1)
-		go func(src proto.Message) {
-			defer wg.Done()
-			proto.Merge(dst, src)
-		}(src)
-	}
-}
-
-func TestMergeSelf(t *testing.T) {
-	got := &testpb.TestAllTypes{
-		OptionalInt32:   proto.Int32(1),
-		OptionalString:  proto.String("hello"),
-		RepeatedInt32:   []int32{2, 3, 4},
-		RepeatedString:  []string{"goodbye"},
-		MapStringString: map[string]string{"key": "value"},
-		OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-			A: proto.Int32(5),
-		},
-	}
-	got.ProtoReflect().SetUnknown(protopack.Message{
-		protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-	}.Marshal())
-	proto.Merge(got, got)
-
-	// The main impact of merging to self is that repeated fields and
-	// unknown fields are doubled.
-	want := &testpb.TestAllTypes{
-		OptionalInt32:   proto.Int32(1),
-		OptionalString:  proto.String("hello"),
-		RepeatedInt32:   []int32{2, 3, 4, 2, 3, 4},
-		RepeatedString:  []string{"goodbye", "goodbye"},
-		MapStringString: map[string]string{"key": "value"},
-		OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
-			A: proto.Int32(5),
-		},
-	}
-	want.ProtoReflect().SetUnknown(protopack.Message{
-		protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-		protopack.Tag{Number: 50000, Type: protopack.VarintType}, protopack.Svarint(-5),
-	}.Marshal())
-
-	if !proto.Equal(got, want) {
-		t.Errorf("Equal mismatch:\ngot  %v\nwant %v", got, want)
-	}
-}
-
-func TestClone(t *testing.T) {
-	want := &testpb.TestAllTypes{
-		OptionalInt32: proto.Int32(1),
-	}
-	got := proto.Clone(want).(*testpb.TestAllTypes)
-	if !proto.Equal(got, want) {
-		t.Errorf("Clone(src) != src:\n got %v\nwant %v", got, want)
-	}
-}
-
-// mutateValue changes a Value, returning a new value.
-//
-// For scalar values, it returns a value different from the input.
-// For Message, List, and Map values, it mutates the input and returns it.
-func mutateValue(v protoreflect.Value) protoreflect.Value {
-	switch v := v.Interface().(type) {
-	case bool:
-		return protoreflect.ValueOfBool(!v)
-	case protoreflect.EnumNumber:
-		return protoreflect.ValueOfEnum(v + 1)
-	case int32:
-		return protoreflect.ValueOfInt32(v + 1)
-	case int64:
-		return protoreflect.ValueOfInt64(v + 1)
-	case uint32:
-		return protoreflect.ValueOfUint32(v + 1)
-	case uint64:
-		return protoreflect.ValueOfUint64(v + 1)
-	case float32:
-		return protoreflect.ValueOfFloat32(v + 1)
-	case float64:
-		return protoreflect.ValueOfFloat64(v + 1)
-	case []byte:
-		for i := range v {
-			v[i]++
-		}
-		return protoreflect.ValueOfBytes(v)
-	case string:
-		return protoreflect.ValueOfString("_" + v)
-	case protoreflect.Message:
-		v.Range(func(fd protoreflect.FieldDescriptor, val protoreflect.Value) bool {
-			v.Set(fd, mutateValue(val))
-			return true
-		})
-		return protoreflect.ValueOfMessage(v)
-	case protoreflect.List:
-		for i := 0; i < v.Len(); i++ {
-			v.Set(i, mutateValue(v.Get(i)))
-		}
-		return protoreflect.ValueOfList(v)
-	case protoreflect.Map:
-		v.Range(func(mk protoreflect.MapKey, mv protoreflect.Value) bool {
-			v.Set(mk, mutateValue(mv))
-			return true
-		})
-		return protoreflect.ValueOfMap(v)
-	default:
-		panic(fmt.Sprintf("unknown value type %T", v))
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/messageset_test.go b/vendor/google.golang.org/protobuf/proto/messageset_test.go
deleted file mode 100644
index e634112fa02..00000000000
--- a/vendor/google.golang.org/protobuf/proto/messageset_test.go
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"google.golang.org/protobuf/encoding/protowire"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protopack"
-
-	messagesetpb "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
-	msetextpb "google.golang.org/protobuf/internal/testprotos/messageset/msetextpb"
-)
-
-func init() {
-	if flags.ProtoLegacy {
-		testValidMessages = append(testValidMessages, messageSetTestProtos...)
-		testInvalidMessages = append(testInvalidMessages, messageSetInvalidTestProtos...)
-	}
-}
-
-var messageSetTestProtos = []testProto{
-	{
-		desc: "MessageSet type_id before message content",
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-			})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-				}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet type_id after message content",
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-			})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-				}),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet does not preserve unknown field",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-			extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-			}),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-			// Unknown field
-			protopack.Tag{4, protopack.VarintType}, protopack.Varint(30),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with unknown type_id",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-			unknown(protopack.Message{
-				protopack.Tag{999, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-				}),
-			}.Marshal()),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(999),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet merges repeated message fields in item",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-			extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-				Ext1Field2: proto.Int32(20),
-			}),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-			}),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(20),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet merges message fields in repeated items",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-			extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-				Ext1Field2: proto.Int32(20),
-			}),
-			extend(msetextpb.E_Ext2_MessageSetExtension, &msetextpb.Ext2{
-				Ext2Field1: proto.Int32(30),
-			}),
-		)},
-		wire: protopack.Message{
-			// Ext1, field1
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-			// Ext2, field1
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1001),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(30),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-			// Ext2, field2
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(20),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with missing type_id",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-			}),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with missing message",
-		decodeTo: []proto.Message{build(
-			&messagesetpb.MessageSet{},
-			extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{}),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with type id out of valid field number range",
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_ExtLargeNumber_MessageSetExtension, &msetextpb.ExtLargeNumber{})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(protowire.MaxValidNumber + 1),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with unknown type id out of valid field number range",
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			m.MessageSet.ProtoReflect().SetUnknown(
-				protopack.Message{
-					protopack.Tag{protowire.MaxValidNumber + 2, protopack.BytesType}, protopack.LengthPrefix{},
-				}.Marshal(),
-			)
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(protowire.MaxValidNumber + 2),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with unknown field",
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
-				Ext1Field1: proto.Int32(10),
-			})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1000),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(10),
-				}),
-				protopack.Tag{4, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "MessageSet with required field set",
-		checkFastInit: true,
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_ExtRequired_MessageSetExtension, &msetextpb.ExtRequired{
-				RequiredField1: proto.Int32(1),
-			})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1002),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "MessageSet with required field unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: []proto.Message{func() proto.Message {
-			m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
-			proto.SetExtension(m.MessageSet, msetextpb.E_ExtRequired_MessageSetExtension, &msetextpb.ExtRequired{})
-			return m
-		}()},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1002),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-}
-
-var messageSetInvalidTestProtos = []testProto{
-	{
-		desc: "MessageSet with type id 0",
-		decodeTo: []proto.Message{
-			(*messagesetpb.MessageSetContainer)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Uvarint(0),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "MessageSet with type id overflowing int32",
-		decodeTo: []proto.Message{
-			(*messagesetpb.MessageSetContainer)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.StartGroupType},
-				protopack.Tag{2, protopack.VarintType}, protopack.Uvarint(0x80000000),
-				protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.EndGroupType},
-			}),
-		}.Marshal(),
-	},
-}
diff --git a/vendor/google.golang.org/protobuf/proto/methods_test.go b/vendor/google.golang.org/protobuf/proto/methods_test.go
deleted file mode 100644
index 203d42a99e5..00000000000
--- a/vendor/google.golang.org/protobuf/proto/methods_test.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The protoreflect tag disables fast-path methods, including legacy ones.
-//go:build !protoreflect
-// +build !protoreflect
-
-package proto_test
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"testing"
-
-	"google.golang.org/protobuf/internal/impl"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/runtime/protoiface"
-
-	legacypb "google.golang.org/protobuf/internal/testprotos/legacy"
-)
-
-type selfMarshaler struct {
-	bytes []byte
-	err   error
-}
-
-func (m selfMarshaler) Reset()        {}
-func (m selfMarshaler) ProtoMessage() {}
-
-func (m selfMarshaler) String() string {
-	return fmt.Sprintf("selfMarshaler{bytes:%v, err:%v}", m.bytes, m.err)
-}
-
-func (m selfMarshaler) Marshal() ([]byte, error) {
-	return m.bytes, m.err
-}
-
-func (m *selfMarshaler) Unmarshal(b []byte) error {
-	m.bytes = b
-	return m.err
-}
-
-func TestLegacyMarshalMethod(t *testing.T) {
-	for _, test := range []selfMarshaler{
-		{bytes: []byte("marshal")},
-		{bytes: []byte("marshal"), err: errors.New("some error")},
-	} {
-		m := impl.Export{}.MessageOf(test).Interface()
-		b, err := proto.Marshal(m)
-		if err != test.err || !bytes.Equal(b, test.bytes) {
-			t.Errorf("proto.Marshal(%v) = %v, %v; want %v, %v", test, b, err, test.bytes, test.err)
-		}
-		if gotSize, wantSize := proto.Size(m), len(test.bytes); gotSize != wantSize {
-			t.Fatalf("proto.Size(%v) = %v, want %v", test, gotSize, wantSize)
-		}
-
-		prefix := []byte("prefix")
-		want := append(prefix, test.bytes...)
-		b, err = proto.MarshalOptions{}.MarshalAppend(prefix, m)
-		if err != test.err || !bytes.Equal(b, want) {
-			t.Errorf("MarshalAppend(%v, %v) = %v, %v; want %v, %v", prefix, test, b, err, test.bytes, test.err)
-		}
-
-		b, err = proto.MarshalOptions{
-			Deterministic: true,
-		}.MarshalAppend(nil, m)
-		if err != test.err || !bytes.Equal(b, test.bytes) {
-			t.Errorf("MarshalOptions{Deterministic:true}.MarshalAppend(nil, %v) = %v, %v; want %v, %v", test, b, err, test.bytes, test.err)
-		}
-	}
-}
-
-func TestLegacyUnmarshalMethod(t *testing.T) {
-	sm := &selfMarshaler{}
-	m := impl.Export{}.MessageOf(sm).Interface()
-	want := []byte("unmarshal")
-	if err := proto.Unmarshal(want, m); err != nil {
-		t.Fatalf("proto.Unmarshal(selfMarshaler{}) = %v, want nil", err)
-	}
-	if !bytes.Equal(sm.bytes, want) {
-		t.Fatalf("proto.Unmarshal(selfMarshaler{}): Marshal method not called")
-	}
-}
-
-type descPanicSelfMarshaler struct{}
-
-const descPanicSelfMarshalerBytes = "bytes"
-
-func (m *descPanicSelfMarshaler) Reset()                      {}
-func (m *descPanicSelfMarshaler) ProtoMessage()               {}
-func (m *descPanicSelfMarshaler) Descriptor() ([]byte, []int) { panic("Descriptor method panics") }
-func (m *descPanicSelfMarshaler) String() string              { return "descPanicSelfMarshaler{}" }
-func (m *descPanicSelfMarshaler) Marshal() ([]byte, error) {
-	return []byte(descPanicSelfMarshalerBytes), nil
-}
-
-func TestSelfMarshalerDescriptorPanics(t *testing.T) {
-	m := &descPanicSelfMarshaler{}
-	got, err := proto.Marshal(impl.Export{}.MessageOf(m).Interface())
-	want := []byte(descPanicSelfMarshalerBytes)
-	if err != nil || !bytes.Equal(got, want) {
-		t.Fatalf("proto.Marshal(%v) = %v, %v; want %v, nil", m, got, err, want)
-	}
-}
-
-type descSelfMarshaler struct {
-	someField int // some non-generated field
-}
-
-const descSelfMarshalerBytes = "bytes"
-
-func (m *descSelfMarshaler) Reset()        {}
-func (m *descSelfMarshaler) ProtoMessage() {}
-func (m *descSelfMarshaler) Descriptor() ([]byte, []int) {
-	return ((*legacypb.Legacy)(nil)).GetF1().Descriptor()
-}
-func (m *descSelfMarshaler) String() string {
-	return "descSelfMarshaler{}"
-}
-func (m *descSelfMarshaler) Marshal() ([]byte, error) {
-	return []byte(descSelfMarshalerBytes), nil
-}
-
-func TestSelfMarshalerWithDescriptor(t *testing.T) {
-	m := &descSelfMarshaler{}
-	got, err := proto.Marshal(impl.Export{}.MessageOf(m).Interface())
-	want := []byte(descSelfMarshalerBytes)
-	if err != nil || !bytes.Equal(got, want) {
-		t.Fatalf("proto.Marshal(%v) = %v, %v; want %v, nil", m, got, err, want)
-	}
-}
-
-func TestDecodeFastCheckInitialized(t *testing.T) {
-	for _, test := range testValidMessages {
-		if !test.checkFastInit {
-			continue
-		}
-		for _, message := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, message), func(t *testing.T) {
-				m := message.ProtoReflect().New()
-				opts := proto.UnmarshalOptions{
-					AllowPartial: true,
-				}
-				out, err := opts.UnmarshalState(protoiface.UnmarshalInput{
-					Buf:     test.wire,
-					Message: m,
-				})
-				if err != nil {
-					t.Fatalf("Unmarshal error: %v", err)
-				}
-				if got, want := (out.Flags&protoiface.UnmarshalInitialized != 0), !test.partial; got != want {
-					t.Errorf("out.Initialized = %v, want %v", got, want)
-				}
-			})
-		}
-	}
-}
-
-type selfMerger struct {
-	src protoiface.MessageV1
-}
-
-func (*selfMerger) Reset()         {}
-func (*selfMerger) ProtoMessage()  {}
-func (*selfMerger) String() string { return "selfMerger{}" }
-func (m *selfMerger) Merge(src protoiface.MessageV1) {
-	m.src = src
-}
-
-func TestLegacyMergeMethod(t *testing.T) {
-	src := &selfMerger{}
-	dst := &selfMerger{}
-	proto.Merge(
-		impl.Export{}.MessageOf(dst).Interface(),
-		impl.Export{}.MessageOf(src).Interface(),
-	)
-	if got, want := dst.src, src; got != want {
-		t.Errorf("Merge(dst, src): want dst.src = src, got %v", got)
-	}
-	if got := src.src; got != nil {
-		t.Errorf("Merge(dst, src): want src.src = nil, got %v", got)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/nil_test.go b/vendor/google.golang.org/protobuf/proto/nil_test.go
deleted file mode 100644
index 29d259d7d2e..00000000000
--- a/vendor/google.golang.org/protobuf/proto/nil_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-)
-
-// TestNil tests for boundary conditions when nil and typed-nil messages
-// are passed to various top-level functions.
-// These tests are not necessarily a statement of proper behavior,
-// but exist to detect accidental changes in behavior.
-func TestNil(t *testing.T) {
-	nilMsg := (*testpb.TestAllExtensions)(nil)
-	extType := testpb.E_OptionalBool
-	extRanger := func(protoreflect.ExtensionType, interface{}) bool { return true }
-
-	tests := []struct {
-		label string
-		test  func()
-		panic bool
-	}{{
-		label: "Size",
-		test:  func() { proto.Size(nil) },
-	}, {
-		label: "Size",
-		test:  func() { proto.Size(nilMsg) },
-	}, {
-		label: "Marshal",
-		test:  func() { proto.Marshal(nil) },
-	}, {
-		label: "Marshal",
-		test:  func() { proto.Marshal(nilMsg) },
-	}, {
-		label: "Unmarshal",
-		test:  func() { proto.Unmarshal(nil, nil) },
-		panic: true,
-	}, {
-		label: "Unmarshal",
-		test:  func() { proto.Unmarshal(nil, nilMsg) },
-		panic: true,
-	}, {
-		label: "Merge",
-		test:  func() { proto.Merge(nil, nil) },
-		panic: true,
-	}, {
-		label: "Merge",
-		test:  func() { proto.Merge(nil, nilMsg) },
-		panic: true,
-	}, {
-		label: "Merge",
-		test:  func() { proto.Merge(nilMsg, nil) },
-		panic: true,
-	}, {
-		label: "Merge",
-		test:  func() { proto.Merge(nilMsg, nilMsg) },
-		panic: true,
-	}, {
-		label: "Clone",
-		test:  func() { proto.Clone(nil) },
-	}, {
-		label: "Clone",
-		test:  func() { proto.Clone(nilMsg) },
-	}, {
-		label: "Equal",
-		test:  func() { proto.Equal(nil, nil) },
-	}, {
-		label: "Equal",
-		test:  func() { proto.Equal(nil, nilMsg) },
-	}, {
-		label: "Equal",
-		test:  func() { proto.Equal(nilMsg, nil) },
-	}, {
-		label: "Equal",
-		test:  func() { proto.Equal(nilMsg, nilMsg) },
-	}, {
-		label: "Reset",
-		test:  func() { proto.Reset(nil) },
-		panic: true,
-	}, {
-		label: "Reset",
-		test:  func() { proto.Reset(nilMsg) },
-		panic: true,
-	}, {
-		label: "HasExtension",
-		test:  func() { proto.HasExtension(nil, nil) },
-	}, {
-		label: "HasExtension",
-		test:  func() { proto.HasExtension(nil, extType) },
-	}, {
-		label: "HasExtension",
-		test:  func() { proto.HasExtension(nilMsg, nil) },
-	}, {
-		label: "HasExtension",
-		test:  func() { proto.HasExtension(nilMsg, extType) },
-	}, {
-		label: "GetExtension",
-		test:  func() { proto.GetExtension(nil, nil) },
-		panic: true,
-	}, {
-		label: "GetExtension",
-		test:  func() { proto.GetExtension(nil, extType) },
-	}, {
-		label: "GetExtension",
-		test:  func() { proto.GetExtension(nilMsg, nil) },
-		panic: true,
-	}, {
-		label: "GetExtension",
-		test:  func() { proto.GetExtension(nilMsg, extType) },
-	}, {
-		label: "SetExtension",
-		test:  func() { proto.SetExtension(nil, nil, true) },
-		panic: true,
-	}, {
-		label: "SetExtension",
-		test:  func() { proto.SetExtension(nil, extType, true) },
-		panic: true,
-	}, {
-		label: "SetExtension",
-		test:  func() { proto.SetExtension(nilMsg, nil, true) },
-		panic: true,
-	}, {
-		label: "SetExtension",
-		test:  func() { proto.SetExtension(nilMsg, extType, true) },
-		panic: true,
-	}, {
-		label: "ClearExtension",
-		test:  func() { proto.ClearExtension(nil, nil) },
-		panic: true,
-	}, {
-		label: "ClearExtension",
-		test:  func() { proto.ClearExtension(nil, extType) },
-		panic: true,
-	}, {
-		label: "ClearExtension",
-		test:  func() { proto.ClearExtension(nilMsg, nil) },
-		panic: true,
-	}, {
-		label: "ClearExtension",
-		test:  func() { proto.ClearExtension(nilMsg, extType) },
-		panic: true,
-	}, {
-		label: "RangeExtensions",
-		test:  func() { proto.RangeExtensions(nil, nil) },
-	}, {
-		label: "RangeExtensions",
-		test:  func() { proto.RangeExtensions(nil, extRanger) },
-	}, {
-		label: "RangeExtensions",
-		test:  func() { proto.RangeExtensions(nilMsg, nil) },
-	}, {
-		label: "RangeExtensions",
-		test:  func() { proto.RangeExtensions(nilMsg, extRanger) },
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.label, func(t *testing.T) {
-			defer func() {
-				switch gotPanic := recover() != nil; {
-				case gotPanic && !tt.panic:
-					t.Errorf("unexpected panic")
-				case !gotPanic && tt.panic:
-					t.Errorf("expected panic")
-				}
-			}()
-			tt.test()
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/noenforceutf8_test.go b/vendor/google.golang.org/protobuf/proto/noenforceutf8_test.go
deleted file mode 100644
index 2bd011efe1a..00000000000
--- a/vendor/google.golang.org/protobuf/proto/noenforceutf8_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"reflect"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/filedesc"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protodesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"google.golang.org/protobuf/testing/protopack"
-
-	"google.golang.org/protobuf/types/descriptorpb"
-)
-
-func init() {
-	if flags.ProtoLegacy {
-		testValidMessages = append(testValidMessages, noEnforceUTF8TestProtos...)
-	} else {
-		testInvalidMessages = append(testInvalidMessages, noEnforceUTF8TestProtos...)
-	}
-}
-
-var noEnforceUTF8TestProtos = []testProto{
-	{
-		desc: "invalid UTF-8 in optional string field",
-		decodeTo: []proto.Message{&TestNoEnforceUTF8{
-			OptionalString: string("abc\xff"),
-		}},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in optional string field of Go bytes",
-		decodeTo: []proto.Message{&TestNoEnforceUTF8{
-			OptionalBytes: []byte("abc\xff"),
-		}},
-		wire: protopack.Message{
-			protopack.Tag{2, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in repeated string field",
-		decodeTo: []proto.Message{&TestNoEnforceUTF8{
-			RepeatedString: []string{string("foo"), string("abc\xff")},
-		}},
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.BytesType}, protopack.String("foo"),
-			protopack.Tag{3, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in repeated string field of Go bytes",
-		decodeTo: []proto.Message{&TestNoEnforceUTF8{
-			RepeatedBytes: [][]byte{[]byte("foo"), []byte("abc\xff")},
-		}},
-		wire: protopack.Message{
-			protopack.Tag{4, protopack.BytesType}, protopack.String("foo"),
-			protopack.Tag{4, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in oneof string field",
-		decodeTo: []proto.Message{
-			&TestNoEnforceUTF8{OneofField: &TestNoEnforceUTF8_OneofString{string("abc\xff")}},
-		},
-		wire: protopack.Message{protopack.Tag{5, protopack.BytesType}, protopack.String("abc\xff")}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in oneof string field of Go bytes",
-		decodeTo: []proto.Message{
-			&TestNoEnforceUTF8{OneofField: &TestNoEnforceUTF8_OneofBytes{[]byte("abc\xff")}},
-		},
-		wire: protopack.Message{protopack.Tag{6, protopack.BytesType}, protopack.String("abc\xff")}.Marshal(),
-	},
-}
-
-type TestNoEnforceUTF8 struct {
-	OptionalString string       `protobuf:"bytes,1,opt,name=optional_string"`
-	OptionalBytes  []byte       `protobuf:"bytes,2,opt,name=optional_bytes"`
-	RepeatedString []string     `protobuf:"bytes,3,rep,name=repeated_string"`
-	RepeatedBytes  [][]byte     `protobuf:"bytes,4,rep,name=repeated_bytes"`
-	OneofField     isOneofField `protobuf_oneof:"oneof_field"`
-}
-
-type isOneofField interface{ isOneofField() }
-
-type TestNoEnforceUTF8_OneofString struct {
-	OneofString string `protobuf:"bytes,5,opt,name=oneof_string,oneof"`
-}
-type TestNoEnforceUTF8_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,6,opt,name=oneof_bytes,oneof"`
-}
-
-func (*TestNoEnforceUTF8_OneofString) isOneofField() {}
-func (*TestNoEnforceUTF8_OneofBytes) isOneofField()  {}
-
-func (m *TestNoEnforceUTF8) ProtoReflect() protoreflect.Message {
-	return messageInfo_TestNoEnforceUTF8.MessageOf(m)
-}
-
-var messageInfo_TestNoEnforceUTF8 = protoimpl.MessageInfo{
-	GoReflectType: reflect.TypeOf((*TestNoEnforceUTF8)(nil)),
-	Desc: func() protoreflect.MessageDescriptor {
-		pb := new(descriptorpb.FileDescriptorProto)
-		if err := prototext.Unmarshal([]byte(`
-				syntax:  "proto3"
-				name:    "test.proto"
-				message_type: [{
-					name: "TestNoEnforceUTF8"
-					field: [
-						{name:"optional_string" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-						{name:"optional_bytes"  number:2 label:LABEL_OPTIONAL type:TYPE_STRING},
-						{name:"repeated_string" number:3 label:LABEL_REPEATED type:TYPE_STRING},
-						{name:"repeated_bytes"  number:4 label:LABEL_REPEATED type:TYPE_STRING},
-						{name:"oneof_string"    number:5 label:LABEL_OPTIONAL type:TYPE_STRING, oneof_index:0},
-						{name:"oneof_bytes"     number:6 label:LABEL_OPTIONAL type:TYPE_STRING, oneof_index:0}
-					]
-					oneof_decl: [{name:"oneof_field"}]
-				}]
-			`), pb); err != nil {
-			panic(err)
-		}
-		fd, err := protodesc.NewFile(pb, nil)
-		if err != nil {
-			panic(err)
-		}
-		md := fd.Messages().Get(0)
-		for i := 0; i < md.Fields().Len(); i++ {
-			md.Fields().Get(i).(*filedesc.Field).L1.HasEnforceUTF8 = true
-			md.Fields().Get(i).(*filedesc.Field).L1.EnforceUTF8 = false
-		}
-		return md
-	}(),
-	OneofWrappers: []interface{}{
-		(*TestNoEnforceUTF8_OneofString)(nil),
-		(*TestNoEnforceUTF8_OneofBytes)(nil),
-	},
-}
diff --git a/vendor/google.golang.org/protobuf/proto/proto.go b/vendor/google.golang.org/protobuf/proto/proto.go
index 1f0d183b102..7543ee6b255 100644
--- a/vendor/google.golang.org/protobuf/proto/proto.go
+++ b/vendor/google.golang.org/protobuf/proto/proto.go
@@ -15,18 +15,20 @@ import (
 // protobuf module that accept a Message, except where otherwise specified.
 //
 // This is the v2 interface definition for protobuf messages.
-// The v1 interface definition is "github.com/golang/protobuf/proto".Message.
+// The v1 interface definition is [github.com/golang/protobuf/proto.Message].
 //
-// To convert a v1 message to a v2 message,
-// use "github.com/golang/protobuf/proto".MessageV2.
-// To convert a v2 message to a v1 message,
-// use "github.com/golang/protobuf/proto".MessageV1.
+//   - To convert a v1 message to a v2 message,
+//     use [google.golang.org/protobuf/protoadapt.MessageV2Of].
+//   - To convert a v2 message to a v1 message,
+//     use [google.golang.org/protobuf/protoadapt.MessageV1Of].
 type Message = protoreflect.ProtoMessage
 
-// Error matches all errors produced by packages in the protobuf module.
+// Error matches all errors produced by packages in the protobuf module
+// according to [errors.Is].
 //
-// That is, errors.Is(err, Error) reports whether an error is produced
-// by this module.
+// Example usage:
+//
+//	if errors.Is(err, proto.Error) { ... }
 var Error error
 
 func init() {
diff --git a/vendor/google.golang.org/protobuf/proto/reset_test.go b/vendor/google.golang.org/protobuf/proto/reset_test.go
deleted file mode 100644
index 0048b566f70..00000000000
--- a/vendor/google.golang.org/protobuf/proto/reset_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-)
-
-func TestReset(t *testing.T) {
-	m := &testpb.TestAllTypes{
-		OptionalSfixed64:       proto.Int64(5),
-		RepeatedInt32:          []int32{},
-		RepeatedFloat:          []float32{1.234, 5.678},
-		MapFixed64Fixed64:      map[uint64]uint64{5: 7},
-		MapStringString:        map[string]string{},
-		OptionalForeignMessage: &testpb.ForeignMessage{},
-		OneofField:             (*testpb.TestAllTypes_OneofUint32)(nil),
-		OneofOptional:          (*testpb.TestAllTypes_OneofOptionalUint32)(nil),
-	}
-	m.ProtoReflect().SetUnknown([]byte{})
-
-	proto.Reset(m)
-
-	if m.OptionalSfixed64 != nil {
-		t.Errorf("m.OptionalSfixed64 = %p, want nil", m.OptionalSfixed64)
-	}
-	if m.RepeatedInt32 != nil {
-		t.Errorf("m.RepeatedInt32 = %p, want nil", m.RepeatedInt32)
-	}
-	if m.RepeatedFloat != nil {
-		t.Errorf("m.RepeatedFloat = %p, want nil", m.RepeatedFloat)
-	}
-	if m.MapFixed64Fixed64 != nil {
-		t.Errorf("m.MapFixed64Fixed64 = %p, want nil", m.MapFixed64Fixed64)
-	}
-	if m.MapStringString != nil {
-		t.Errorf("m.MapStringString = %p, want nil", m.MapStringString)
-	}
-	if m.OptionalForeignMessage != nil {
-		t.Errorf("m.OptionalForeignMessage = %p, want nil", m.OptionalForeignMessage)
-	}
-	if m.OneofField != nil {
-		t.Errorf("m.OneofField = %p, want nil", m.OneofField)
-	}
-	if m.OneofOptional != nil {
-		t.Errorf("m.OneofOptional = %p, want nil", m.OneofOptional)
-	}
-
-	if got := m.ProtoReflect().GetUnknown(); got != nil {
-		t.Errorf("m.ProtoReflect().GetUnknown() = %d, want nil", got)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/testmessages_test.go b/vendor/google.golang.org/protobuf/proto/testmessages_test.go
deleted file mode 100644
index a021b3f9262..00000000000
--- a/vendor/google.golang.org/protobuf/proto/testmessages_test.go
+++ /dev/null
@@ -1,2025 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"google.golang.org/protobuf/encoding/protowire"
-	"google.golang.org/protobuf/internal/impl"
-	"google.golang.org/protobuf/internal/protobuild"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/testing/protopack"
-
-	legacypb "google.golang.org/protobuf/internal/testprotos/legacy"
-	requiredpb "google.golang.org/protobuf/internal/testprotos/required"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-type testProto struct {
-	desc             string
-	decodeTo         []proto.Message
-	wire             []byte
-	partial          bool
-	noEncode         bool
-	checkFastInit    bool
-	unmarshalOptions proto.UnmarshalOptions
-	validationStatus impl.ValidationStatus
-	nocheckValidInit bool
-}
-
-func makeMessages(in protobuild.Message, messages ...proto.Message) []proto.Message {
-	if len(messages) == 0 {
-		messages = []proto.Message{
-			&testpb.TestAllTypes{},
-			&test3pb.TestAllTypes{},
-			&testpb.TestAllExtensions{},
-		}
-	}
-	for _, m := range messages {
-		in.Build(m.ProtoReflect())
-	}
-	return messages
-}
-
-func templateMessages(messages ...proto.Message) []protoreflect.MessageType {
-	if len(messages) == 0 {
-		messages = []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*test3pb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		}
-	}
-	var out []protoreflect.MessageType
-	for _, m := range messages {
-		out = append(out, m.ProtoReflect().Type())
-	}
-	return out
-
-}
-
-var testValidMessages = []testProto{
-	{
-		desc:          "basic scalar types",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_int32":       1001,
-			"optional_int64":       1002,
-			"optional_uint32":      1003,
-			"optional_uint64":      1004,
-			"optional_sint32":      1005,
-			"optional_sint64":      1006,
-			"optional_fixed32":     1007,
-			"optional_fixed64":     1008,
-			"optional_sfixed32":    1009,
-			"optional_sfixed64":    1010,
-			"optional_float":       1011.5,
-			"optional_double":      1012.5,
-			"optional_bool":        true,
-			"optional_string":      "string",
-			"optional_bytes":       []byte("bytes"),
-			"optional_nested_enum": "BAR",
-		}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(1001),
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1002),
-			protopack.Tag{3, protopack.VarintType}, protopack.Uvarint(1003),
-			protopack.Tag{4, protopack.VarintType}, protopack.Uvarint(1004),
-			protopack.Tag{5, protopack.VarintType}, protopack.Svarint(1005),
-			protopack.Tag{6, protopack.VarintType}, protopack.Svarint(1006),
-			protopack.Tag{7, protopack.Fixed32Type}, protopack.Uint32(1007),
-			protopack.Tag{8, protopack.Fixed64Type}, protopack.Uint64(1008),
-			protopack.Tag{9, protopack.Fixed32Type}, protopack.Int32(1009),
-			protopack.Tag{10, protopack.Fixed64Type}, protopack.Int64(1010),
-			protopack.Tag{11, protopack.Fixed32Type}, protopack.Float32(1011.5),
-			protopack.Tag{12, protopack.Fixed64Type}, protopack.Float64(1012.5),
-			protopack.Tag{13, protopack.VarintType}, protopack.Bool(true),
-			protopack.Tag{14, protopack.BytesType}, protopack.String("string"),
-			protopack.Tag{15, protopack.BytesType}, protopack.Bytes([]byte("bytes")),
-			protopack.Tag{21, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_BAR)),
-		}.Marshal(),
-	},
-	{
-		desc: "zero values",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_int32":    0,
-			"optional_int64":    0,
-			"optional_uint32":   0,
-			"optional_uint64":   0,
-			"optional_sint32":   0,
-			"optional_sint64":   0,
-			"optional_fixed32":  0,
-			"optional_fixed64":  0,
-			"optional_sfixed32": 0,
-			"optional_sfixed64": 0,
-			"optional_float":    0,
-			"optional_double":   0,
-			"optional_bool":     false,
-			"optional_string":   "",
-			"optional_bytes":    []byte{},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(0),
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(0),
-			protopack.Tag{3, protopack.VarintType}, protopack.Uvarint(0),
-			protopack.Tag{4, protopack.VarintType}, protopack.Uvarint(0),
-			protopack.Tag{5, protopack.VarintType}, protopack.Svarint(0),
-			protopack.Tag{6, protopack.VarintType}, protopack.Svarint(0),
-			protopack.Tag{7, protopack.Fixed32Type}, protopack.Uint32(0),
-			protopack.Tag{8, protopack.Fixed64Type}, protopack.Uint64(0),
-			protopack.Tag{9, protopack.Fixed32Type}, protopack.Int32(0),
-			protopack.Tag{10, protopack.Fixed64Type}, protopack.Int64(0),
-			protopack.Tag{11, protopack.Fixed32Type}, protopack.Float32(0),
-			protopack.Tag{12, protopack.Fixed64Type}, protopack.Float64(0),
-			protopack.Tag{13, protopack.VarintType}, protopack.Bool(false),
-			protopack.Tag{14, protopack.BytesType}, protopack.String(""),
-			protopack.Tag{15, protopack.BytesType}, protopack.Bytes(nil),
-		}.Marshal(),
-	},
-	{
-		desc: "proto3 zero values",
-		decodeTo: makeMessages(protobuild.Message{
-			"singular_int32":    0,
-			"singular_int64":    0,
-			"singular_uint32":   0,
-			"singular_uint64":   0,
-			"singular_sint32":   0,
-			"singular_sint64":   0,
-			"singular_fixed32":  0,
-			"singular_fixed64":  0,
-			"singular_sfixed32": 0,
-			"singular_sfixed64": 0,
-			"singular_float":    0,
-			"singular_double":   0,
-			"singular_bool":     false,
-			"singular_string":   "",
-			"singular_bytes":    []byte{},
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{81, protopack.VarintType}, protopack.Varint(0),
-			protopack.Tag{82, protopack.VarintType}, protopack.Varint(0),
-			protopack.Tag{83, protopack.VarintType}, protopack.Uvarint(0),
-			protopack.Tag{84, protopack.VarintType}, protopack.Uvarint(0),
-			protopack.Tag{85, protopack.VarintType}, protopack.Svarint(0),
-			protopack.Tag{86, protopack.VarintType}, protopack.Svarint(0),
-			protopack.Tag{87, protopack.Fixed32Type}, protopack.Uint32(0),
-			protopack.Tag{88, protopack.Fixed64Type}, protopack.Uint64(0),
-			protopack.Tag{89, protopack.Fixed32Type}, protopack.Int32(0),
-			protopack.Tag{90, protopack.Fixed64Type}, protopack.Int64(0),
-			protopack.Tag{91, protopack.Fixed32Type}, protopack.Float32(0),
-			protopack.Tag{92, protopack.Fixed64Type}, protopack.Float64(0),
-			protopack.Tag{93, protopack.VarintType}, protopack.Bool(false),
-			protopack.Tag{94, protopack.BytesType}, protopack.String(""),
-			protopack.Tag{95, protopack.BytesType}, protopack.Bytes(nil),
-		}.Marshal(),
-	},
-	{
-		desc: "groups",
-		decodeTo: makeMessages(protobuild.Message{
-			"optionalgroup": protobuild.Message{
-				"a":                 1017,
-				"same_field_number": 1016,
-			},
-		}, &testpb.TestAllTypes{}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{16, protopack.StartGroupType},
-			protopack.Tag{17, protopack.VarintType}, protopack.Varint(1017),
-			protopack.Tag{16, protopack.VarintType}, protopack.Varint(1016),
-			protopack.Tag{16, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "groups (field overridden)",
-		decodeTo: makeMessages(protobuild.Message{
-			"optionalgroup": protobuild.Message{
-				"a": 2,
-			},
-		}, &testpb.TestAllTypes{}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{16, protopack.StartGroupType},
-			protopack.Tag{17, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{16, protopack.EndGroupType},
-			protopack.Tag{16, protopack.StartGroupType},
-			protopack.Tag{17, protopack.VarintType}, protopack.Varint(2),
-			protopack.Tag{16, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "messages",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_nested_message": protobuild.Message{
-				"a": 42,
-				"corecursive": protobuild.Message{
-					"optional_int32": 43,
-				},
-			},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(42),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(43),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "messages (split across multiple tags)",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_nested_message": protobuild.Message{
-				"a": 42,
-				"corecursive": protobuild.Message{
-					"optional_int32": 43,
-				},
-			},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(42),
-			}),
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(43),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "messages (field overridden)",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_nested_message": protobuild.Message{
-				"a": 2,
-			},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "basic repeated types",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_int32":       []int32{1001, 2001},
-			"repeated_int64":       []int64{1002, 2002},
-			"repeated_uint32":      []uint32{1003, 2003},
-			"repeated_uint64":      []uint64{1004, 2004},
-			"repeated_sint32":      []int32{1005, 2005},
-			"repeated_sint64":      []int64{1006, 2006},
-			"repeated_fixed32":     []uint32{1007, 2007},
-			"repeated_fixed64":     []uint64{1008, 2008},
-			"repeated_sfixed32":    []int32{1009, 2009},
-			"repeated_sfixed64":    []int64{1010, 2010},
-			"repeated_float":       []float32{1011.5, 2011.5},
-			"repeated_double":      []float64{1012.5, 2012.5},
-			"repeated_bool":        []bool{true, false},
-			"repeated_string":      []string{"foo", "bar"},
-			"repeated_bytes":       []string{"FOO", "BAR"},
-			"repeated_nested_enum": []string{"FOO", "BAR"},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{31, protopack.VarintType}, protopack.Varint(1001),
-			protopack.Tag{31, protopack.VarintType}, protopack.Varint(2001),
-			protopack.Tag{32, protopack.VarintType}, protopack.Varint(1002),
-			protopack.Tag{32, protopack.VarintType}, protopack.Varint(2002),
-			protopack.Tag{33, protopack.VarintType}, protopack.Uvarint(1003),
-			protopack.Tag{33, protopack.VarintType}, protopack.Uvarint(2003),
-			protopack.Tag{34, protopack.VarintType}, protopack.Uvarint(1004),
-			protopack.Tag{34, protopack.VarintType}, protopack.Uvarint(2004),
-			protopack.Tag{35, protopack.VarintType}, protopack.Svarint(1005),
-			protopack.Tag{35, protopack.VarintType}, protopack.Svarint(2005),
-			protopack.Tag{36, protopack.VarintType}, protopack.Svarint(1006),
-			protopack.Tag{36, protopack.VarintType}, protopack.Svarint(2006),
-			protopack.Tag{37, protopack.Fixed32Type}, protopack.Uint32(1007),
-			protopack.Tag{37, protopack.Fixed32Type}, protopack.Uint32(2007),
-			protopack.Tag{38, protopack.Fixed64Type}, protopack.Uint64(1008),
-			protopack.Tag{38, protopack.Fixed64Type}, protopack.Uint64(2008),
-			protopack.Tag{39, protopack.Fixed32Type}, protopack.Int32(1009),
-			protopack.Tag{39, protopack.Fixed32Type}, protopack.Int32(2009),
-			protopack.Tag{40, protopack.Fixed64Type}, protopack.Int64(1010),
-			protopack.Tag{40, protopack.Fixed64Type}, protopack.Int64(2010),
-			protopack.Tag{41, protopack.Fixed32Type}, protopack.Float32(1011.5),
-			protopack.Tag{41, protopack.Fixed32Type}, protopack.Float32(2011.5),
-			protopack.Tag{42, protopack.Fixed64Type}, protopack.Float64(1012.5),
-			protopack.Tag{42, protopack.Fixed64Type}, protopack.Float64(2012.5),
-			protopack.Tag{43, protopack.VarintType}, protopack.Bool(true),
-			protopack.Tag{43, protopack.VarintType}, protopack.Bool(false),
-			protopack.Tag{44, protopack.BytesType}, protopack.String("foo"),
-			protopack.Tag{44, protopack.BytesType}, protopack.String("bar"),
-			protopack.Tag{45, protopack.BytesType}, protopack.Bytes([]byte("FOO")),
-			protopack.Tag{45, protopack.BytesType}, protopack.Bytes([]byte("BAR")),
-			protopack.Tag{51, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_FOO)),
-			protopack.Tag{51, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_BAR)),
-		}.Marshal(),
-	},
-	{
-		desc: "basic repeated types (packed encoding)",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_int32":       []int32{1001, 2001},
-			"repeated_int64":       []int64{1002, 2002},
-			"repeated_uint32":      []uint32{1003, 2003},
-			"repeated_uint64":      []uint64{1004, 2004},
-			"repeated_sint32":      []int32{1005, 2005},
-			"repeated_sint64":      []int64{1006, 2006},
-			"repeated_fixed32":     []uint32{1007, 2007},
-			"repeated_fixed64":     []uint64{1008, 2008},
-			"repeated_sfixed32":    []int32{1009, 2009},
-			"repeated_sfixed64":    []int64{1010, 2010},
-			"repeated_float":       []float32{1011.5, 2011.5},
-			"repeated_double":      []float64{1012.5, 2012.5},
-			"repeated_bool":        []bool{true, false},
-			"repeated_nested_enum": []string{"FOO", "BAR"},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{31, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(1001), protopack.Varint(2001),
-			},
-			protopack.Tag{32, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(1002), protopack.Varint(2002),
-			},
-			protopack.Tag{33, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uvarint(1003), protopack.Uvarint(2003),
-			},
-			protopack.Tag{34, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uvarint(1004), protopack.Uvarint(2004),
-			},
-			protopack.Tag{35, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Svarint(1005), protopack.Svarint(2005),
-			},
-			protopack.Tag{36, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Svarint(1006), protopack.Svarint(2006),
-			},
-			protopack.Tag{37, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uint32(1007), protopack.Uint32(2007),
-			},
-			protopack.Tag{38, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uint64(1008), protopack.Uint64(2008),
-			},
-			protopack.Tag{39, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Int32(1009), protopack.Int32(2009),
-			},
-			protopack.Tag{40, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Int64(1010), protopack.Int64(2010),
-			},
-			protopack.Tag{41, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Float32(1011.5), protopack.Float32(2011.5),
-			},
-			protopack.Tag{42, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Float64(1012.5), protopack.Float64(2012.5),
-			},
-			protopack.Tag{43, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Bool(true), protopack.Bool(false),
-			},
-			protopack.Tag{51, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(int(testpb.TestAllTypes_FOO)),
-				protopack.Varint(int(testpb.TestAllTypes_BAR)),
-			},
-		}.Marshal(),
-	},
-	{
-		desc: "basic repeated types (zero-length packed encoding)",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_int32":       []int32{},
-			"repeated_int64":       []int64{},
-			"repeated_uint32":      []uint32{},
-			"repeated_uint64":      []uint64{},
-			"repeated_sint32":      []int32{},
-			"repeated_sint64":      []int64{},
-			"repeated_fixed32":     []uint32{},
-			"repeated_fixed64":     []uint64{},
-			"repeated_sfixed32":    []int32{},
-			"repeated_sfixed64":    []int64{},
-			"repeated_float":       []float32{},
-			"repeated_double":      []float64{},
-			"repeated_bool":        []bool{},
-			"repeated_nested_enum": []string{},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{31, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{32, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{33, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{34, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{35, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{36, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{37, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{38, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{39, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{40, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{41, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{42, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{43, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{51, protopack.BytesType}, protopack.LengthPrefix{},
-		}.Marshal(),
-	},
-	{
-		desc: "packed repeated types",
-		decodeTo: makeMessages(protobuild.Message{
-			"packed_int32":    []int32{1001, 2001},
-			"packed_int64":    []int64{1002, 2002},
-			"packed_uint32":   []uint32{1003, 2003},
-			"packed_uint64":   []uint64{1004, 2004},
-			"packed_sint32":   []int32{1005, 2005},
-			"packed_sint64":   []int64{1006, 2006},
-			"packed_fixed32":  []uint32{1007, 2007},
-			"packed_fixed64":  []uint64{1008, 2008},
-			"packed_sfixed32": []int32{1009, 2009},
-			"packed_sfixed64": []int64{1010, 2010},
-			"packed_float":    []float32{1011.5, 2011.5},
-			"packed_double":   []float64{1012.5, 2012.5},
-			"packed_bool":     []bool{true, false},
-			"packed_enum":     []string{"FOREIGN_FOO", "FOREIGN_BAR"},
-		}, &testpb.TestPackedTypes{}, &testpb.TestPackedExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{90, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(1001), protopack.Varint(2001),
-			},
-			protopack.Tag{91, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(1002), protopack.Varint(2002),
-			},
-			protopack.Tag{92, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uvarint(1003), protopack.Uvarint(2003),
-			},
-			protopack.Tag{93, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uvarint(1004), protopack.Uvarint(2004),
-			},
-			protopack.Tag{94, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Svarint(1005), protopack.Svarint(2005),
-			},
-			protopack.Tag{95, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Svarint(1006), protopack.Svarint(2006),
-			},
-			protopack.Tag{96, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uint32(1007), protopack.Uint32(2007),
-			},
-			protopack.Tag{97, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Uint64(1008), protopack.Uint64(2008),
-			},
-			protopack.Tag{98, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Int32(1009), protopack.Int32(2009),
-			},
-			protopack.Tag{99, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Int64(1010), protopack.Int64(2010),
-			},
-			protopack.Tag{100, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Float32(1011.5), protopack.Float32(2011.5),
-			},
-			protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Float64(1012.5), protopack.Float64(2012.5),
-			},
-			protopack.Tag{102, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Bool(true), protopack.Bool(false),
-			},
-			protopack.Tag{103, protopack.BytesType}, protopack.LengthPrefix{
-				protopack.Varint(int(testpb.ForeignEnum_FOREIGN_FOO)),
-				protopack.Varint(int(testpb.ForeignEnum_FOREIGN_BAR)),
-			},
-		}.Marshal(),
-	},
-	{
-		desc: "packed repeated types (zero length)",
-		decodeTo: makeMessages(protobuild.Message{
-			"packed_int32":    []int32{},
-			"packed_int64":    []int64{},
-			"packed_uint32":   []uint32{},
-			"packed_uint64":   []uint64{},
-			"packed_sint32":   []int32{},
-			"packed_sint64":   []int64{},
-			"packed_fixed32":  []uint32{},
-			"packed_fixed64":  []uint64{},
-			"packed_sfixed32": []int32{},
-			"packed_sfixed64": []int64{},
-			"packed_float":    []float32{},
-			"packed_double":   []float64{},
-			"packed_bool":     []bool{},
-			"packed_enum":     []string{},
-		}, &testpb.TestPackedTypes{}, &testpb.TestPackedExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{90, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{91, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{92, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{93, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{94, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{95, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{96, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{97, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{98, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{99, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{100, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{102, protopack.BytesType}, protopack.LengthPrefix{},
-			protopack.Tag{103, protopack.BytesType}, protopack.LengthPrefix{},
-		}.Marshal(),
-	},
-	{
-		desc: "repeated messages",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_nested_message": []protobuild.Message{
-				{"a": 1},
-				{},
-				{"a": 2},
-			},
-		}),
-		wire: protopack.Message{
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "repeated nil messages",
-		decodeTo: []proto.Message{&testpb.TestAllTypes{
-			RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{
-				{A: proto.Int32(1)},
-				nil,
-				{A: proto.Int32(2)},
-			},
-		}, &test3pb.TestAllTypes{
-			RepeatedNestedMessage: []*test3pb.TestAllTypes_NestedMessage{
-				{A: 1},
-				nil,
-				{A: 2},
-			},
-		}, build(
-			&testpb.TestAllExtensions{},
-			extend(testpb.E_RepeatedNestedMessage, []*testpb.TestAllExtensions_NestedMessage{
-				{A: proto.Int32(1)},
-				nil,
-				{A: proto.Int32(2)},
-			}),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "repeated groups",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeatedgroup": []protobuild.Message{
-				{"a": 1017},
-				{},
-				{"a": 2017},
-			},
-		}, &testpb.TestAllTypes{}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{47, protopack.VarintType}, protopack.Varint(1017),
-			protopack.Tag{46, protopack.EndGroupType},
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{46, protopack.EndGroupType},
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{47, protopack.VarintType}, protopack.Varint(2017),
-			protopack.Tag{46, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "repeated nil groups",
-		decodeTo: []proto.Message{&testpb.TestAllTypes{
-			Repeatedgroup: []*testpb.TestAllTypes_RepeatedGroup{
-				{A: proto.Int32(1017)},
-				nil,
-				{A: proto.Int32(2017)},
-			},
-		}, build(
-			&testpb.TestAllExtensions{},
-			extend(testpb.E_Repeatedgroup, []*testpb.RepeatedGroup{
-				{A: proto.Int32(1017)},
-				nil,
-				{A: proto.Int32(2017)},
-			}),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{47, protopack.VarintType}, protopack.Varint(1017),
-			protopack.Tag{46, protopack.EndGroupType},
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{46, protopack.EndGroupType},
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{47, protopack.VarintType}, protopack.Varint(2017),
-			protopack.Tag{46, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "maps",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_int32_int32":       map[int32]int32{1056: 1156, 2056: 2156},
-			"map_int64_int64":       map[int64]int64{1057: 1157, 2057: 2157},
-			"map_uint32_uint32":     map[uint32]uint32{1058: 1158, 2058: 2158},
-			"map_uint64_uint64":     map[uint64]uint64{1059: 1159, 2059: 2159},
-			"map_sint32_sint32":     map[int32]int32{1060: 1160, 2060: 2160},
-			"map_sint64_sint64":     map[int64]int64{1061: 1161, 2061: 2161},
-			"map_fixed32_fixed32":   map[uint32]uint32{1062: 1162, 2062: 2162},
-			"map_fixed64_fixed64":   map[uint64]uint64{1063: 1163, 2063: 2163},
-			"map_sfixed32_sfixed32": map[int32]int32{1064: 1164, 2064: 2164},
-			"map_sfixed64_sfixed64": map[int64]int64{1065: 1165, 2065: 2165},
-			"map_int32_float":       map[int32]float32{1066: 1166.5, 2066: 2166.5},
-			"map_int32_double":      map[int32]float64{1067: 1167.5, 2067: 2167.5},
-			"map_bool_bool":         map[bool]bool{true: false, false: true},
-			"map_string_string":     map[string]string{"69.1.key": "69.1.val", "69.2.key": "69.2.val"},
-			"map_string_bytes":      map[string][]byte{"70.1.key": []byte("70.1.val"), "70.2.key": []byte("70.2.val")},
-			"map_string_nested_message": map[string]protobuild.Message{
-				"71.1.key": {"a": 1171},
-				"71.2.key": {"a": 2171},
-			},
-			"map_string_nested_enum": map[string]string{"73.1.key": "FOO", "73.2.key": "BAR"},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1056),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1156),
-			}),
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2056),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(2156),
-			}),
-			protopack.Tag{57, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1057),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1157),
-			}),
-			protopack.Tag{57, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2057),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(2157),
-			}),
-			protopack.Tag{58, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1058),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1158),
-			}),
-			protopack.Tag{58, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2058),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(2158),
-			}),
-			protopack.Tag{59, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1059),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1159),
-			}),
-			protopack.Tag{59, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2059),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(2159),
-			}),
-			protopack.Tag{60, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Svarint(1060),
-				protopack.Tag{2, protopack.VarintType}, protopack.Svarint(1160),
-			}),
-			protopack.Tag{60, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Svarint(2060),
-				protopack.Tag{2, protopack.VarintType}, protopack.Svarint(2160),
-			}),
-			protopack.Tag{61, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Svarint(1061),
-				protopack.Tag{2, protopack.VarintType}, protopack.Svarint(1161),
-			}),
-			protopack.Tag{61, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Svarint(2061),
-				protopack.Tag{2, protopack.VarintType}, protopack.Svarint(2161),
-			}),
-			protopack.Tag{62, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(1062),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Int32(1162),
-			}),
-			protopack.Tag{62, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(2062),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Int32(2162),
-			}),
-			protopack.Tag{63, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed64Type}, protopack.Int64(1063),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Int64(1163),
-			}),
-			protopack.Tag{63, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed64Type}, protopack.Int64(2063),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Int64(2163),
-			}),
-			protopack.Tag{64, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(1064),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Int32(1164),
-			}),
-			protopack.Tag{64, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(2064),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Int32(2164),
-			}),
-			protopack.Tag{65, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed64Type}, protopack.Int64(1065),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Int64(1165),
-			}),
-			protopack.Tag{65, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.Fixed64Type}, protopack.Int64(2065),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Int64(2165),
-			}),
-			protopack.Tag{66, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1066),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Float32(1166.5),
-			}),
-			protopack.Tag{66, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2066),
-				protopack.Tag{2, protopack.Fixed32Type}, protopack.Float32(2166.5),
-			}),
-			protopack.Tag{67, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1067),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Float64(1167.5),
-			}),
-			protopack.Tag{67, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2067),
-				protopack.Tag{2, protopack.Fixed64Type}, protopack.Float64(2167.5),
-			}),
-			protopack.Tag{68, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Bool(true),
-				protopack.Tag{2, protopack.VarintType}, protopack.Bool(false),
-			}),
-			protopack.Tag{68, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Bool(false),
-				protopack.Tag{2, protopack.VarintType}, protopack.Bool(true),
-			}),
-			protopack.Tag{69, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("69.1.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("69.1.val"),
-			}),
-			protopack.Tag{69, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("69.2.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("69.2.val"),
-			}),
-			protopack.Tag{70, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("70.1.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("70.1.val"),
-			}),
-			protopack.Tag{70, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("70.2.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("70.2.val"),
-			}),
-			protopack.Tag{71, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("71.1.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1171),
-				}),
-			}),
-			protopack.Tag{71, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("71.2.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(2171),
-				}),
-			}),
-			protopack.Tag{73, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("73.1.key"),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_FOO)),
-			}),
-			protopack.Tag{73, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("73.2.key"),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_BAR)),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "map with value before key",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_int32_int32": map[int32]int32{1056: 1156},
-			"map_string_nested_message": map[string]protobuild.Message{
-				"71.1.key": {"a": 1171},
-			},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1156),
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1056),
-			}),
-			protopack.Tag{71, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1171),
-				}),
-				protopack.Tag{1, protopack.BytesType}, protopack.String("71.1.key"),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "map with repeated key and value",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_int32_int32": map[int32]int32{1056: 1156},
-			"map_string_nested_message": map[string]protobuild.Message{
-				"71.1.key": {"a": 1171},
-			},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1056),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1156),
-			}),
-			protopack.Tag{71, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String(""),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-				protopack.Tag{1, protopack.BytesType}, protopack.String("71.1.key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1171),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "oneof (uint32)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_uint32": 1111,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{111, protopack.VarintType}, protopack.Varint(1111)}.Marshal(),
-	},
-	{
-		desc: "oneof (message)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_nested_message": protobuild.Message{
-				"a": 1112,
-			},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{112, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-			protopack.Message{protopack.Tag{1, protopack.VarintType}, protopack.Varint(1112)},
-		})}.Marshal(),
-	},
-	{
-		desc: "oneof (empty message)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_nested_message": protobuild.Message{},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{112, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{})}.Marshal(),
-	},
-	{
-		desc: "oneof (merged message)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_nested_message": protobuild.Message{
-				"a": 1,
-				"corecursive": protobuild.Message{
-					"optional_int32": 43,
-				},
-			},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{112, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Message{protopack.Tag{1, protopack.VarintType}, protopack.Varint(1)},
-			}),
-			protopack.Tag{112, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(43),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "oneof (group)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneofgroup": protobuild.Message{
-				"a": 1,
-			},
-		}, &testpb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{121, protopack.StartGroupType},
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{121, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "oneof (empty group)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneofgroup": protobuild.Message{},
-		}, &testpb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{121, protopack.StartGroupType},
-			protopack.Tag{121, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "oneof (merged group)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneofgroup": protobuild.Message{
-				"a": 1,
-				"b": 2,
-			},
-		}, &testpb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{121, protopack.StartGroupType},
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{121, protopack.EndGroupType},
-			protopack.Tag{121, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(2),
-			protopack.Tag{121, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "oneof (string)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_string": "1113",
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{113, protopack.BytesType}, protopack.String("1113")}.Marshal(),
-	},
-	{
-		desc: "oneof (bytes)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_bytes": "1114",
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{114, protopack.BytesType}, protopack.String("1114")}.Marshal(),
-	},
-	{
-		desc: "oneof (bool)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_bool": true,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{115, protopack.VarintType}, protopack.Bool(true)}.Marshal(),
-	},
-	{
-		desc: "oneof (uint64)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_uint64": 116,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{116, protopack.VarintType}, protopack.Varint(116)}.Marshal(),
-	},
-	{
-		desc: "oneof (float)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_float": 117.5,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{117, protopack.Fixed32Type}, protopack.Float32(117.5)}.Marshal(),
-	},
-	{
-		desc: "oneof (double)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_double": 118.5,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{118, protopack.Fixed64Type}, protopack.Float64(118.5)}.Marshal(),
-	},
-	{
-		desc: "oneof (enum)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_enum": "BAR",
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{119, protopack.VarintType}, protopack.Varint(int(testpb.TestAllTypes_BAR))}.Marshal(),
-	},
-	{
-		desc: "oneof (zero)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_uint64": 0,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{116, protopack.VarintType}, protopack.Varint(0)}.Marshal(),
-	},
-	{
-		desc: "oneof (overridden value)",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_uint64": 2,
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{111, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{116, protopack.VarintType}, protopack.Varint(2),
-		}.Marshal(),
-	},
-	// TODO: More unknown field tests for ordering, repeated fields, etc.
-	//
-	// It is currently impossible to produce results that the v1 Equal
-	// considers equivalent to those of the v1 decoder. Figure out if
-	// that's a problem or not.
-	{
-		desc:          "unknown fields",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			protobuild.Unknown: protopack.Message{
-				protopack.Tag{100000, protopack.VarintType}, protopack.Varint(1),
-			}.Marshal(),
-		}),
-		wire: protopack.Message{
-			protopack.Tag{100000, protopack.VarintType}, protopack.Varint(1),
-		}.Marshal(),
-	},
-	{
-		desc: "discarded unknown fields",
-		unmarshalOptions: proto.UnmarshalOptions{
-			DiscardUnknown: true,
-		},
-		decodeTo: makeMessages(protobuild.Message{}),
-		wire: protopack.Message{
-			protopack.Tag{100000, protopack.VarintType}, protopack.Varint(1),
-		}.Marshal(),
-	},
-	{
-		desc: "field type mismatch",
-		decodeTo: makeMessages(protobuild.Message{
-			protobuild.Unknown: protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("string"),
-			}.Marshal(),
-		}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.String("string"),
-		}.Marshal(),
-	},
-	{
-		desc: "map field element mismatch",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_int32_int32": map[int32]int32{1: 0},
-		}, &testpb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("string"),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in nil message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      []proto.Message{(*testpb.TestRequired)(nil)},
-	},
-	{
-		desc:          "required int32 unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Int32{}),
-	},
-	{
-		desc:          "required int32 set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"v": 1,
-		}, &requiredpb.Int32{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-		}.Marshal(),
-	},
-	{
-		desc:          "required fixed32 unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Fixed32{}),
-	},
-	{
-		desc:          "required fixed32 set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"v": 1,
-		}, &requiredpb.Fixed32{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(1),
-		}.Marshal(),
-	},
-	{
-		desc:          "required fixed64 unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Fixed64{}),
-	},
-	{
-		desc:          "required fixed64 set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"v": 1,
-		}, &requiredpb.Fixed64{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.Fixed64Type}, protopack.Int64(1),
-		}.Marshal(),
-	},
-	{
-		desc:          "required bytes unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Bytes{}),
-	},
-	{
-		desc:          "required bytes set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"v": "",
-		}, &requiredpb.Bytes{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.Bytes(nil),
-		}.Marshal(),
-	},
-	{
-		desc:          "required message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Message{}),
-	},
-	{
-		desc:          "required message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"v": protobuild.Message{},
-		}, &requiredpb.Message{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required group unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo:      makeMessages(protobuild.Message{}, &requiredpb.Group{}),
-	},
-	{
-		desc:          "required group set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"group": protobuild.Message{},
-		}, &requiredpb.Group{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc:          "required field with incompatible wire type",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: []proto.Message{build(
-			&testpb.TestRequired{},
-			unknown(protopack.Message{
-				protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(2),
-			}.Marshal()),
-		)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.Fixed32Type}, protopack.Int32(2),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in optional message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_message": protobuild.Message{},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in optional message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_message": protobuild.Message{
-				"required_field": 1,
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:             "required field in optional message set (split across multiple tags)",
-		checkFastInit:    false, // fast init checks don't handle split messages
-		nocheckValidInit: true,  // validation doesn't either
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_message": protobuild.Message{
-				"required_field": 1,
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_message": []protobuild.Message{
-				{"required_field": 1},
-				{},
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_message": []protobuild.Message{
-				{"required_field": 1},
-				{"required_field": 2},
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in map message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"map_message": map[int32]protobuild.Message{
-				1: {"required_field": 1},
-				2: {},
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				}),
-			}),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in absent map message value",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"map_message": map[int32]protobuild.Message{
-				2: {},
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in map message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"map_message": map[int32]protobuild.Message{
-				1: {"required_field": 1},
-				2: {"required_field": 2},
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-				}),
-			}),
-			protopack.Tag{3, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in optional group unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"optionalgroup": protobuild.Message{},
-		}, &testpb.TestRequiredGroupFields{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in optional group set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"optionalgroup": protobuild.Message{
-				"a": 1,
-			},
-		}, &testpb.TestRequiredGroupFields{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.StartGroupType},
-			protopack.Tag{2, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{1, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated group unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"repeatedgroup": []protobuild.Message{
-				{"a": 1},
-				{},
-			},
-		}, &testpb.TestRequiredGroupFields{}),
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.StartGroupType},
-			protopack.Tag{4, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{3, protopack.EndGroupType},
-			protopack.Tag{3, protopack.StartGroupType},
-			protopack.Tag{3, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated group set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"repeatedgroup": []protobuild.Message{
-				{"a": 1},
-				{"a": 2},
-			},
-		}, &testpb.TestRequiredGroupFields{}),
-		wire: protopack.Message{
-			protopack.Tag{3, protopack.StartGroupType},
-			protopack.Tag{4, protopack.VarintType}, protopack.Varint(1),
-			protopack.Tag{3, protopack.EndGroupType},
-			protopack.Tag{3, protopack.StartGroupType},
-			protopack.Tag{4, protopack.VarintType}, protopack.Varint(2),
-			protopack.Tag{3, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in oneof message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_message": protobuild.Message{},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{protopack.Tag{4, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{})}.Marshal(),
-	},
-	{
-		desc:          "required field in oneof message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_message": protobuild.Message{
-				"required_field": 1,
-			},
-		}, &testpb.TestRequiredForeign{}),
-		wire: protopack.Message{protopack.Tag{4, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-			protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-		})}.Marshal(),
-	},
-	{
-		desc:          "required field in extension message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"single": protobuild.Message{},
-		}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{1000, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in extension message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"single": protobuild.Message{
-				"required_field": 1,
-			},
-		}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{1000, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated extension message unset",
-		checkFastInit: true,
-		partial:       true,
-		decodeTo: makeMessages(protobuild.Message{
-			"multi": []protobuild.Message{
-				{"required_field": 1},
-				{},
-			},
-		}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{1001, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{1001, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{}),
-		}.Marshal(),
-	},
-	{
-		desc:          "required field in repeated extension message set",
-		checkFastInit: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"multi": []protobuild.Message{
-				{"required_field": 1},
-				{"required_field": 2},
-			},
-		}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{1001, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-			}),
-			protopack.Tag{1001, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "nil messages",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*test3pb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-	},
-	{
-		desc:    "legacy",
-		partial: true,
-		decodeTo: makeMessages(protobuild.Message{
-			"f1": protobuild.Message{
-				"optional_int32":      1,
-				"optional_child_enum": "ALPHA",
-				"optional_child_message": protobuild.Message{
-					"f1": "x",
-				},
-				"optionalgroup": protobuild.Message{
-					"f1": "x",
-				},
-				"repeated_child_message": []protobuild.Message{
-					{"f1": "x"},
-				},
-				"repeatedgroup": []protobuild.Message{
-					{"f1": "x"},
-				},
-				"map_bool_child_message": map[bool]protobuild.Message{
-					true: {"f1": "x"},
-				},
-				"oneof_child_message": protobuild.Message{
-					"f1": "x",
-				},
-			},
-		}, &legacypb.Legacy{}),
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{101, protopack.VarintType}, protopack.Varint(1),
-				protopack.Tag{115, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{116, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-				}),
-				protopack.Tag{120, protopack.StartGroupType},
-				protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-				protopack.Tag{120, protopack.EndGroupType},
-				protopack.Tag{516, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-				}),
-				protopack.Tag{520, protopack.StartGroupType},
-				protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-				protopack.Tag{520, protopack.EndGroupType},
-				protopack.Tag{616, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.VarintType}, protopack.Varint(1),
-					protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-						protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-					}),
-				}),
-				protopack.Tag{716, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{1, protopack.BytesType}, protopack.String("x"),
-				}),
-			}),
-		}.Marshal(),
-		validationStatus: impl.ValidationUnknown,
-	},
-	{
-		desc: "first reserved field number",
-		decodeTo: makeMessages(protobuild.Message{
-			protobuild.Unknown: protopack.Message{
-				protopack.Tag{protopack.FirstReservedNumber, protopack.VarintType}, protopack.Varint(1004),
-			}.Marshal(),
-		}),
-		wire: protopack.Message{
-			protopack.Tag{protopack.FirstReservedNumber, protopack.VarintType}, protopack.Varint(1004),
-		}.Marshal(),
-	},
-	{
-		desc: "last reserved field number",
-		decodeTo: makeMessages(protobuild.Message{
-			protobuild.Unknown: protopack.Message{
-				protopack.Tag{protopack.LastReservedNumber, protopack.VarintType}, protopack.Varint(1005),
-			}.Marshal(),
-		}),
-		wire: protopack.Message{
-			protopack.Tag{protopack.LastReservedNumber, protopack.VarintType}, protopack.Varint(1005),
-		}.Marshal(),
-	},
-	{
-		desc: "nested unknown extension",
-		unmarshalOptions: proto.UnmarshalOptions{
-			DiscardUnknown: true,
-			Resolver: filterResolver{
-				filter: func(name protoreflect.FullName) bool {
-					switch name.Name() {
-					case "optional_nested_message",
-						"optional_int32":
-						return true
-					}
-					return false
-				},
-				resolver: protoregistry.GlobalTypes,
-			},
-		},
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_nested_message": protobuild.Message{
-				"corecursive": protobuild.Message{
-					"optional_nested_message": protobuild.Message{
-						"corecursive": protobuild.Message{
-							"optional_int32": 42,
-						},
-					},
-				},
-			},
-		}, &testpb.TestAllExtensions{}),
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-						protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-							protopack.Tag{1, protopack.VarintType}, protopack.Varint(42),
-							protopack.Tag{2, protopack.VarintType}, protopack.Varint(43),
-						}),
-					}),
-				}),
-			}),
-		}.Marshal(),
-	},
-}
-
-var testInvalidMessages = []testProto{
-	{
-		desc: "invalid UTF-8 in optional string field",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_string": "abc\xff",
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{14, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in singular string field",
-		decodeTo: makeMessages(protobuild.Message{
-			"singular_string": "abc\xff",
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{94, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in repeated string field",
-		decodeTo: makeMessages(protobuild.Message{
-			"repeated_string": []string{"foo", "abc\xff"},
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{44, protopack.BytesType}, protopack.String("foo"),
-			protopack.Tag{44, protopack.BytesType}, protopack.String("abc\xff"),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in nested message",
-		decodeTo: makeMessages(protobuild.Message{
-			"optional_nested_message": protobuild.Message{
-				"corecursive": protobuild.Message{
-					"singular_string": "abc\xff",
-				},
-			},
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Tag{94, protopack.BytesType}, protopack.String("abc\xff"),
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in oneof field",
-		decodeTo: makeMessages(protobuild.Message{
-			"oneof_string": "abc\xff",
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{protopack.Tag{113, protopack.BytesType}, protopack.String("abc\xff")}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in map key",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_string_string": map[string]string{"key\xff": "val"},
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{69, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("key\xff"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("val"),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid UTF-8 in map value",
-		decodeTo: makeMessages(protobuild.Message{
-			"map_string_string": map[string]string{"key": "val\xff"},
-		}, &test3pb.TestAllTypes{}),
-		wire: protopack.Message{
-			protopack.Tag{69, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.BytesType}, protopack.String("key"),
-				protopack.Tag{2, protopack.BytesType}, protopack.String("val\xff"),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid field number zero",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{protopack.MinValidNumber - 1, protopack.VarintType}, protopack.Varint(1001),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid field numbers zero and one",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{protopack.MinValidNumber - 1, protopack.VarintType}, protopack.Varint(1002),
-			protopack.Tag{protopack.MinValidNumber, protopack.VarintType}, protopack.Varint(1003),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid field numbers max and max+1",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{protopack.MaxValidNumber, protopack.VarintType}, protopack.Varint(1006),
-			protopack.Tag{protopack.MaxValidNumber + 1, protopack.VarintType}, protopack.Varint(1007),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid field number max+1",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{protopack.MaxValidNumber + 1, protopack.VarintType}, protopack.Varint(1008),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid field number wraps int32",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Varint(2234993595104), protopack.Varint(0),
-		}.Marshal(),
-	},
-	{
-		desc:     "invalid field number in map",
-		decodeTo: []proto.Message{(*testpb.TestAllTypes)(nil)},
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1056),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(1156),
-				protopack.Tag{protopack.MaxValidNumber + 1, protopack.VarintType}, protopack.Varint(0),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid tag varint",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: []byte{0xff},
-	},
-	{
-		desc: "field number too small",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{0, protopack.VarintType}, protopack.Varint(0),
-		}.Marshal(),
-	},
-	{
-		desc: "field number too large",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{protowire.MaxValidNumber + 1, protopack.VarintType}, protopack.Varint(0),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid tag varint in message field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Raw{0xff},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid tag varint in repeated message field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{48, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Raw{0xff},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid varint in group field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{16, protopack.StartGroupType},
-			protopack.Tag{1000, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Raw{0xff},
-			}),
-			protopack.Tag{16, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid varint in repeated group field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{46, protopack.StartGroupType},
-			protopack.Tag{1001, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Raw{0xff},
-			}),
-			protopack.Tag{46, protopack.EndGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "unterminated repeated group field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{46, protopack.StartGroupType},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid tag varint in map item",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{56, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{2, protopack.VarintType}, protopack.Varint(0),
-				protopack.Raw{0xff},
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid tag varint in map message value",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{71, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(0),
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-					protopack.Raw{0xff},
-				}),
-			}),
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed int32 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{31, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed int64 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{32, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed uint32 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{33, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed uint64 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{34, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed sint32 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{35, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed sint64 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{36, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed fixed32 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{37, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed fixed64 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{38, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed sfixed32 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{39, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed sfixed64 field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{40, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed float field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{41, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed double field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{42, protopack.BytesType}, protopack.Bytes{0x00},
-		}.Marshal(),
-	},
-	{
-		desc: "invalid packed bool field",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{43, protopack.BytesType}, protopack.Bytes{0xff},
-		}.Marshal(),
-	},
-	{
-		desc: "bytes field overruns message",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType}, protopack.LengthPrefix{protopack.Message{
-				protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix{protopack.Message{
-					protopack.Tag{15, protopack.BytesType}, protopack.Varint(2),
-				}},
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(0),
-			}},
-		}.Marshal(),
-	},
-	{
-		desc: "varint field overruns message",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType},
-		}.Marshal(),
-	},
-	{
-		desc: "bytes field lacks size",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{18, protopack.BytesType},
-		}.Marshal(),
-	},
-	{
-		desc: "varint overflow",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType},
-			protopack.Raw("\xff\xff\xff\xff\xff\xff\xff\xff\xff\x02"),
-		}.Marshal(),
-	},
-	{
-		desc: "varint length overrun",
-		decodeTo: []proto.Message{
-			(*testpb.TestAllTypes)(nil),
-			(*testpb.TestAllExtensions)(nil),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.VarintType},
-			protopack.Raw("\xff\xff\xff\xff\xff\xff\xff\xff\xff"),
-		}.Marshal(),
-	},
-}
-
-type filterResolver struct {
-	filter   func(name protoreflect.FullName) bool
-	resolver protoregistry.ExtensionTypeResolver
-}
-
-func (f filterResolver) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
-	if !f.filter(field) {
-		return nil, protoregistry.NotFound
-	}
-	return f.resolver.FindExtensionByName(field)
-}
-
-func (f filterResolver) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
-	xt, err := f.resolver.FindExtensionByNumber(message, field)
-	if err != nil {
-		return nil, err
-	}
-	if !f.filter(xt.TypeDescriptor().FullName()) {
-		return nil, protoregistry.NotFound
-	}
-	return xt, nil
-}
diff --git a/vendor/google.golang.org/protobuf/proto/validate_test.go b/vendor/google.golang.org/protobuf/proto/validate_test.go
deleted file mode 100644
index e8069983d35..00000000000
--- a/vendor/google.golang.org/protobuf/proto/validate_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"fmt"
-	"testing"
-
-	"google.golang.org/protobuf/internal/impl"
-	piface "google.golang.org/protobuf/runtime/protoiface"
-)
-
-// TestValidate tests the internal message validator.
-//
-// Despite being more properly associated with the internal/impl package,
-// it is located here to take advantage of the test wire encoder/decoder inputs.
-
-func TestValidateValid(t *testing.T) {
-	for _, test := range testValidMessages {
-		for _, m := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
-				mt := m.ProtoReflect().Type()
-				want := impl.ValidationValid
-				if test.validationStatus != 0 {
-					want = test.validationStatus
-				}
-				out, status := impl.Validate(mt, piface.UnmarshalInput{
-					Buf: test.wire,
-				})
-				if status != want {
-					t.Errorf("Validate(%x) = %v, want %v", test.wire, status, want)
-				}
-				if got, want := (out.Flags&piface.UnmarshalInitialized != 0), !test.partial; got != want && !test.nocheckValidInit && status == impl.ValidationValid {
-					t.Errorf("Validate(%x): initialized = %v, want %v", test.wire, got, want)
-				}
-			})
-		}
-	}
-}
-
-func TestValidateInvalid(t *testing.T) {
-	for _, test := range testInvalidMessages {
-		for _, m := range test.decodeTo {
-			t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
-				mt := m.ProtoReflect().Type()
-				_, got := impl.Validate(mt, piface.UnmarshalInput{
-					Buf: test.wire,
-				})
-				want := impl.ValidationInvalid
-				if got != want {
-					t.Errorf("Validate(%x) = %v, want %v", test.wire, got, want)
-				}
-			})
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/weak_test.go b/vendor/google.golang.org/protobuf/proto/weak_test.go
deleted file mode 100644
index 79340e395cf..00000000000
--- a/vendor/google.golang.org/protobuf/proto/weak_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proto_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/internal/protobuild"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protopack"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	weakpb "google.golang.org/protobuf/internal/testprotos/test/weak1"
-)
-
-func init() {
-	if flags.ProtoLegacy {
-		testValidMessages = append(testValidMessages, testWeakValidMessages...)
-		testInvalidMessages = append(testInvalidMessages, testWeakInvalidMessages...)
-		testMerges = append(testMerges, testWeakMerges...)
-	}
-}
-
-var testWeakValidMessages = []testProto{
-	{
-		desc: "weak message",
-		decodeTo: []proto.Message{
-			func() proto.Message {
-				if !flags.ProtoLegacy {
-					return nil
-				}
-				m := &testpb.TestWeak{}
-				m.SetWeakMessage1(&weakpb.WeakImportMessage1{
-					A: proto.Int32(1000),
-				})
-				m.ProtoReflect().SetUnknown(protopack.Message{
-					protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-						protopack.Tag{1, protopack.VarintType}, protopack.Varint(2000),
-					}),
-				}.Marshal())
-				return m
-			}(),
-		},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(1000),
-			}),
-			protopack.Tag{2, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{1, protopack.VarintType}, protopack.Varint(2000),
-			}),
-		}.Marshal(),
-	},
-}
-
-var testWeakInvalidMessages = []testProto{
-	{
-		desc:     "invalid field number 0 in weak message",
-		decodeTo: []proto.Message{(*testpb.TestWeak)(nil)},
-		wire: protopack.Message{
-			protopack.Tag{1, protopack.BytesType}, protopack.LengthPrefix(protopack.Message{
-				protopack.Tag{0, protopack.VarintType}, protopack.Varint(1000),
-			}),
-		}.Marshal(),
-	},
-}
-
-var testWeakMerges = []testMerge{
-	{
-		desc: "clone weak message",
-		src: protobuild.Message{
-			"weak_message1": protobuild.Message{
-				"a": 1,
-			},
-		},
-		types: []proto.Message{&testpb.TestWeak{}},
-	}, {
-		desc: "merge weak message",
-		dst: protobuild.Message{
-			"weak_message1": protobuild.Message{
-				"a": 1,
-			},
-		},
-		src: protobuild.Message{
-			"weak_message1": protobuild.Message{
-				"a": 2,
-			},
-		},
-		want: protobuild.Message{
-			"weak_message1": protobuild.Message{
-				"a": 2,
-			},
-		},
-		types: []proto.Message{&testpb.TestWeak{}},
-	},
-}
-
-func TestWeakNil(t *testing.T) {
-	if !flags.ProtoLegacy {
-		t.SkipNow()
-	}
-
-	m := new(testpb.TestWeak)
-	if v, ok := m.GetWeakMessage1().(*weakpb.WeakImportMessage1); !ok || v != nil {
-		t.Errorf("m.GetWeakMessage1() = type %[1]T(%[1]v), want (*weakpb.WeakImportMessage1)", v)
-	}
-}
-
-func TestWeakMarshalNil(t *testing.T) {
-	if !flags.ProtoLegacy {
-		t.SkipNow()
-	}
-
-	m := new(testpb.TestWeak)
-	m.SetWeakMessage1(nil)
-	if b, err := proto.Marshal(m); err != nil || len(b) != 0 {
-		t.Errorf("Marshal(weak field set to nil) = [%x], %v; want [], nil", b, err)
-	}
-	m.SetWeakMessage1((*weakpb.WeakImportMessage1)(nil))
-	if b, err := proto.Marshal(m); err != nil || len(b) != 0 {
-		t.Errorf("Marshal(weak field set to typed nil) = [%x], %v; want [], nil", b, err)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/proto/ya.make b/vendor/google.golang.org/protobuf/proto/ya.make
index da21667a104..6f72cc0ff16 100644
--- a/vendor/google.golang.org/protobuf/proto/ya.make
+++ b/vendor/google.golang.org/protobuf/proto/ya.make
@@ -21,24 +21,4 @@ SRCS(
     wrappers.go
 )
 
-GO_XTEST_SRCS(
-    bench_test.go
-    checkinit_test.go
-    decode_test.go
-    encode_test.go
-    equal_test.go
-    extension_test.go
-    merge_test.go
-    messageset_test.go
-    methods_test.go
-    nil_test.go
-    noenforceutf8_test.go
-    reset_test.go
-    testmessages_test.go
-    validate_test.go
-    weak_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/protoadapt/convert.go b/vendor/google.golang.org/protobuf/protoadapt/convert.go
index ce172386bf2..ea276d15a02 100644
--- a/vendor/google.golang.org/protobuf/protoadapt/convert.go
+++ b/vendor/google.golang.org/protobuf/protoadapt/convert.go
@@ -11,21 +11,21 @@ import (
 	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
-// MessageV1 is the original "github.com/golang/protobuf/proto".Message type.
+// MessageV1 is the original [github.com/golang/protobuf/proto.Message] type.
 type MessageV1 = protoiface.MessageV1
 
-// MessageV2 is the Message type used by the current google.golang.org/protobuf
-// module, adding support for reflection.
+// MessageV2 is the [google.golang.org/protobuf/proto.Message] type used by the
+// current [google.golang.org/protobuf] module, adding support for reflection.
 type MessageV2 = proto.Message
 
 // MessageV1Of converts a v2 message to a v1 message.
 // It returns nil if m is nil.
-func MessageV1Of(m MessageV2) protoiface.MessageV1 {
+func MessageV1Of(m MessageV2) MessageV1 {
 	return protoimpl.X.ProtoMessageV1Of(m)
 }
 
 // MessageV2Of converts a v1 message to a v2 message.
 // It returns nil if m is nil.
-func MessageV2Of(m MessageV1) proto.Message {
+func MessageV2Of(m MessageV1) MessageV2 {
 	return protoimpl.X.ProtoMessageV2Of(m)
 }
diff --git a/vendor/google.golang.org/protobuf/protoadapt/ya.make b/vendor/google.golang.org/protobuf/protoadapt/ya.make
index cc365bd76b2..e122057c6cb 100644
--- a/vendor/google.golang.org/protobuf/protoadapt/ya.make
+++ b/vendor/google.golang.org/protobuf/protoadapt/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(convert.go)
+SRCS(
+    convert.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/desc.go b/vendor/google.golang.org/protobuf/reflect/protodesc/desc.go
index e4dfb120506..baa0cc6218f 100644
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/desc.go
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/desc.go
@@ -3,11 +3,11 @@
 // license that can be found in the LICENSE file.
 
 // Package protodesc provides functionality for converting
-// FileDescriptorProto messages to/from protoreflect.FileDescriptor values.
+// FileDescriptorProto messages to/from [protoreflect.FileDescriptor] values.
 //
 // The google.protobuf.FileDescriptorProto is a protobuf message that describes
 // the type information for a .proto file in a form that is easily serializable.
-// The protoreflect.FileDescriptor is a more structured representation of
+// The [protoreflect.FileDescriptor] is a more structured representation of
 // the FileDescriptorProto message where references and remote dependencies
 // can be directly followed.
 package protodesc
@@ -24,11 +24,11 @@ import (
 	"google.golang.org/protobuf/types/descriptorpb"
 )
 
-// Resolver is the resolver used by NewFile to resolve dependencies.
+// Resolver is the resolver used by [NewFile] to resolve dependencies.
 // The enums and messages provided must belong to some parent file,
 // which is also registered.
 //
-// It is implemented by protoregistry.Files.
+// It is implemented by [protoregistry.Files].
 type Resolver interface {
 	FindFileByPath(string) (protoreflect.FileDescriptor, error)
 	FindDescriptorByName(protoreflect.FullName) (protoreflect.Descriptor, error)
@@ -61,19 +61,19 @@ type FileOptions struct {
 	AllowUnresolvable bool
 }
 
-// NewFile creates a new protoreflect.FileDescriptor from the provided
-// file descriptor message. See FileOptions.New for more information.
+// NewFile creates a new [protoreflect.FileDescriptor] from the provided
+// file descriptor message. See [FileOptions.New] for more information.
 func NewFile(fd *descriptorpb.FileDescriptorProto, r Resolver) (protoreflect.FileDescriptor, error) {
 	return FileOptions{}.New(fd, r)
 }
 
-// NewFiles creates a new protoregistry.Files from the provided
-// FileDescriptorSet message. See FileOptions.NewFiles for more information.
+// NewFiles creates a new [protoregistry.Files] from the provided
+// FileDescriptorSet message. See [FileOptions.NewFiles] for more information.
 func NewFiles(fd *descriptorpb.FileDescriptorSet) (*protoregistry.Files, error) {
 	return FileOptions{}.NewFiles(fd)
 }
 
-// New creates a new protoreflect.FileDescriptor from the provided
+// New creates a new [protoreflect.FileDescriptor] from the provided
 // file descriptor message. The file must represent a valid proto file according
 // to protobuf semantics. The returned descriptor is a deep copy of the input.
 //
@@ -93,9 +93,15 @@ func (o FileOptions) New(fd *descriptorpb.FileDescriptorProto, r Resolver) (prot
 		f.L1.Syntax = protoreflect.Proto2
 	case "proto3":
 		f.L1.Syntax = protoreflect.Proto3
+	case "editions":
+		f.L1.Syntax = protoreflect.Editions
+		f.L1.Edition = fromEditionProto(fd.GetEdition())
 	default:
 		return nil, errors.New("invalid syntax: %q", fd.GetSyntax())
 	}
+	if f.L1.Syntax == protoreflect.Editions && (fd.GetEdition() < SupportedEditionsMinimum || fd.GetEdition() > SupportedEditionsMaximum) {
+		return nil, errors.New("use of edition %v not yet supported by the Go Protobuf runtime", fd.GetEdition())
+	}
 	f.L1.Path = fd.GetName()
 	if f.L1.Path == "" {
 		return nil, errors.New("file path must be populated")
@@ -108,6 +114,9 @@ func (o FileOptions) New(fd *descriptorpb.FileDescriptorProto, r Resolver) (prot
 		opts = proto.Clone(opts).(*descriptorpb.FileOptions)
 		f.L2.Options = func() protoreflect.ProtoMessage { return opts }
 	}
+	if f.L1.Syntax == protoreflect.Editions {
+		initFileDescFromFeatureSet(f, fd.GetOptions().GetFeatures())
+	}
 
 	f.L2.Imports = make(filedesc.FileImports, len(fd.GetDependency()))
 	for _, i := range fd.GetPublicDependency() {
@@ -231,7 +240,7 @@ func (is importSet) importPublic(imps protoreflect.FileImports) {
 	}
 }
 
-// NewFiles creates a new protoregistry.Files from the provided
+// NewFiles creates a new [protoregistry.Files] from the provided
 // FileDescriptorSet message. The descriptor set must include only
 // valid files according to protobuf semantics. The returned descriptors
 // are a deep copy of the input.
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go b/vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go
index 37efda1afe9..aff6fd4900e 100644
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go
@@ -137,6 +137,30 @@ func (r descsByName) initFieldsFromDescriptorProto(fds []*descriptorpb.FieldDesc
 		if fd.JsonName != nil {
 			f.L1.StringName.InitJSON(fd.GetJsonName())
 		}
+
+		if f.Base.L0.ParentFile.Syntax() == protoreflect.Editions {
+			f.L1.Presence = resolveFeatureHasFieldPresence(f.Base.L0.ParentFile, fd)
+			// We reuse the existing field because the old option `[packed =
+			// true]` is mutually exclusive with the editions feature.
+			if fd.GetLabel() == descriptorpb.FieldDescriptorProto_LABEL_REPEATED {
+				f.L1.HasPacked = true
+				f.L1.IsPacked = resolveFeatureRepeatedFieldEncodingPacked(f.Base.L0.ParentFile, fd)
+			}
+
+			// We pretend this option is always explicitly set because the only
+			// use of HasEnforceUTF8 is to determine whether to use EnforceUTF8
+			// or to return the appropriate default.
+			// When using editions we either parse the option or resolve the
+			// appropriate default here (instead of later when this option is
+			// requested from the descriptor).
+			// In proto2/proto3 syntax HasEnforceUTF8 might be false.
+			f.L1.HasEnforceUTF8 = true
+			f.L1.EnforceUTF8 = resolveFeatureEnforceUTF8(f.Base.L0.ParentFile, fd)
+
+			if f.L1.Kind == protoreflect.MessageKind && resolveFeatureDelimitedEncoding(f.Base.L0.ParentFile, fd) {
+				f.L1.Kind = protoreflect.GroupKind
+			}
+		}
 	}
 	return fs, nil
 }
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/editions.go b/vendor/google.golang.org/protobuf/reflect/protodesc/editions.go
new file mode 100644
index 00000000000..7352926cab4
--- /dev/null
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/editions.go
@@ -0,0 +1,177 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package protodesc
+
+import (
+	_ "embed"
+	"fmt"
+	"os"
+	"sync"
+
+	"google.golang.org/protobuf/internal/filedesc"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/descriptorpb"
+)
+
+const (
+	SupportedEditionsMinimum = descriptorpb.Edition_EDITION_PROTO2
+	SupportedEditionsMaximum = descriptorpb.Edition_EDITION_2023
+)
+
+//go:embed editions_defaults.binpb
+var binaryEditionDefaults []byte
+var defaults = &descriptorpb.FeatureSetDefaults{}
+var defaultsCacheMu sync.Mutex
+var defaultsCache = make(map[filedesc.Edition]*descriptorpb.FeatureSet)
+
+func init() {
+	err := proto.Unmarshal(binaryEditionDefaults, defaults)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "unmarshal editions defaults: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func fromEditionProto(epb descriptorpb.Edition) filedesc.Edition {
+	return filedesc.Edition(epb)
+}
+
+func toEditionProto(ed filedesc.Edition) descriptorpb.Edition {
+	switch ed {
+	case filedesc.EditionUnknown:
+		return descriptorpb.Edition_EDITION_UNKNOWN
+	case filedesc.EditionProto2:
+		return descriptorpb.Edition_EDITION_PROTO2
+	case filedesc.EditionProto3:
+		return descriptorpb.Edition_EDITION_PROTO3
+	case filedesc.Edition2023:
+		return descriptorpb.Edition_EDITION_2023
+	default:
+		panic(fmt.Sprintf("unknown value for edition: %v", ed))
+	}
+}
+
+func getFeatureSetFor(ed filedesc.Edition) *descriptorpb.FeatureSet {
+	defaultsCacheMu.Lock()
+	defer defaultsCacheMu.Unlock()
+	if def, ok := defaultsCache[ed]; ok {
+		return def
+	}
+	edpb := toEditionProto(ed)
+	if defaults.GetMinimumEdition() > edpb || defaults.GetMaximumEdition() < edpb {
+		// This should never happen protodesc.(FileOptions).New would fail when
+		// initializing the file descriptor.
+		// This most likely means the embedded defaults were not updated.
+		fmt.Fprintf(os.Stderr, "internal error: unsupported edition %v (did you forget to update the embedded defaults (i.e. the bootstrap descriptor proto)?)\n", edpb)
+		os.Exit(1)
+	}
+	fs := defaults.GetDefaults()[0].GetFeatures()
+	// Using a linear search for now.
+	// Editions are guaranteed to be sorted and thus we could use a binary search.
+	// Given that there are only a handful of editions (with one more per year)
+	// there is not much reason to use a binary search.
+	for _, def := range defaults.GetDefaults() {
+		if def.GetEdition() <= edpb {
+			fs = def.GetFeatures()
+		} else {
+			break
+		}
+	}
+	defaultsCache[ed] = fs
+	return fs
+}
+
+func resolveFeatureHasFieldPresence(fileDesc *filedesc.File, fieldDesc *descriptorpb.FieldDescriptorProto) bool {
+	fs := fieldDesc.GetOptions().GetFeatures()
+	if fs == nil || fs.FieldPresence == nil {
+		return fileDesc.L1.EditionFeatures.IsFieldPresence
+	}
+	return fs.GetFieldPresence() == descriptorpb.FeatureSet_LEGACY_REQUIRED ||
+		fs.GetFieldPresence() == descriptorpb.FeatureSet_EXPLICIT
+}
+
+func resolveFeatureRepeatedFieldEncodingPacked(fileDesc *filedesc.File, fieldDesc *descriptorpb.FieldDescriptorProto) bool {
+	fs := fieldDesc.GetOptions().GetFeatures()
+	if fs == nil || fs.RepeatedFieldEncoding == nil {
+		return fileDesc.L1.EditionFeatures.IsPacked
+	}
+	return fs.GetRepeatedFieldEncoding() == descriptorpb.FeatureSet_PACKED
+}
+
+func resolveFeatureEnforceUTF8(fileDesc *filedesc.File, fieldDesc *descriptorpb.FieldDescriptorProto) bool {
+	fs := fieldDesc.GetOptions().GetFeatures()
+	if fs == nil || fs.Utf8Validation == nil {
+		return fileDesc.L1.EditionFeatures.IsUTF8Validated
+	}
+	return fs.GetUtf8Validation() == descriptorpb.FeatureSet_VERIFY
+}
+
+func resolveFeatureDelimitedEncoding(fileDesc *filedesc.File, fieldDesc *descriptorpb.FieldDescriptorProto) bool {
+	fs := fieldDesc.GetOptions().GetFeatures()
+	if fs == nil || fs.MessageEncoding == nil {
+		return fileDesc.L1.EditionFeatures.IsDelimitedEncoded
+	}
+	return fs.GetMessageEncoding() == descriptorpb.FeatureSet_DELIMITED
+}
+
+// initFileDescFromFeatureSet initializes editions related fields in fd based
+// on fs. If fs is nil it is assumed to be an empty featureset and all fields
+// will be initialized with the appropriate default. fd.L1.Edition must be set
+// before calling this function.
+func initFileDescFromFeatureSet(fd *filedesc.File, fs *descriptorpb.FeatureSet) {
+	dfs := getFeatureSetFor(fd.L1.Edition)
+	if fs == nil {
+		fs = &descriptorpb.FeatureSet{}
+	}
+
+	var fieldPresence descriptorpb.FeatureSet_FieldPresence
+	if fp := fs.FieldPresence; fp != nil {
+		fieldPresence = *fp
+	} else {
+		fieldPresence = *dfs.FieldPresence
+	}
+	fd.L1.EditionFeatures.IsFieldPresence = fieldPresence == descriptorpb.FeatureSet_LEGACY_REQUIRED ||
+		fieldPresence == descriptorpb.FeatureSet_EXPLICIT
+
+	var enumType descriptorpb.FeatureSet_EnumType
+	if et := fs.EnumType; et != nil {
+		enumType = *et
+	} else {
+		enumType = *dfs.EnumType
+	}
+	fd.L1.EditionFeatures.IsOpenEnum = enumType == descriptorpb.FeatureSet_OPEN
+
+	var respeatedFieldEncoding descriptorpb.FeatureSet_RepeatedFieldEncoding
+	if rfe := fs.RepeatedFieldEncoding; rfe != nil {
+		respeatedFieldEncoding = *rfe
+	} else {
+		respeatedFieldEncoding = *dfs.RepeatedFieldEncoding
+	}
+	fd.L1.EditionFeatures.IsPacked = respeatedFieldEncoding == descriptorpb.FeatureSet_PACKED
+
+	var isUTF8Validated descriptorpb.FeatureSet_Utf8Validation
+	if utf8val := fs.Utf8Validation; utf8val != nil {
+		isUTF8Validated = *utf8val
+	} else {
+		isUTF8Validated = *dfs.Utf8Validation
+	}
+	fd.L1.EditionFeatures.IsUTF8Validated = isUTF8Validated == descriptorpb.FeatureSet_VERIFY
+
+	var messageEncoding descriptorpb.FeatureSet_MessageEncoding
+	if me := fs.MessageEncoding; me != nil {
+		messageEncoding = *me
+	} else {
+		messageEncoding = *dfs.MessageEncoding
+	}
+	fd.L1.EditionFeatures.IsDelimitedEncoded = messageEncoding == descriptorpb.FeatureSet_DELIMITED
+
+	var jsonFormat descriptorpb.FeatureSet_JsonFormat
+	if jf := fs.JsonFormat; jf != nil {
+		jsonFormat = *jf
+	} else {
+		jsonFormat = *dfs.JsonFormat
+	}
+	fd.L1.EditionFeatures.IsJSONCompliant = jsonFormat == descriptorpb.FeatureSet_ALLOW
+}
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/editions_defaults.binpb b/vendor/google.golang.org/protobuf/reflect/protodesc/editions_defaults.binpb
new file mode 100644
index 00000000000..1a8610a8439
--- /dev/null
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/editions_defaults.binpb
@@ -0,0 +1,4 @@
+
+
 
(
0�
+

 (
0
�
+


 (
0
� �(�
\ No newline at end of file
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/file_test.go b/vendor/google.golang.org/protobuf/reflect/protodesc/file_test.go
deleted file mode 100644
index 29b4fa722cb..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/file_test.go
+++ /dev/null
@@ -1,1182 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protodesc
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-
-	"google.golang.org/protobuf/types/descriptorpb"
-)
-
-func mustParseFile(s string) *descriptorpb.FileDescriptorProto {
-	pb := new(descriptorpb.FileDescriptorProto)
-	if err := prototext.Unmarshal([]byte(s), pb); err != nil {
-		panic(err)
-	}
-	return pb
-}
-
-func cloneFile(in *descriptorpb.FileDescriptorProto) *descriptorpb.FileDescriptorProto {
-	return proto.Clone(in).(*descriptorpb.FileDescriptorProto)
-}
-
-var (
-	proto2Enum = mustParseFile(`
-		syntax:    "proto2"
-		name:      "proto2_enum.proto"
-		package:   "test.proto2"
-		enum_type: [{name:"Enum" value:[{name:"ONE" number:1}]}]
-	`)
-	proto3Message = mustParseFile(`
-		syntax:    "proto3"
-		name:      "proto3_message.proto"
-		package:   "test.proto3"
-		message_type: [{
-			name:  "Message"
-			field: [
-				{name:"foo" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-				{name:"bar" number:2 label:LABEL_OPTIONAL type:TYPE_STRING}
-			]
-		}]
-	`)
-	extendableMessage = mustParseFile(`
-		syntax:       "proto2"
-		name:         "extendable_message.proto"
-		package:      "test.proto2"
-		message_type: [{name:"Message" extension_range:[{start:1 end:1000}]}]
-	`)
-	importPublicFile1 = mustParseFile(`
-		syntax:            "proto3"
-		name:              "import_public1.proto"
-		dependency:        ["proto2_enum.proto", "proto3_message.proto", "extendable_message.proto"]
-		message_type:      [{name:"Public1"}]
-	`)
-	importPublicFile2 = mustParseFile(`
-		syntax:            "proto3"
-		name:              "import_public2.proto"
-		dependency:        ["import_public1.proto"]
-		public_dependency: [0]
-		message_type:      [{name:"Public2"}]
-	`)
-	importPublicFile3 = mustParseFile(`
-		syntax:            "proto3"
-		name:              "import_public3.proto"
-		dependency:        ["import_public2.proto", "extendable_message.proto"]
-		public_dependency: [0]
-		message_type:      [{name:"Public3"}]
-	`)
-	importPublicFile4 = mustParseFile(`
-		syntax:            "proto3"
-		name:              "import_public4.proto"
-		dependency:        ["import_public2.proto", "import_public3.proto", "proto2_enum.proto"]
-		public_dependency: [0, 1]
-		message_type:      [{name:"Public4"}]
-	`)
-)
-
-func TestNewFile(t *testing.T) {
-	tests := []struct {
-		label    string
-		inDeps   []*descriptorpb.FileDescriptorProto
-		inDesc   *descriptorpb.FileDescriptorProto
-		inOpts   FileOptions
-		wantDesc *descriptorpb.FileDescriptorProto
-		wantErr  string
-	}{{
-		label:   "empty path",
-		inDesc:  mustParseFile(``),
-		wantErr: `path must be populated`,
-	}, {
-		label:  "empty package and syntax",
-		inDesc: mustParseFile(`name:"weird"`),
-	}, {
-		label:   "invalid syntax",
-		inDesc:  mustParseFile(`name:"weird" syntax:"proto9"`),
-		wantErr: `invalid syntax: "proto9"`,
-	}, {
-		label:   "bad package",
-		inDesc:  mustParseFile(`name:"weird" package:"$"`),
-		wantErr: `invalid package: "$"`,
-	}, {
-		label: "unresolvable import",
-		inDesc: mustParseFile(`
-			name:       "test.proto"
-			dependency: "dep.proto"
-		`),
-		wantErr: `could not resolve import "dep.proto": not found`,
-	}, {
-		label: "unresolvable import but allowed",
-		inDesc: mustParseFile(`
-			name:       "test.proto"
-			dependency: "dep.proto"
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-	}, {
-		label: "duplicate import",
-		inDesc: mustParseFile(`
-			name:       "test.proto"
-			dependency: ["dep.proto", "dep.proto"]
-		`),
-		inOpts:  FileOptions{AllowUnresolvable: true},
-		wantErr: `already imported "dep.proto"`,
-	}, {
-		label: "invalid weak import",
-		inDesc: mustParseFile(`
-			name:            "test.proto"
-			dependency:      "dep.proto"
-			weak_dependency: [-23]
-		`),
-		inOpts:  FileOptions{AllowUnresolvable: true},
-		wantErr: `invalid or duplicate weak import index: -23`,
-	}, {
-		label: "normal weak and public import",
-		inDesc: mustParseFile(`
-			name:              "test.proto"
-			dependency:        "dep.proto"
-			weak_dependency:   [0]
-			public_dependency: [0]
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-	}, {
-		label: "import public indirect dependency duplicate",
-		inDeps: []*descriptorpb.FileDescriptorProto{
-			mustParseFile(`name:"leaf.proto"`),
-			mustParseFile(`name:"public.proto" dependency:"leaf.proto" public_dependency:0`),
-		},
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			dependency: ["public.proto", "leaf.proto"]
-		`),
-	}, {
-		label: "import public graph",
-		inDeps: []*descriptorpb.FileDescriptorProto{
-			cloneFile(proto2Enum),
-			cloneFile(proto3Message),
-			cloneFile(extendableMessage),
-			cloneFile(importPublicFile1),
-			cloneFile(importPublicFile2),
-			cloneFile(importPublicFile3),
-			cloneFile(importPublicFile4),
-		},
-		inDesc: mustParseFile(`
-			name:       "test.proto"
-			package:    "test.graph"
-			dependency: ["import_public4.proto"],
-		`),
-		// TODO: Test import public
-	}, {
-		label: "preserve source code locations",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			source_code_info: {location: [{
-				span: [39,0,882,1]
-			}, {
-				path: [12]
-				span: [39,0,18]
-				leading_detached_comments: [" foo\n"," bar\n"]
-			}, {
-				path: [8,9]
-				span: [51,0,28]
-				leading_comments: " Comment\n"
-			}]}
-		`),
-	}, {
-		label: "invalid source code span",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			source_code_info: {location: [{
-				span: [39]
-			}]}
-		`),
-		wantErr: `invalid span: [39]`,
-	}, {
-		label: "resolve relative reference",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "A"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:"B.C"}]
-				nested_type: [{name: "B"}]
-			}, {
-				name: "B"
-				nested_type: [{name: "C"}]
-			}]
-		`),
-		wantDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "A"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:".fizz.buzz.B.C"}]
-				nested_type: [{name: "B"}]
-			}, {
-				name: "B"
-				nested_type: [{name: "C"}]
-			}]
-		`),
-	}, {
-		label: "resolve the wrong type",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:"E"}]
-				enum_type: [{name: "E" value: [{name:"V0" number:0}, {name:"V1" number:1}]}]
-			}]
-		`),
-		wantErr: `message field "M.F" cannot resolve type: resolved "M.E", but it is not an message`,
-	}, {
-		label: "auto-resolve unknown kind",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type_name:"E"}]
-				enum_type: [{name: "E" value: [{name:"V0" number:0}, {name:"V1" number:1}]}]
-			}]
-		`),
-		wantDesc: mustParseFile(`
-			name: "test.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM type_name:".M.E"}]
-				enum_type: [{name: "E" value: [{name:"V0" number:0}, {name:"V1" number:1}]}]
-			}]
-		`),
-	}, {
-		label: "unresolved import",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			dependency: "remote.proto"
-		`),
-		wantErr: `could not resolve import "remote.proto": not found`,
-	}, {
-		label: "unresolved message field",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "M"
-				field: [{name:"F1" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM type_name:"some.other.enum" default_value:"UNKNOWN"}]
-			}]
-		`),
-		wantErr: `message field "fizz.buzz.M.F1" cannot resolve type: "*.some.other.enum" not found`,
-	}, {
-		label: "unresolved default enum value",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "M"
-				field: [{name:"F1" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM type_name:"E" default_value:"UNKNOWN"}]
-				enum_type: [{name:"E" value:[{name:"V0" number:0}]}]
-			}]
-		`),
-		wantErr: `message field "fizz.buzz.M.F1" has invalid default: could not parse value for enum: "UNKNOWN"`,
-	}, {
-		label: "allowed unresolved default enum value",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "M"
-				field: [{name:"F1" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM type_name:".fizz.buzz.M.E" default_value:"UNKNOWN"}]
-				enum_type: [{name:"E" value:[{name:"V0" number:0}]}]
-			}]
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-	}, {
-		label: "unresolved extendee",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			extension: [{name:"X" number:1 label:LABEL_OPTIONAL extendee:"some.extended.message" type:TYPE_MESSAGE type_name:"some.other.message"}]
-		`),
-		wantErr: `extension field "fizz.buzz.X" cannot resolve extendee: "*.some.extended.message" not found`,
-	}, {
-		label: "unresolved method input",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			service: [{
-				name: "S"
-				method: [{name:"M" input_type:"foo.bar.input" output_type:".absolute.foo.bar.output"}]
-			}]
-		`),
-		wantErr: `service method "fizz.buzz.S.M" cannot resolve input: "*.foo.bar.input" not found`,
-	}, {
-		label: "allowed unresolved references",
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			dependency: "remote.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F1" number:1 label:LABEL_OPTIONAL type_name:"some.other.enum" default_value:"UNKNOWN"}]
-			}]
-			extension: [{name:"X" number:1 label:LABEL_OPTIONAL extendee:"some.extended.message" type:TYPE_MESSAGE type_name:"some.other.message"}]
-			service: [{
-				name: "S"
-				method: [{name:"M" input_type:"foo.bar.input" output_type:".absolute.foo.bar.output"}]
-			}]
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-	}, {
-		label: "resolved but not imported",
-		inDeps: []*descriptorpb.FileDescriptorProto{mustParseFile(`
-			name: "dep.proto"
-			package: "fizz"
-			message_type: [{name:"M" nested_type:[{name:"M"}]}]
-		`)},
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:"M.M"}]
-			}]
-		`),
-		wantErr: `message field "fizz.buzz.M.F" cannot resolve type: resolved "fizz.M.M", but "dep.proto" is not imported`,
-	}, {
-		label: "resolved from remote import",
-		inDeps: []*descriptorpb.FileDescriptorProto{mustParseFile(`
-			name: "dep.proto"
-			package: "fizz"
-			message_type: [{name:"M" nested_type:[{name:"M"}]}]
-		`)},
-		inDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			dependency: "dep.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:"M.M"}]
-			}]
-		`),
-		wantDesc: mustParseFile(`
-			name: "test.proto"
-			package: "fizz.buzz"
-			dependency: "dep.proto"
-			message_type: [{
-				name: "M"
-				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:".fizz.M.M"}]
-			}]
-		`),
-	}, {
-		label: "namespace conflict on enum value",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			enum_type: [{
-				name: "foo"
-				value: [{name:"foo" number:0}]
-			}]
-		`),
-		wantErr: `descriptor "foo" already declared`,
-	}, {
-		label: "no namespace conflict on message field",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{
-				name: "foo"
-				field: [{name:"foo" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]
-		`),
-	}, {
-		label: "invalid name",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name: "$"}]
-		`),
-		wantErr: `descriptor "" has an invalid nested name: "$"`,
-	}, {
-		label: "invalid empty enum",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{name:"E"}]}]
-		`),
-		wantErr: `enum "M.E" must contain at least one value declaration`,
-	}, {
-		label: "invalid enum value without number",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{name:"E" value:[{name:"one"}]}]}]
-		`),
-		wantErr: `enum value "M.one" must have a specified number`,
-	}, {
-		label: "valid enum",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{name:"E" value:[{name:"one" number:1}]}]}]
-		`),
-	}, {
-		label: "invalid enum reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:          "E"
-				reserved_name: [""]
-				value: [{name:"V" number:0}]
-			}]}]
-		`),
-		// NOTE: In theory this should be an error.
-		// See https://github.com/protocolbuffers/protobuf/issues/6335.
-		/*wantErr: `enum "M.E" reserved names has invalid name: ""`,*/
-	}, {
-		label: "duplicate enum reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:          "E"
-				reserved_name: ["foo", "foo"]
-			}]}]
-		`),
-		wantErr: `enum "M.E" reserved names has duplicate name: "foo"`,
-	}, {
-		label: "valid enum reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:          "E"
-				reserved_name: ["foo", "bar"]
-				value:         [{name:"baz" number:1}]
-			}]}]
-		`),
-	}, {
-		label: "use of enum reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:          "E"
-				reserved_name: ["foo", "bar"]
-				value:         [{name:"foo" number:1}]
-			}]}]
-		`),
-		wantErr: `enum value "M.foo" must not use reserved name`,
-	}, {
-		label: "invalid enum reserved ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:           "E"
-				reserved_range: [{start:5 end:4}]
-			}]}]
-		`),
-		wantErr: `enum "M.E" reserved ranges has invalid range: 5 to 4`,
-	}, {
-		label: "overlapping enum reserved ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:           "E"
-				reserved_range: [{start:1 end:1000}, {start:10 end:100}]
-			}]}]
-		`),
-		wantErr: `enum "M.E" reserved ranges has overlapping ranges: 1 to 1000 with 10 to 100`,
-	}, {
-		label: "valid enum reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:           "E"
-				reserved_range: [{start:1 end:10}, {start:100 end:1000}]
-				value:          [{name:"baz" number:50}]
-			}]}]
-		`),
-	}, {
-		label: "use of enum reserved range",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:           "E"
-				reserved_range: [{start:1 end:10}, {start:100 end:1000}]
-				value:          [{name:"baz" number:500}]
-			}]}]
-		`),
-		wantErr: `enum value "M.baz" must not use reserved number 500`,
-	}, {
-		label: "unused enum alias feature",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:    "E"
-				value:   [{name:"baz" number:500}]
-				options: {allow_alias:true}
-			}]}]
-		`),
-		wantErr: `enum "M.E" allows aliases, but none were found`,
-	}, {
-		label: "enum number conflicts",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"foo" number:0}, {name:"bar" number:1}, {name:"baz" number:1}]
-			}]}]
-		`),
-		wantErr: `enum "M.E" has conflicting non-aliased values on number 1: "baz" with "bar"`,
-	}, {
-		label: "aliased enum numbers",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:    "E"
-				value:   [{name:"foo" number:0}, {name:"bar" number:1}, {name:"baz" number:1}]
-				options: {allow_alias:true}
-			}]}]
-		`),
-	}, {
-		label: "invalid proto3 enum",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"baz" number:500}]
-			}]}]
-		`),
-		wantErr: `enum "M.baz" using proto3 semantics must have zero number for the first value`,
-	}, {
-		label: "valid proto3 enum",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"baz" number:0}]
-			}]}]
-		`),
-	}, {
-		label: "proto3 enum name prefix conflict",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"e_Foo" number:0}, {name:"fOo" number:1}]
-			}]}]
-		`),
-		wantErr: `enum "M.E" using proto3 semantics has conflict: "fOo" with "e_Foo"`,
-	}, {
-		label: "proto2 enum has name prefix check",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"e_Foo" number:0}, {name:"fOo" number:1}]
-			}]}]
-		`),
-	}, {
-		label: "proto3 enum same name prefix with number conflict",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:  "E"
-				value: [{name:"e_Foo" number:0}, {name:"fOo" number:0}]
-			}]}]
-		`),
-		wantErr: `enum "M.E" has conflicting non-aliased values on number 0: "fOo" with "e_Foo"`,
-	}, {
-		label: "proto3 enum same name prefix with alias numbers",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" enum_type:[{
-				name:    "E"
-				value:   [{name:"e_Foo" number:0}, {name:"fOo" number:0}]
-				options: {allow_alias: true}
-			}]}]
-		`),
-	}, {
-		label: "invalid message reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:          "M"
-				reserved_name: ["$"]
-			}]}]
-		`),
-		// NOTE: In theory this should be an error.
-		// See https://github.com/protocolbuffers/protobuf/issues/6335.
-		/*wantErr: `message "M.M" reserved names has invalid name: "$"`,*/
-	}, {
-		label: "valid message reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:          "M"
-				reserved_name: ["foo", "bar"]
-				field:         [{name:"foo" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message field "M.M.foo" must not use reserved name`,
-	}, {
-		label: "valid message reserved names",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:          "M"
-				reserved_name: ["foo", "bar"]
-				field:         [{name:"baz" number:1 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0}]
-				oneof_decl:    [{name:"foo"}] # not affected by reserved_name
-			}]}]
-		`),
-	}, {
-		label: "invalid reserved number",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:           "M"
-				reserved_range: [{start:1 end:1}]
-				field:          [{name:"baz" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message "M.M" reserved ranges has invalid field number: 0`,
-	}, {
-		label: "invalid reserved ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:           "M"
-				reserved_range: [{start:2 end:2}]
-				field:          [{name:"baz" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message "M.M" reserved ranges has invalid range: 2 to 1`,
-	}, {
-		label: "overlapping reserved ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:           "M"
-				reserved_range: [{start:1 end:10}, {start:2 end:9}]
-				field:          [{name:"baz" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message "M.M" reserved ranges has overlapping ranges: 1 to 9 with 2 to 8`,
-	}, {
-		label: "use of reserved message field number",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:           "M"
-				reserved_range: [{start:10 end:20}, {start:20 end:30}, {start:30 end:31}]
-				field:          [{name:"baz" number:30 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message field "M.M.baz" must not use reserved number 30`,
-	}, {
-		label: "invalid extension ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:            "M"
-				extension_range: [{start:-500 end:2}]
-				field:           [{name:"baz" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]
-			}]}]
-		`),
-		wantErr: `message "M.M" extension ranges has invalid field number: -500`,
-	}, {
-		label: "overlapping reserved and extension ranges",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:            "M"
-				reserved_range:  [{start:15 end:20}, {start:1 end:3}, {start:7 end:10}]
-				extension_range: [{start:8 end:9}, {start:3 end:5}]
-			}]}]
-		`),
-		wantErr: `message "M.M" reserved and extension ranges has overlapping ranges: 7 to 9 with 8`,
-	}, {
-		label: "message field conflicting number",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:            "M"
-				field: [
-					{name:"one" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-					{name:"One" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}
-				]
-			}]}]
-		`),
-		wantErr: `message "M.M" has conflicting fields: "One" with "one"`,
-	}, {
-		label: "invalid MessageSet",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:    "M"
-				options: {message_set_wire_format:true}
-			}]}]
-		`),
-		wantErr: func() string {
-			if flags.ProtoLegacy {
-				return `message "M.M" is an invalid proto1 MessageSet`
-			} else {
-				return `message "M.M" is a MessageSet, which is a legacy proto1 feature that is no longer supported`
-			}
-		}(),
-	}, {
-		label: "valid MessageSet",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:            "M"
-				extension_range: [{start:1 end:100000}]
-				options:         {message_set_wire_format:true}
-			}]}]
-		`),
-		wantErr: func() string {
-			if flags.ProtoLegacy {
-				return ""
-			} else {
-				return `message "M.M" is a MessageSet, which is a legacy proto1 feature that is no longer supported`
-			}
-		}(),
-	}, {
-		label: "invalid extension ranges in proto3",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:            "M"
-				extension_range: [{start:1 end:100000}]
-			}]}]
-		`),
-		wantErr: `message "M.M" using proto3 semantics cannot have extension ranges`,
-	}, {
-		label: "proto3 message fields conflict",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name: "M"
-				field: [
-					{name:"_b_a_z_" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-					{name:"baz" number:2 label:LABEL_OPTIONAL type:TYPE_STRING}
-				]
-			}]}]
-		`),
-		wantErr: `message "M.M" using proto3 semantics has conflict: "baz" with "_b_a_z_"`,
-	}, {
-		label: "proto3 message fields",
-		inDesc: mustParseFile(`
-			syntax:  "proto3"
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name:       "M"
-				field:      [{name:"_b_a_z_" number:1 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0}]
-				oneof_decl: [{name:"baz"}] # proto3 name conflict logic does not include oneof
-			}]}]
-		`),
-	}, {
-		label: "proto2 message fields with no conflict",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			message_type: [{name:"M" nested_type:[{
-				name: "M"
-				field: [
-					{name:"_b_a_z_" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-					{name:"baz" number:2 label:LABEL_OPTIONAL type:TYPE_STRING}
-				]
-			}]}]
-		`),
-	}, {
-		label: "proto3 message with unresolved enum",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			syntax:  "proto3"
-			message_type: [{
-				name: "M"
-				field: [
-					{name:"enum" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM type_name:".fizz.buzz.Enum"}
-				]
-			}]
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-		// TODO: Test field and oneof handling in validateMessageDeclarations
-		// TODO: Test unmarshalDefault
-		// TODO: Test validateExtensionDeclarations
-		// TODO: Test checkValidGroup
-		// TODO: Test checkValidMap
-	}, {
-		label: "empty service",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			service: [{name:"service"}]
-		`),
-	}, {
-		label: "service with method with unresolved",
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			service: [{
-				name: "service"
-				method: [{
-					name:"method"
-					input_type:"foo"
-					output_type:".foo.bar.baz"
-				}]
-			}]
-		`),
-		inOpts: FileOptions{AllowUnresolvable: true},
-	}, {
-		label: "service with wrong reference type",
-		inDeps: []*descriptorpb.FileDescriptorProto{
-			cloneFile(proto3Message),
-			cloneFile(proto2Enum),
-		},
-		inDesc: mustParseFile(`
-			name:    "test.proto"
-			dependency: ["proto2_enum.proto", "proto3_message.proto"]
-			service: [{
-				name: "service"
-				method: [{
-					name:        "method"
-					input_type:  ".test.proto2.Enum",
-					output_type: ".test.proto3.Message"
-				}]
-			}]
-		`),
-		wantErr: `service method "service.method" cannot resolve input: resolved "test.proto2.Enum", but it is not an message`,
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.label, func(t *testing.T) {
-			r := new(protoregistry.Files)
-			for i, dep := range tt.inDeps {
-				f, err := tt.inOpts.New(dep, r)
-				if err != nil {
-					t.Fatalf("dependency %d: unexpected NewFile() error: %v", i, err)
-				}
-				if err := r.RegisterFile(f); err != nil {
-					t.Fatalf("dependency %d: unexpected Register() error: %v", i, err)
-				}
-			}
-			var gotDesc *descriptorpb.FileDescriptorProto
-			if tt.wantErr == "" && tt.wantDesc == nil {
-				tt.wantDesc = cloneFile(tt.inDesc)
-			}
-			gotFile, err := tt.inOpts.New(tt.inDesc, r)
-			if gotFile != nil {
-				gotDesc = ToFileDescriptorProto(gotFile)
-			}
-			if !proto.Equal(gotDesc, tt.wantDesc) {
-				t.Errorf("NewFile() mismatch:\ngot  %v\nwant %v", gotDesc, tt.wantDesc)
-			}
-			if ((err == nil) != (tt.wantErr == "")) || !strings.Contains(fmt.Sprint(err), tt.wantErr) {
-				t.Errorf("NewFile() error:\ngot:  %v\nwant: %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestNewFiles(t *testing.T) {
-	fdset := &descriptorpb.FileDescriptorSet{
-		File: []*descriptorpb.FileDescriptorProto{
-			mustParseFile(`
-				name: "test.proto"
-				package: "fizz"
-				dependency: "dep.proto"
-				message_type: [{
-					name: "M2"
-					field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:"M1"}]
-				}]
-			`),
-			// Inputs deliberately out of order.
-			mustParseFile(`
-				name: "dep.proto"
-				package: "fizz"
-				message_type: [{name:"M1"}]
-			`),
-		},
-	}
-	f, err := NewFiles(fdset)
-	if err != nil {
-		t.Fatal(err)
-	}
-	m1, err := f.FindDescriptorByName("fizz.M1")
-	if err != nil {
-		t.Fatalf(`f.FindDescriptorByName("fizz.M1") = %v`, err)
-	}
-	m2, err := f.FindDescriptorByName("fizz.M2")
-	if err != nil {
-		t.Fatalf(`f.FindDescriptorByName("fizz.M2") = %v`, err)
-	}
-	if m2.(protoreflect.MessageDescriptor).Fields().ByName("F").Message() != m1 {
-		t.Fatalf(`m1.Fields().ByName("F").Message() != m2`)
-	}
-}
-
-func TestNewFilesImportCycle(t *testing.T) {
-	fdset := &descriptorpb.FileDescriptorSet{
-		File: []*descriptorpb.FileDescriptorProto{
-			mustParseFile(`
-				name: "test.proto"
-				package: "fizz"
-				dependency: "dep.proto"
-			`),
-			mustParseFile(`
-				name: "dep.proto"
-				package: "fizz"
-				dependency: "test.proto"
-			`),
-		},
-	}
-	_, err := NewFiles(fdset)
-	if err == nil {
-		t.Fatal("NewFiles with import cycle: success, want error")
-	}
-}
-
-func TestSourceLocations(t *testing.T) {
-	fd := mustParseFile(`
-		name: "comments.proto"
-		message_type: [{
-			name: "Message1"
-			field: [
-				{name:"field1" number:1 label:LABEL_OPTIONAL type:TYPE_STRING},
-				{name:"field2" number:2 label:LABEL_OPTIONAL type:TYPE_STRING},
-				{name:"field3" number:3 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0},
-				{name:"field4" number:4 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0},
-				{name:"field5" number:5 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:1},
-				{name:"field6" number:6 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:1}
-			]
-			extension: [
-				{name:"extension1" number:100 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".Message1"},
-				{name:"extension2" number:101 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".Message1"}
-			]
-			nested_type: [{name:"Message1"}, {name:"Message2"}]
-			extension_range: {start:100 end:536870912}
-			oneof_decl: [{name:"oneof1"}, {name:"oneof2"}]
-		}, {
-			name: "Message2"
-			enum_type: {
-				name: "Enum1"
-				value: [
-					{name: "FOO", number: 0},
-					{name: "BAR", number: 1}
-				]
-			}
-		}]
-		enum_type: {
-			name: "Enum1"
-			value: [
-				{name: "FOO", number: 0},
-				{name: "BAR", number: 1}
-			]
-		}
-		service: {
-			name: "Service1"
-			method: [
-				{name:"Method1" input_type:".Message1" output_type:".Message1"},
-				{name:"Method2" input_type:".Message2" output_type:".Message2"}
-			]
-		}
-		extension: [
-			{name:"extension1" number:102 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".Message1"},
-			{name:"extension2" number:103 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".Message1"}
-		]
-		source_code_info: {
-			location: [
-				{span:[0,0,69,1]},
-				{path:[12] span:[0,0,18]},
-				{path:[5,0] span:[3,0,8,1] leading_comments:" Enum1\r\n"},
-				{path:[5,0,1] span:[3,5,10]},
-				{path:[5,0,2,0] span:[5,2,10] leading_comments:" FOO\r\n"},
-				{path:[5,0,2,0,1] span:[5,2,5]},
-				{path:[5,0,2,0,2] span:[5,8,9]},
-				{path:[5,0,2,1] span:[7,2,10] leading_comments:" BAR\r\n"},
-				{path:[5,0,2,1,1] span:[7,2,5]},
-				{path:[5,0,2,1,2] span:[7,8,9]},
-				{path:[4,0] span:[11,0,43,1] leading_comments:" Message1\r\n"},
-				{path:[4,0,1] span:[11,8,16]},
-				{path:[4,0,3,0] span:[13,2,21] leading_comments:" Message1.Message1\r\n"},
-				{path:[4,0,3,0,1] span:[13,10,18]},
-				{path:[4,0,3,1] span:[15,2,21] leading_comments:" Message1.Message2\r\n"},
-				{path:[4,0,3,1,1] span:[15,10,18]},
-				{path:[4,0,2,0] span:[18,2,29] leading_comments:" Message1.field1\r\n"},
-				{path:[4,0,2,0,4] span:[18,2,10]},
-				{path:[4,0,2,0,5] span:[18,11,17]},
-				{path:[4,0,2,0,1] span:[18,18,24]},
-				{path:[4,0,2,0,3] span:[18,27,28]},
-				{path:[4,0,2,1] span:[20,2,29] leading_comments:" Message1.field2\r\n"},
-				{path:[4,0,2,1,4] span:[20,2,10]},
-				{path:[4,0,2,1,5] span:[20,11,17]},
-				{path:[4,0,2,1,1] span:[20,18,24]},
-				{path:[4,0,2,1,3] span:[20,27,28]},
-				{path:[4,0,8,0] span:[22,2,27,3] leading_comments:" Message1.oneof1\r\n"},
-				{path:[4,0,8,0,1] span:[22,8,14]},
-				{path:[4,0,2,2] span:[24,4,22] leading_comments:" Message1.field3\r\n"},
-				{path:[4,0,2,2,5] span:[24,4,10]},
-				{path:[4,0,2,2,1] span:[24,11,17]},
-				{path:[4,0,2,2,3] span:[24,20,21]},
-				{path:[4,0,2,3] span:[26,4,22] leading_comments:" Message1.field4\r\n"},
-				{path:[4,0,2,3,5] span:[26,4,10]},
-				{path:[4,0,2,3,1] span:[26,11,17]},
-				{path:[4,0,2,3,3] span:[26,20,21]},
-				{path:[4,0,8,1] span:[29,2,34,3] leading_comments:" Message1.oneof2\r\n"},
-				{path:[4,0,8,1,1] span:[29,8,14]},
-				{path:[4,0,2,4] span:[31,4,22] leading_comments:" Message1.field5\r\n"},
-				{path:[4,0,2,4,5] span:[31,4,10]},
-				{path:[4,0,2,4,1] span:[31,11,17]},
-				{path:[4,0,2,4,3] span:[31,20,21]},
-				{path:[4,0,2,5] span:[33,4,22] leading_comments:" Message1.field6\r\n"},
-				{path:[4,0,2,5,5] span:[33,4,10]},
-				{path:[4,0,2,5,1] span:[33,11,17]},
-				{path:[4,0,2,5,3] span:[33,20,21]},
-				{path:[4,0,5] span:[36,2,24]},
-				{path:[4,0,5,0] span:[36,13,23]},
-				{path:[4,0,5,0,1] span:[36,13,16]},
-				{path:[4,0,5,0,2] span:[36,20,23]},
-				{path:[4,0,6] span:[37,2,42,3]},
-				{path:[4,0,6,0] span:[39,4,37] leading_comments:" Message1.extension1\r\n"},
-				{path:[4,0,6,0,2] span:[37,9,18]},
-				{path:[4,0,6,0,4] span:[39,4,12]},
-				{path:[4,0,6,0,5] span:[39,13,19]},
-				{path:[4,0,6,0,1] span:[39,20,30]},
-				{path:[4,0,6,0,3] span:[39,33,36]},
-				{path:[4,0,6,1] span:[41,4,37] leading_comments:" Message1.extension2\r\n"},
-				{path:[4,0,6,1,2] span:[37,9,18]},
-				{path:[4,0,6,1,4] span:[41,4,12]},
-				{path:[4,0,6,1,5] span:[41,13,19]},
-				{path:[4,0,6,1,1] span:[41,20,30]},
-				{path:[4,0,6,1,3] span:[41,33,36]},
-				{path:[7] span:[45,0,50,1]},
-				{path:[7,0] span:[47,2,35] leading_comments:" extension1\r\n"},
-				{path:[7,0,2] span:[45,7,15]},
-				{path:[7,0,4] span:[47,2,10]},
-				{path:[7,0,5] span:[47,11,17]},
-				{path:[7,0,1] span:[47,18,28]},
-				{path:[7,0,3] span:[47,31,34]},
-				{path:[7,1] span:[49,2,35] leading_comments:" extension2\r\n"},
-				{path:[7,1,2] span:[45,7,15]},
-				{path:[7,1,4] span:[49,2,10]},
-				{path:[7,1,5] span:[49,11,17]},
-				{path:[7,1,1] span:[49,18,28]},
-				{path:[7,1,3] span:[49,31,34]},
-				{path:[4,1] span:[53,0,61,1] leading_comments:" Message2\r\n"},
-				{path:[4,1,1] span:[53,8,16]},
-				{path:[4,1,4,0] span:[55,2,60,3] leading_comments:" Message2.Enum1\r\n"},
-				{path:[4,1,4,0,1] span:[55,7,12]},
-				{path:[4,1,4,0,2,0] span:[57,4,12] leading_comments:" Message2.FOO\r\n"},
-				{path:[4,1,4,0,2,0,1] span:[57,4,7]},
-				{path:[4,1,4,0,2,0,2] span:[57,10,11]},
-				{path:[4,1,4,0,2,1] span:[59,4,12] leading_comments:" Message2.BAR\r\n"},
-				{path:[4,1,4,0,2,1,1] span:[59,4,7]},
-				{path:[4,1,4,0,2,1,2] span:[59,10,11]},
-				{path:[6,0] span:[64,0,69,1] leading_comments:" Service1\r\n"},
-				{path:[6,0,1] span:[64,8,16]},
-				{path:[6,0,2,0] span:[66,2,43] leading_comments:" Service1.Method1\r\n"},
-				{path:[6,0,2,0,1] span:[66,6,13]},
-				{path:[6,0,2,0,2] span:[66,14,22]},
-				{path:[6,0,2,0,3] span:[66,33,41]},
-				{path:[6,0,2,1] span:[68,2,43] leading_comments:" Service1.Method2\r\n"},
-				{path:[6,0,2,1,1] span:[68,6,13]},
-				{path:[6,0,2,1,2] span:[68,14,22]},
-				{path:[6,0,2,1,3] span:[68,33,41]}
-			]
-		}
-	`)
-	fileDesc, err := NewFile(fd, nil)
-	if err != nil {
-		t.Fatalf("NewFile error: %v", err)
-	}
-
-	var walkDescs func(protoreflect.Descriptor, func(protoreflect.Descriptor))
-	walkDescs = func(d protoreflect.Descriptor, f func(protoreflect.Descriptor)) {
-		f(d)
-		if d, ok := d.(interface {
-			Enums() protoreflect.EnumDescriptors
-		}); ok {
-			eds := d.Enums()
-			for i := 0; i < eds.Len(); i++ {
-				walkDescs(eds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Values() protoreflect.EnumValueDescriptors
-		}); ok {
-			vds := d.Values()
-			for i := 0; i < vds.Len(); i++ {
-				walkDescs(vds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Messages() protoreflect.MessageDescriptors
-		}); ok {
-			mds := d.Messages()
-			for i := 0; i < mds.Len(); i++ {
-				walkDescs(mds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Fields() protoreflect.FieldDescriptors
-		}); ok {
-			fds := d.Fields()
-			for i := 0; i < fds.Len(); i++ {
-				walkDescs(fds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Oneofs() protoreflect.OneofDescriptors
-		}); ok {
-			ods := d.Oneofs()
-			for i := 0; i < ods.Len(); i++ {
-				walkDescs(ods.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Extensions() protoreflect.ExtensionDescriptors
-		}); ok {
-			xds := d.Extensions()
-			for i := 0; i < xds.Len(); i++ {
-				walkDescs(xds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Services() protoreflect.ServiceDescriptors
-		}); ok {
-			sds := d.Services()
-			for i := 0; i < sds.Len(); i++ {
-				walkDescs(sds.Get(i), f)
-			}
-		}
-		if d, ok := d.(interface {
-			Methods() protoreflect.MethodDescriptors
-		}); ok {
-			mds := d.Methods()
-			for i := 0; i < mds.Len(); i++ {
-				walkDescs(mds.Get(i), f)
-			}
-		}
-	}
-
-	var numDescs int
-	walkDescs(fileDesc, func(d protoreflect.Descriptor) {
-		// The comment for every descriptor should be the full name itself.
-		got := strings.TrimSpace(fileDesc.SourceLocations().ByDescriptor(d).LeadingComments)
-		want := string(d.FullName())
-		if got != want {
-			t.Errorf("comment mismatch: got %v, want %v", got, want)
-		}
-		numDescs++
-	})
-	if numDescs != 30 {
-		t.Errorf("visited %d descriptor, expected 30", numDescs)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/gotest/ya.make b/vendor/google.golang.org/protobuf/reflect/protodesc/gotest/ya.make
deleted file mode 100644
index 18b2ef76c10..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/reflect/protodesc)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/proto.go b/vendor/google.golang.org/protobuf/reflect/protodesc/proto.go
index a7c5ceffc9b..9d6e05420f7 100644
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/proto.go
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/proto.go
@@ -16,7 +16,7 @@ import (
 	"google.golang.org/protobuf/types/descriptorpb"
 )
 
-// ToFileDescriptorProto copies a protoreflect.FileDescriptor into a
+// ToFileDescriptorProto copies a [protoreflect.FileDescriptor] into a
 // google.protobuf.FileDescriptorProto message.
 func ToFileDescriptorProto(file protoreflect.FileDescriptor) *descriptorpb.FileDescriptorProto {
 	p := &descriptorpb.FileDescriptorProto{
@@ -70,13 +70,13 @@ func ToFileDescriptorProto(file protoreflect.FileDescriptor) *descriptorpb.FileD
 	for i, exts := 0, file.Extensions(); i < exts.Len(); i++ {
 		p.Extension = append(p.Extension, ToFieldDescriptorProto(exts.Get(i)))
 	}
-	if syntax := file.Syntax(); syntax != protoreflect.Proto2 {
+	if syntax := file.Syntax(); syntax != protoreflect.Proto2 && syntax.IsValid() {
 		p.Syntax = proto.String(file.Syntax().String())
 	}
 	return p
 }
 
-// ToDescriptorProto copies a protoreflect.MessageDescriptor into a
+// ToDescriptorProto copies a [protoreflect.MessageDescriptor] into a
 // google.protobuf.DescriptorProto message.
 func ToDescriptorProto(message protoreflect.MessageDescriptor) *descriptorpb.DescriptorProto {
 	p := &descriptorpb.DescriptorProto{
@@ -119,7 +119,7 @@ func ToDescriptorProto(message protoreflect.MessageDescriptor) *descriptorpb.Des
 	return p
 }
 
-// ToFieldDescriptorProto copies a protoreflect.FieldDescriptor into a
+// ToFieldDescriptorProto copies a [protoreflect.FieldDescriptor] into a
 // google.protobuf.FieldDescriptorProto message.
 func ToFieldDescriptorProto(field protoreflect.FieldDescriptor) *descriptorpb.FieldDescriptorProto {
 	p := &descriptorpb.FieldDescriptorProto{
@@ -168,7 +168,7 @@ func ToFieldDescriptorProto(field protoreflect.FieldDescriptor) *descriptorpb.Fi
 	return p
 }
 
-// ToOneofDescriptorProto copies a protoreflect.OneofDescriptor into a
+// ToOneofDescriptorProto copies a [protoreflect.OneofDescriptor] into a
 // google.protobuf.OneofDescriptorProto message.
 func ToOneofDescriptorProto(oneof protoreflect.OneofDescriptor) *descriptorpb.OneofDescriptorProto {
 	return &descriptorpb.OneofDescriptorProto{
@@ -177,7 +177,7 @@ func ToOneofDescriptorProto(oneof protoreflect.OneofDescriptor) *descriptorpb.On
 	}
 }
 
-// ToEnumDescriptorProto copies a protoreflect.EnumDescriptor into a
+// ToEnumDescriptorProto copies a [protoreflect.EnumDescriptor] into a
 // google.protobuf.EnumDescriptorProto message.
 func ToEnumDescriptorProto(enum protoreflect.EnumDescriptor) *descriptorpb.EnumDescriptorProto {
 	p := &descriptorpb.EnumDescriptorProto{
@@ -200,7 +200,7 @@ func ToEnumDescriptorProto(enum protoreflect.EnumDescriptor) *descriptorpb.EnumD
 	return p
 }
 
-// ToEnumValueDescriptorProto copies a protoreflect.EnumValueDescriptor into a
+// ToEnumValueDescriptorProto copies a [protoreflect.EnumValueDescriptor] into a
 // google.protobuf.EnumValueDescriptorProto message.
 func ToEnumValueDescriptorProto(value protoreflect.EnumValueDescriptor) *descriptorpb.EnumValueDescriptorProto {
 	return &descriptorpb.EnumValueDescriptorProto{
@@ -210,7 +210,7 @@ func ToEnumValueDescriptorProto(value protoreflect.EnumValueDescriptor) *descrip
 	}
 }
 
-// ToServiceDescriptorProto copies a protoreflect.ServiceDescriptor into a
+// ToServiceDescriptorProto copies a [protoreflect.ServiceDescriptor] into a
 // google.protobuf.ServiceDescriptorProto message.
 func ToServiceDescriptorProto(service protoreflect.ServiceDescriptor) *descriptorpb.ServiceDescriptorProto {
 	p := &descriptorpb.ServiceDescriptorProto{
@@ -223,7 +223,7 @@ func ToServiceDescriptorProto(service protoreflect.ServiceDescriptor) *descripto
 	return p
 }
 
-// ToMethodDescriptorProto copies a protoreflect.MethodDescriptor into a
+// ToMethodDescriptorProto copies a [protoreflect.MethodDescriptor] into a
 // google.protobuf.MethodDescriptorProto message.
 func ToMethodDescriptorProto(method protoreflect.MethodDescriptor) *descriptorpb.MethodDescriptorProto {
 	p := &descriptorpb.MethodDescriptorProto{
diff --git a/vendor/google.golang.org/protobuf/reflect/protodesc/ya.make b/vendor/google.golang.org/protobuf/reflect/protodesc/ya.make
index 2a4f165b315..20d7db31362 100644
--- a/vendor/google.golang.org/protobuf/reflect/protodesc/ya.make
+++ b/vendor/google.golang.org/protobuf/reflect/protodesc/ya.make
@@ -7,11 +7,10 @@ SRCS(
     desc_init.go
     desc_resolve.go
     desc_validate.go
+    editions.go
     proto.go
 )
 
-GO_TEST_SRCS(file_test.go)
+GO_EMBED_PATTERN(editions_defaults.binpb)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/reflect/protopath/path.go b/vendor/google.golang.org/protobuf/reflect/protopath/path.go
index 91562a82136..fffac00ebce 100644
--- a/vendor/google.golang.org/protobuf/reflect/protopath/path.go
+++ b/vendor/google.golang.org/protobuf/reflect/protopath/path.go
@@ -17,14 +17,14 @@ import (
 // where you would like to "address" some value in a message with just the path
 // and don't have the value information available.
 //
-// This is different from how "github.com/google/go-cmp/cmp".Path operates,
+// This is different from how github.com/google/go-cmp/cmp.Path operates,
 // which combines both path and value information together.
 // Since the cmp package itself is the only one ever constructing a cmp.Path,
 // it will always have the value available.
 
 // Path is a sequence of protobuf reflection steps applied to some root
 // protobuf message value to arrive at the current value.
-// The first step must be a Root step.
+// The first step must be a [Root] step.
 type Path []Step
 
 // TODO: Provide a Parse function that parses something similar to or
@@ -55,8 +55,8 @@ func (p Path) String() string {
 }
 
 // Values is a Path paired with a sequence of values at each step.
-// The lengths of Path and Values must be identical.
-// The first step must be a Root step and
+// The lengths of [Values.Path] and [Values.Values] must be identical.
+// The first step must be a [Root] step and
 // the first value must be a concrete message value.
 type Values struct {
 	Path   Path
diff --git a/vendor/google.golang.org/protobuf/reflect/protorange/example_test.go b/vendor/google.golang.org/protobuf/reflect/protorange/example_test.go
deleted file mode 100644
index 90ceec6c2de..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protorange/example_test.go
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protorange_test
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protopath"
-	"google.golang.org/protobuf/reflect/protorange"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protopack"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	newspb "google.golang.org/protobuf/internal/testprotos/news"
-)
-
-func init() {
-	detrand.Disable()
-}
-
-func mustMarshal(m proto.Message) []byte {
-	b, err := proto.Marshal(m)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-// Range through every message and clear the unknown fields.
-func Example_discardUnknown() {
-	// Populate the article with unknown fields.
-	m := &newspb.Article{}
-	m.ProtoReflect().SetUnknown(protopack.Message{
-		protopack.Tag{1000, protopack.BytesType}, protopack.String("Hello, world!"),
-	}.Marshal())
-	fmt.Println("has unknown fields?", len(m.ProtoReflect().GetUnknown()) > 0)
-
-	// Range through the message and clear all unknown fields.
-	fmt.Println("clear unknown fields")
-	protorange.Range(m.ProtoReflect(), func(proto protopath.Values) error {
-		m, ok := proto.Index(-1).Value.Interface().(protoreflect.Message)
-		if ok && len(m.GetUnknown()) > 0 {
-			m.SetUnknown(nil)
-		}
-		return nil
-	})
-	fmt.Println("has unknown fields?", len(m.ProtoReflect().GetUnknown()) > 0)
-
-	// Output:
-	// has unknown fields? true
-	// clear unknown fields
-	// has unknown fields? false
-}
-
-// Print the relative paths as Range iterates through a message
-// in a depth-first order.
-func Example_printPaths() {
-	m := &newspb.Article{
-		Author:  "Russ Cox",
-		Date:    timestamppb.New(time.Date(2019, time.November, 8, 0, 0, 0, 0, time.UTC)),
-		Title:   "Go Turns 10",
-		Content: "Happy birthday, Go! This weekend we celebrate the 10th anniversary of the Go release...",
-		Status:  newspb.Article_PUBLISHED,
-		Tags:    []string{"community", "birthday"},
-		Attachments: []*anypb.Any{{
-			TypeUrl: "google.golang.org.BinaryAttachment",
-			Value: mustMarshal(&newspb.BinaryAttachment{
-				Name: "gopher-birthday.png",
-				Data: []byte("<binary data>"),
-			}),
-		}},
-	}
-
-	// Traverse over all reachable values and print the path.
-	protorange.Range(m.ProtoReflect(), func(p protopath.Values) error {
-		fmt.Println(p.Path[1:])
-		return nil
-	})
-
-	// Output:
-	// .author
-	// .date
-	// .date.seconds
-	// .title
-	// .content
-	// .status
-	// .tags
-	// .tags[0]
-	// .tags[1]
-	// .attachments
-	// .attachments[0]
-	// .attachments[0].(google.golang.org.BinaryAttachment)
-	// .attachments[0].(google.golang.org.BinaryAttachment).name
-	// .attachments[0].(google.golang.org.BinaryAttachment).data
-}
-
-// Implement a basic text formatter by ranging through all populated values
-// in a message in depth-first order.
-func Example_formatText() {
-	m := &newspb.Article{
-		Author:  "Brad Fitzpatrick",
-		Date:    timestamppb.New(time.Date(2018, time.February, 16, 0, 0, 0, 0, time.UTC)),
-		Title:   "Go 1.10 is released",
-		Content: "Happy Friday, happy weekend! Today the Go team is happy to announce the release of Go 1.10...",
-		Status:  newspb.Article_PUBLISHED,
-		Tags:    []string{"go1.10", "release"},
-		Attachments: []*anypb.Any{{
-			TypeUrl: "google.golang.org.KeyValueAttachment",
-			Value: mustMarshal(&newspb.KeyValueAttachment{
-				Name: "checksums.txt",
-				Data: map[string]string{
-					"go1.10.src.tar.gz":         "07cbb9d0091b846c6aea40bf5bc0cea7",
-					"go1.10.darwin-amd64.pkg":   "cbb38bb6ff6ea86279e01745984445bf",
-					"go1.10.linux-amd64.tar.gz": "6b3d0e4a5c77352cf4275573817f7566",
-					"go1.10.windows-amd64.msi":  "57bda02030f58f5d2bf71943e1390123",
-				},
-			}),
-		}},
-	}
-
-	// Print a message in a humanly readable format.
-	var indent []byte
-	protorange.Options{
-		Stable: true,
-	}.Range(m.ProtoReflect(),
-		func(p protopath.Values) error {
-			// Print the key.
-			var fd protoreflect.FieldDescriptor
-			last := p.Index(-1)
-			beforeLast := p.Index(-2)
-			switch last.Step.Kind() {
-			case protopath.FieldAccessStep:
-				fd = last.Step.FieldDescriptor()
-				fmt.Printf("%s%s: ", indent, fd.Name())
-			case protopath.ListIndexStep:
-				fd = beforeLast.Step.FieldDescriptor() // lists always appear in the context of a repeated field
-				fmt.Printf("%s%d: ", indent, last.Step.ListIndex())
-			case protopath.MapIndexStep:
-				fd = beforeLast.Step.FieldDescriptor() // maps always appear in the context of a repeated field
-				fmt.Printf("%s%v: ", indent, last.Step.MapIndex().Interface())
-			case protopath.AnyExpandStep:
-				fmt.Printf("%s[%v]: ", indent, last.Value.Message().Descriptor().FullName())
-			case protopath.UnknownAccessStep:
-				fmt.Printf("%s?: ", indent)
-			}
-
-			// Starting printing the value.
-			switch v := last.Value.Interface().(type) {
-			case protoreflect.Message:
-				fmt.Printf("{\n")
-				indent = append(indent, '\t')
-			case protoreflect.List:
-				fmt.Printf("[\n")
-				indent = append(indent, '\t')
-			case protoreflect.Map:
-				fmt.Printf("{\n")
-				indent = append(indent, '\t')
-			case protoreflect.EnumNumber:
-				var ev protoreflect.EnumValueDescriptor
-				if fd != nil {
-					ev = fd.Enum().Values().ByNumber(v)
-				}
-				if ev != nil {
-					fmt.Printf("%v\n", ev.Name())
-				} else {
-					fmt.Printf("%v\n", v)
-				}
-			case string, []byte:
-				fmt.Printf("%q\n", v)
-			default:
-				fmt.Printf("%v\n", v)
-			}
-			return nil
-		},
-		func(p protopath.Values) error {
-			// Finish printing the value.
-			last := p.Index(-1)
-			switch last.Value.Interface().(type) {
-			case protoreflect.Message:
-				indent = indent[:len(indent)-1]
-				fmt.Printf("%s}\n", indent)
-			case protoreflect.List:
-				indent = indent[:len(indent)-1]
-				fmt.Printf("%s]\n", indent)
-			case protoreflect.Map:
-				indent = indent[:len(indent)-1]
-				fmt.Printf("%s}\n", indent)
-			}
-			return nil
-		},
-	)
-
-	// Output:
-	// {
-	// 	author: "Brad Fitzpatrick"
-	// 	date: {
-	// 		seconds: 1518739200
-	// 	}
-	// 	title: "Go 1.10 is released"
-	// 	content: "Happy Friday, happy weekend! Today the Go team is happy to announce the release of Go 1.10..."
-	// 	attachments: [
-	// 		0: {
-	// 			[google.golang.org.KeyValueAttachment]: {
-	// 				name: "checksums.txt"
-	// 				data: {
-	//					go1.10.darwin-amd64.pkg: "cbb38bb6ff6ea86279e01745984445bf"
-	//					go1.10.linux-amd64.tar.gz: "6b3d0e4a5c77352cf4275573817f7566"
-	//					go1.10.src.tar.gz: "07cbb9d0091b846c6aea40bf5bc0cea7"
-	//					go1.10.windows-amd64.msi: "57bda02030f58f5d2bf71943e1390123"
-	// 				}
-	// 			}
-	// 		}
-	// 	]
-	// 	tags: [
-	// 		0: "go1.10"
-	// 		1: "release"
-	// 	]
-	// 	status: PUBLISHED
-	// }
-}
-
-// Scan all protobuf string values for a sensitive word and replace it with
-// a suitable alternative.
-func Example_sanitizeStrings() {
-	m := &newspb.Article{
-		Author:  "Hermione Granger",
-		Date:    timestamppb.New(time.Date(1998, time.May, 2, 0, 0, 0, 0, time.UTC)),
-		Title:   "Harry Potter vanquishes Voldemort once and for all!",
-		Content: "In a final duel between Harry Potter and Lord Voldemort earlier this evening...",
-		Tags:    []string{"HarryPotter", "LordVoldemort"},
-		Attachments: []*anypb.Any{{
-			TypeUrl: "google.golang.org.KeyValueAttachment",
-			Value: mustMarshal(&newspb.KeyValueAttachment{
-				Name: "aliases.txt",
-				Data: map[string]string{
-					"Harry Potter": "The Boy Who Lived",
-					"Tom Riddle":   "Lord Voldemort",
-				},
-			}),
-		}},
-	}
-
-	protorange.Range(m.ProtoReflect(), func(p protopath.Values) error {
-		const (
-			sensitive   = "Voldemort"
-			alternative = "[He-Who-Must-Not-Be-Named]"
-		)
-
-		// Check if there is a sensitive word to redact.
-		last := p.Index(-1)
-		s, ok := last.Value.Interface().(string)
-		if !ok || !strings.Contains(s, sensitive) {
-			return nil
-		}
-		s = strings.Replace(s, sensitive, alternative, -1)
-
-		// Store the redacted string back into the message.
-		beforeLast := p.Index(-2)
-		switch last.Step.Kind() {
-		case protopath.FieldAccessStep:
-			m := beforeLast.Value.Message()
-			fd := last.Step.FieldDescriptor()
-			m.Set(fd, protoreflect.ValueOfString(s))
-		case protopath.ListIndexStep:
-			ls := beforeLast.Value.List()
-			i := last.Step.ListIndex()
-			ls.Set(i, protoreflect.ValueOfString(s))
-		case protopath.MapIndexStep:
-			ms := beforeLast.Value.Map()
-			k := last.Step.MapIndex()
-			ms.Set(k, protoreflect.ValueOfString(s))
-		}
-		return nil
-	})
-
-	fmt.Println(protojson.Format(m))
-
-	// Output:
-	// {
-	//   "author": "Hermione Granger",
-	//   "date": "1998-05-02T00:00:00Z",
-	//   "title": "Harry Potter vanquishes [He-Who-Must-Not-Be-Named] once and for all!",
-	//   "content": "In a final duel between Harry Potter and Lord [He-Who-Must-Not-Be-Named] earlier this evening...",
-	//   "tags": [
-	//     "HarryPotter",
-	//     "Lord[He-Who-Must-Not-Be-Named]"
-	//   ],
-	//   "attachments": [
-	//     {
-	//       "@type": "google.golang.org.KeyValueAttachment",
-	//       "name": "aliases.txt",
-	//       "data": {
-	//         "Harry Potter": "The Boy Who Lived",
-	//         "Tom Riddle": "Lord [He-Who-Must-Not-Be-Named]"
-	//       }
-	//     }
-	//   ]
-	// }
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protorange/gotest/ya.make b/vendor/google.golang.org/protobuf/reflect/protorange/gotest/ya.make
deleted file mode 100644
index 261b6ab9e80..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protorange/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/reflect/protorange)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/reflect/protorange/range.go b/vendor/google.golang.org/protobuf/reflect/protorange/range.go
index 6f4c58bfb73..7a032758b51 100644
--- a/vendor/google.golang.org/protobuf/reflect/protorange/range.go
+++ b/vendor/google.golang.org/protobuf/reflect/protorange/range.go
@@ -30,7 +30,7 @@ var (
 
 // Range performs a depth-first traversal over reachable values in a message.
 //
-// See Options.Range for details.
+// See [Options.Range] for details.
 func Range(m protoreflect.Message, f func(protopath.Values) error) error {
 	return Options{}.Range(m, f, nil)
 }
@@ -61,33 +61,33 @@ type Options struct {
 }
 
 // Range performs a depth-first traversal over reachable values in a message.
-// The first push and the last pop are to push/pop a protopath.Root step.
-// If push or pop return any non-nil error (other than Break or Terminate),
+// The first push and the last pop are to push/pop a [protopath.Root] step.
+// If push or pop return any non-nil error (other than [Break] or [Terminate]),
 // it terminates the traversal and is returned by Range.
 //
 // The rules for traversing a message is as follows:
 //
-// • For messages, iterate over every populated known and extension field.
-// Each field is preceded by a push of a protopath.FieldAccess step,
-// followed by recursive application of the rules on the field value,
-// and succeeded by a pop of that step.
-// If the message has unknown fields, then push an protopath.UnknownAccess step
-// followed immediately by pop of that step.
+//   - For messages, iterate over every populated known and extension field.
+//     Each field is preceded by a push of a [protopath.FieldAccess] step,
+//     followed by recursive application of the rules on the field value,
+//     and succeeded by a pop of that step.
+//     If the message has unknown fields, then push an [protopath.UnknownAccess] step
+//     followed immediately by pop of that step.
 //
-// • As an exception to the above rule, if the current message is a
-// google.protobuf.Any message, expand the underlying message (if resolvable).
-// The expanded message is preceded by a push of a protopath.AnyExpand step,
-// followed by recursive application of the rules on the underlying message,
-// and succeeded by a pop of that step. Mutations to the expanded message
-// are written back to the Any message when popping back out.
+//   - As an exception to the above rule, if the current message is a
+//     google.protobuf.Any message, expand the underlying message (if resolvable).
+//     The expanded message is preceded by a push of a [protopath.AnyExpand] step,
+//     followed by recursive application of the rules on the underlying message,
+//     and succeeded by a pop of that step. Mutations to the expanded message
+//     are written back to the Any message when popping back out.
 //
-// • For lists, iterate over every element. Each element is preceded by a push
-// of a protopath.ListIndex step, followed by recursive application of the rules
-// on the list element, and succeeded by a pop of that step.
+//   - For lists, iterate over every element. Each element is preceded by a push
+//     of a [protopath.ListIndex] step, followed by recursive application of the rules
+//     on the list element, and succeeded by a pop of that step.
 //
-// • For maps, iterate over every entry. Each entry is preceded by a push
-// of a protopath.MapIndex step, followed by recursive application of the rules
-// on the map entry value, and succeeded by a pop of that step.
+//   - For maps, iterate over every entry. Each entry is preceded by a push
+//     of a [protopath.MapIndex] step, followed by recursive application of the rules
+//     on the map entry value, and succeeded by a pop of that step.
 //
 // Mutations should only be made to the last value, otherwise the effects on
 // traversal will be undefined. If the mutation is made to the last value
@@ -96,7 +96,7 @@ type Options struct {
 // populates a few fields in that message, then the newly modified fields
 // will be traversed.
 //
-// The protopath.Values provided to push functions is only valid until the
+// The [protopath.Values] provided to push functions is only valid until the
 // corresponding pop call and the values provided to a pop call is only valid
 // for the duration of the pop call itself.
 func (o Options) Range(m protoreflect.Message, push, pop func(protopath.Values) error) error {
diff --git a/vendor/google.golang.org/protobuf/reflect/protorange/range_test.go b/vendor/google.golang.org/protobuf/reflect/protorange/range_test.go
deleted file mode 100644
index a8ca6a0b623..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protorange/range_test.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protorange
-
-import (
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protopath"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	newspb "google.golang.org/protobuf/internal/testprotos/news"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-)
-
-func mustMarshal(m proto.Message) []byte {
-	b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-var transformReflectValue = cmp.Transformer("", func(v protoreflect.Value) interface{} {
-	switch v := v.Interface().(type) {
-	case protoreflect.Message:
-		return v.Interface()
-	case protoreflect.Map:
-		ms := map[interface{}]protoreflect.Value{}
-		v.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-			ms[k.Interface()] = v
-			return true
-		})
-		return ms
-	case protoreflect.List:
-		ls := []protoreflect.Value{}
-		for i := 0; i < v.Len(); i++ {
-			ls = append(ls, v.Get(i))
-		}
-		return ls
-	default:
-		return v
-	}
-})
-
-func TestRange(t *testing.T) {
-	m2 := (&newspb.KeyValueAttachment{
-		Name: "checksums.txt",
-		Data: map[string]string{
-			"go1.10.src.tar.gz":         "07cbb9d0091b846c6aea40bf5bc0cea7",
-			"go1.10.darwin-amd64.pkg":   "cbb38bb6ff6ea86279e01745984445bf",
-			"go1.10.linux-amd64.tar.gz": "6b3d0e4a5c77352cf4275573817f7566",
-			"go1.10.windows-amd64.msi":  "57bda02030f58f5d2bf71943e1390123",
-		},
-	}).ProtoReflect()
-	m := (&newspb.Article{
-		Author:  "Brad Fitzpatrick",
-		Date:    timestamppb.New(time.Date(2018, time.February, 16, 0, 0, 0, 0, time.UTC)),
-		Title:   "Go 1.10 is released",
-		Content: "Happy Friday, happy weekend! Today the Go team is happy to announce the release of Go 1.10...",
-		Status:  newspb.Article_PUBLISHED,
-		Tags:    []string{"go1.10", "release"},
-		Attachments: []*anypb.Any{{
-			TypeUrl: "google.golang.org.KeyValueAttachment",
-			Value:   mustMarshal(m2.Interface()),
-		}},
-	}).ProtoReflect()
-
-	// Nil push and pop functions should not panic.
-	noop := func(protopath.Values) error { return nil }
-	Options{}.Range(m, nil, nil)
-	Options{}.Range(m, noop, nil)
-	Options{}.Range(m, nil, noop)
-
-	getByName := func(m protoreflect.Message, s protoreflect.Name) protoreflect.Value {
-		fds := m.Descriptor().Fields()
-		return m.Get(fds.ByName(s))
-	}
-
-	wantPaths := []string{
-		``,
-		`.author`,
-		`.date`,
-		`.date.seconds`,
-		`.title`,
-		`.content`,
-		`.attachments`,
-		`.attachments[0]`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment)`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).name`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).data`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).data["go1.10.darwin-amd64.pkg"]`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).data["go1.10.linux-amd64.tar.gz"]`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).data["go1.10.src.tar.gz"]`,
-		`.attachments[0].(google.golang.org.KeyValueAttachment).data["go1.10.windows-amd64.msi"]`,
-		`.tags`,
-		`.tags[0]`,
-		`.tags[1]`,
-		`.status`,
-	}
-	wantValues := []protoreflect.Value{
-		protoreflect.ValueOfMessage(m),
-		getByName(m, "author"),
-		getByName(m, "date"),
-		getByName(getByName(m, "date").Message(), "seconds"),
-		getByName(m, `title`),
-		getByName(m, `content`),
-		getByName(m, `attachments`),
-		getByName(m, `attachments`).List().Get(0),
-		protoreflect.ValueOfMessage(m2),
-		getByName(m2, `name`),
-		getByName(m2, `data`),
-		getByName(m2, `data`).Map().Get(protoreflect.ValueOfString("go1.10.darwin-amd64.pkg").MapKey()),
-		getByName(m2, `data`).Map().Get(protoreflect.ValueOfString("go1.10.linux-amd64.tar.gz").MapKey()),
-		getByName(m2, `data`).Map().Get(protoreflect.ValueOfString("go1.10.src.tar.gz").MapKey()),
-		getByName(m2, `data`).Map().Get(protoreflect.ValueOfString("go1.10.windows-amd64.msi").MapKey()),
-		getByName(m, `tags`),
-		getByName(m, `tags`).List().Get(0),
-		getByName(m, `tags`).List().Get(1),
-		getByName(m, `status`),
-	}
-
-	tests := []struct {
-		resolver interface {
-			protoregistry.ExtensionTypeResolver
-			protoregistry.MessageTypeResolver
-		}
-
-		errorAt     int
-		breakAt     int
-		terminateAt int
-
-		wantPaths  []string
-		wantValues []protoreflect.Value
-		wantError  error
-	}{{
-		wantPaths:  wantPaths,
-		wantValues: wantValues,
-	}, {
-		resolver: (*protoregistry.Types)(nil),
-		wantPaths: append(append(wantPaths[:8:8],
-			`.attachments[0].type_url`,
-			`.attachments[0].value`,
-		), wantPaths[15:]...),
-		wantValues: append(append(wantValues[:8:8],
-			protoreflect.ValueOfString("google.golang.org.KeyValueAttachment"),
-			protoreflect.ValueOfBytes(mustMarshal(m2.Interface())),
-		), wantValues[15:]...),
-	}, {
-		errorAt:    5, // return error within newspb.Article
-		wantPaths:  wantPaths[:5],
-		wantValues: wantValues[:5],
-		wantError:  cmpopts.AnyError,
-	}, {
-		terminateAt: 11, // terminate within newspb.KeyValueAttachment
-		wantPaths:   wantPaths[:11],
-		wantValues:  wantValues[:11],
-	}, {
-		breakAt:    11, // break within newspb.KeyValueAttachment
-		wantPaths:  append(wantPaths[:11:11], wantPaths[15:]...),
-		wantValues: append(wantValues[:11:11], wantValues[15:]...),
-	}, {
-		errorAt:    17, // return error within newspb.Article.Tags
-		wantPaths:  wantPaths[:17],
-		wantValues: wantValues[:17],
-		wantError:  cmpopts.AnyError,
-	}, {
-		breakAt:    17, // break within newspb.Article.Tags
-		wantPaths:  append(wantPaths[:17:17], wantPaths[18:]...),
-		wantValues: append(wantValues[:17:17], wantValues[18:]...),
-	}, {
-		terminateAt: 17, // terminate within newspb.Article.Tags
-		wantPaths:   wantPaths[:17],
-		wantValues:  wantValues[:17],
-	}, {
-		errorAt:    13, // return error within newspb.KeyValueAttachment.Data
-		wantPaths:  wantPaths[:13],
-		wantValues: wantValues[:13],
-		wantError:  cmpopts.AnyError,
-	}, {
-		breakAt:    13, // break within newspb.KeyValueAttachment.Data
-		wantPaths:  append(wantPaths[:13:13], wantPaths[15:]...),
-		wantValues: append(wantValues[:13:13], wantValues[15:]...),
-	}, {
-		terminateAt: 13, // terminate within newspb.KeyValueAttachment.Data
-		wantPaths:   wantPaths[:13],
-		wantValues:  wantValues[:13],
-	}}
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			var gotPaths []string
-			var gotValues []protoreflect.Value
-			var stackPaths []string
-			var stackValues []protoreflect.Value
-			gotError := Options{
-				Stable:   true,
-				Resolver: tt.resolver,
-			}.Range(m,
-				func(p protopath.Values) error {
-					gotPaths = append(gotPaths, p.Path[1:].String())
-					stackPaths = append(stackPaths, p.Path[1:].String())
-					gotValues = append(gotValues, p.Index(-1).Value)
-					stackValues = append(stackValues, p.Index(-1).Value)
-					switch {
-					case tt.errorAt > 0 && tt.errorAt == len(gotPaths):
-						return cmpopts.AnyError
-					case tt.breakAt > 0 && tt.breakAt == len(gotPaths):
-						return Break
-					case tt.terminateAt > 0 && tt.terminateAt == len(gotPaths):
-						return Terminate
-					default:
-						return nil
-					}
-				},
-				func(p protopath.Values) error {
-					gotPath := p.Path[1:].String()
-					wantPath := stackPaths[len(stackPaths)-1]
-					if wantPath != gotPath {
-						t.Errorf("%d: pop path mismatch: got %v, want %v", len(gotPaths), gotPath, wantPath)
-					}
-					gotValue := p.Index(-1).Value
-					wantValue := stackValues[len(stackValues)-1]
-					if diff := cmp.Diff(wantValue, gotValue, transformReflectValue, protocmp.Transform()); diff != "" {
-						t.Errorf("%d: pop value mismatch (-want +got):\n%v", len(gotValues), diff)
-					}
-					stackPaths = stackPaths[:len(stackPaths)-1]
-					stackValues = stackValues[:len(stackValues)-1]
-					return nil
-				},
-			)
-			if n := len(stackPaths) + len(stackValues); n > 0 {
-				t.Errorf("stack mismatch: got %d unpopped items", n)
-			}
-			if diff := cmp.Diff(tt.wantPaths, gotPaths); diff != "" {
-				t.Errorf("paths mismatch (-want +got):\n%s", diff)
-			}
-			if diff := cmp.Diff(tt.wantValues, gotValues, transformReflectValue, protocmp.Transform()); diff != "" {
-				t.Errorf("values mismatch (-want +got):\n%s", diff)
-			}
-			if !cmp.Equal(gotError, tt.wantError, cmpopts.EquateErrors()) {
-				t.Errorf("error mismatch: got %v, want %v", gotError, tt.wantError)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protorange/ya.make b/vendor/google.golang.org/protobuf/reflect/protorange/ya.make
index 29c6345337e..fc294f2b0e2 100644
--- a/vendor/google.golang.org/protobuf/reflect/protorange/ya.make
+++ b/vendor/google.golang.org/protobuf/reflect/protorange/ya.make
@@ -2,12 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(range.go)
-
-GO_TEST_SRCS(range_test.go)
-
-GO_XTEST_SRCS(example_test.go)
+SRCS(
+    range.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/gotest/ya.make b/vendor/google.golang.org/protobuf/reflect/protoreflect/gotest/ya.make
deleted file mode 100644
index 5638b146783..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/reflect/protoreflect)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go
index 55aa14922b0..ec6572dfda9 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/proto.go
@@ -10,46 +10,46 @@
 //
 // # Protocol Buffer Descriptors
 //
-// Protobuf descriptors (e.g., EnumDescriptor or MessageDescriptor)
+// Protobuf descriptors (e.g., [EnumDescriptor] or [MessageDescriptor])
 // are immutable objects that represent protobuf type information.
 // They are wrappers around the messages declared in descriptor.proto.
 // Protobuf descriptors alone lack any information regarding Go types.
 //
-// Enums and messages generated by this module implement Enum and ProtoMessage,
+// Enums and messages generated by this module implement [Enum] and [ProtoMessage],
 // where the Descriptor and ProtoReflect.Descriptor accessors respectively
 // return the protobuf descriptor for the values.
 //
 // The protobuf descriptor interfaces are not meant to be implemented by
 // user code since they might need to be extended in the future to support
 // additions to the protobuf language.
-// The "google.golang.org/protobuf/reflect/protodesc" package converts between
+// The [google.golang.org/protobuf/reflect/protodesc] package converts between
 // google.protobuf.DescriptorProto messages and protobuf descriptors.
 //
 // # Go Type Descriptors
 //
-// A type descriptor (e.g., EnumType or MessageType) is a constructor for
+// A type descriptor (e.g., [EnumType] or [MessageType]) is a constructor for
 // a concrete Go type that represents the associated protobuf descriptor.
 // There is commonly a one-to-one relationship between protobuf descriptors and
 // Go type descriptors, but it can potentially be a one-to-many relationship.
 //
-// Enums and messages generated by this module implement Enum and ProtoMessage,
+// Enums and messages generated by this module implement [Enum] and [ProtoMessage],
 // where the Type and ProtoReflect.Type accessors respectively
 // return the protobuf descriptor for the values.
 //
-// The "google.golang.org/protobuf/types/dynamicpb" package can be used to
+// The [google.golang.org/protobuf/types/dynamicpb] package can be used to
 // create Go type descriptors from protobuf descriptors.
 //
 // # Value Interfaces
 //
-// The Enum and Message interfaces provide a reflective view over an
+// The [Enum] and [Message] interfaces provide a reflective view over an
 // enum or message instance. For enums, it provides the ability to retrieve
 // the enum value number for any concrete enum type. For messages, it provides
 // the ability to access or manipulate fields of the message.
 //
-// To convert a proto.Message to a protoreflect.Message, use the
+// To convert a [google.golang.org/protobuf/proto.Message] to a [protoreflect.Message], use the
 // former's ProtoReflect method. Since the ProtoReflect method is new to the
 // v2 message interface, it may not be present on older message implementations.
-// The "github.com/golang/protobuf/proto".MessageReflect function can be used
+// The [github.com/golang/protobuf/proto.MessageReflect] function can be used
 // to obtain a reflective view on older messages.
 //
 // # Relationships
@@ -71,12 +71,12 @@
 //	      │                                 │
 //	      └────────────────── Type() ───────┘
 //
-// • An EnumType describes a concrete Go enum type.
+// • An [EnumType] describes a concrete Go enum type.
 // It has an EnumDescriptor and can construct an Enum instance.
 //
-// • An EnumDescriptor describes an abstract protobuf enum type.
+// • An [EnumDescriptor] describes an abstract protobuf enum type.
 //
-// • An Enum is a concrete enum instance. Generated enums implement Enum.
+// • An [Enum] is a concrete enum instance. Generated enums implement Enum.
 //
 //	  ┌──────────────── New() ─────────────────┐
 //	  │                                        │
@@ -90,24 +90,26 @@
 //	       │                                    │
 //	       └─────────────────── Type() ─────────┘
 //
-// • A MessageType describes a concrete Go message type.
-// It has a MessageDescriptor and can construct a Message instance.
-// Just as how Go's reflect.Type is a reflective description of a Go type,
-// a MessageType is a reflective description of a Go type for a protobuf message.
+// • A [MessageType] describes a concrete Go message type.
+// It has a [MessageDescriptor] and can construct a [Message] instance.
+// Just as how Go's [reflect.Type] is a reflective description of a Go type,
+// a [MessageType] is a reflective description of a Go type for a protobuf message.
 //
-// • A MessageDescriptor describes an abstract protobuf message type.
-// It has no understanding of Go types. In order to construct a MessageType
-// from just a MessageDescriptor, you can consider looking up the message type
-// in the global registry using protoregistry.GlobalTypes.FindMessageByName
-// or constructing a dynamic MessageType using dynamicpb.NewMessageType.
+// • A [MessageDescriptor] describes an abstract protobuf message type.
+// It has no understanding of Go types. In order to construct a [MessageType]
+// from just a [MessageDescriptor], you can consider looking up the message type
+// in the global registry using the FindMessageByName method on
+// [google.golang.org/protobuf/reflect/protoregistry.GlobalTypes]
+// or constructing a dynamic [MessageType] using
+// [google.golang.org/protobuf/types/dynamicpb.NewMessageType].
 //
-// • A Message is a reflective view over a concrete message instance.
-// Generated messages implement ProtoMessage, which can convert to a Message.
-// Just as how Go's reflect.Value is a reflective view over a Go value,
-// a Message is a reflective view over a concrete protobuf message instance.
-// Using Go reflection as an analogy, the ProtoReflect method is similar to
-// calling reflect.ValueOf, and the Message.Interface method is similar to
-// calling reflect.Value.Interface.
+// • A [Message] is a reflective view over a concrete message instance.
+// Generated messages implement [ProtoMessage], which can convert to a [Message].
+// Just as how Go's [reflect.Value] is a reflective view over a Go value,
+// a [Message] is a reflective view over a concrete protobuf message instance.
+// Using Go reflection as an analogy, the [ProtoMessage.ProtoReflect] method is similar to
+// calling [reflect.ValueOf], and the [Message.Interface] method is similar to
+// calling [reflect.Value.Interface].
 //
 //	      ┌── TypeDescriptor() ──┐    ┌───── Descriptor() ─────┐
 //	      │                      V    │                        V
@@ -119,15 +121,15 @@
 //	                                 │                          │
 //	                                 └────── implements ────────┘
 //
-// • An ExtensionType describes a concrete Go implementation of an extension.
-// It has an ExtensionTypeDescriptor and can convert to/from
-// abstract Values and Go values.
+// • An [ExtensionType] describes a concrete Go implementation of an extension.
+// It has an [ExtensionTypeDescriptor] and can convert to/from
+// an abstract [Value] and a Go value.
 //
-// • An ExtensionTypeDescriptor is an ExtensionDescriptor
-// which also has an ExtensionType.
+// • An [ExtensionTypeDescriptor] is an [ExtensionDescriptor]
+// which also has an [ExtensionType].
 //
-// • An ExtensionDescriptor describes an abstract protobuf extension field and
-// may not always be an ExtensionTypeDescriptor.
+// • An [ExtensionDescriptor] describes an abstract protobuf extension field and
+// may not always be an [ExtensionTypeDescriptor].
 package protoreflect
 
 import (
@@ -142,7 +144,7 @@ type doNotImplement pragma.DoNotImplement
 
 // ProtoMessage is the top-level interface that all proto messages implement.
 // This is declared in the protoreflect package to avoid a cyclic dependency;
-// use the proto.Message type instead, which aliases this type.
+// use the [google.golang.org/protobuf/proto.Message] type instead, which aliases this type.
 type ProtoMessage interface{ ProtoReflect() Message }
 
 // Syntax is the language version of the proto file.
@@ -151,8 +153,9 @@ type Syntax syntax
 type syntax int8 // keep exact type opaque as the int type may change
 
 const (
-	Proto2 Syntax = 2
-	Proto3 Syntax = 3
+	Proto2   Syntax = 2
+	Proto3   Syntax = 3
+	Editions Syntax = 4
 )
 
 // IsValid reports whether the syntax is valid.
@@ -436,7 +439,7 @@ type Names interface {
 // FullName is a qualified name that uniquely identifies a proto declaration.
 // A qualified name is the concatenation of the proto package along with the
 // fully-declared name (i.e., name of parent preceding the name of the child),
-// with a '.' delimiter placed between each Name.
+// with a '.' delimiter placed between each [Name].
 //
 // This should not have any leading or trailing dots.
 type FullName string // e.g., "google.protobuf.Field.Kind"
@@ -480,7 +483,7 @@ func isLetterDigit(c byte) bool {
 }
 
 // Name returns the short name, which is the last identifier segment.
-// A single segment FullName is the Name itself.
+// A single segment FullName is the [Name] itself.
 func (n FullName) Name() Name {
 	if i := strings.LastIndexByte(string(n), '.'); i >= 0 {
 		return Name(n[i+1:])
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/proto_test.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/proto_test.go
deleted file mode 100644
index 97e55ccbbb1..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/proto_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protoreflect
-
-import "testing"
-
-func TestNameIsValid(t *testing.T) {
-	tests := []struct {
-		in   Name
-		want bool
-	}{
-		{"", false},
-		{"a", true},
-		{".", false},
-		{"_", true}, // odd, but permitted by protoc
-		{".foo", false},
-		{"foo.", false},
-		{"foo", true},
-		{"one1_two2_three3", true},
-		{"1one", false},
-	}
-
-	for _, tt := range tests {
-		if got := tt.in.IsValid(); got != tt.want {
-			t.Errorf("Name(%q).IsValid() = %v, want %v", tt.in, got, tt.want)
-		}
-	}
-}
-
-func TestFullNameIsValid(t *testing.T) {
-	tests := []struct {
-		in   FullName
-		want bool
-	}{
-		{"", false},
-		{"a", true},
-		{"a.b", true},
-		{"a.b.c", true},
-		{".", false},
-		{"_._._", true}, // odd, but permitted by protoc
-		{".foo", false},
-		{"foo.", false},
-		{"foo", true},
-		{"one1_two2_three3", true},
-		{"one1.two2.three3", true},
-		{".one1.two2.three3", false},
-		{"one1.two2.three3.", false},
-		{"foo.1one", false},
-	}
-
-	for _, tt := range tests {
-		if got := tt.in.IsValid(); got != tt.want {
-			t.Errorf("Name(%q).IsValid() = %v, want %v", tt.in, got, tt.want)
-		}
-	}
-}
-
-func TestNameAppend(t *testing.T) {
-	tests := []FullName{
-		"",
-		"a",
-		"a.b",
-		"a.b.c",
-		"one1.two2.three3",
-	}
-
-	for _, tt := range tests {
-		if got := tt.Parent().Append(tt.Name()); got != tt {
-			t.Errorf("FullName.Parent().Append(FullName.Name()) = %q, want %q", got, tt)
-		}
-	}
-}
-
-var sink bool
-
-func BenchmarkFullNameIsValid(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sink = FullName("google.protobuf.Any").IsValid()
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
index 717b106f3da..0c045db6ab6 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
@@ -35,7 +35,7 @@ func (p *SourcePath) appendFileDescriptorProto(b []byte) []byte {
 		b = p.appendSingularField(b, "source_code_info", (*SourcePath).appendSourceCodeInfo)
 	case 12:
 		b = p.appendSingularField(b, "syntax", nil)
-	case 13:
+	case 14:
 		b = p.appendSingularField(b, "edition", nil)
 	}
 	return b
@@ -180,6 +180,8 @@ func (p *SourcePath) appendFileOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "php_metadata_namespace", nil)
 	case 45:
 		b = p.appendSingularField(b, "ruby_package", nil)
+	case 50:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -240,6 +242,8 @@ func (p *SourcePath) appendMessageOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "map_entry", nil)
 	case 11:
 		b = p.appendSingularField(b, "deprecated_legacy_json_field_conflicts", nil)
+	case 12:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -285,6 +289,8 @@ func (p *SourcePath) appendEnumOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "deprecated", nil)
 	case 6:
 		b = p.appendSingularField(b, "deprecated_legacy_json_field_conflicts", nil)
+	case 7:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -330,6 +336,8 @@ func (p *SourcePath) appendServiceOptions(b []byte) []byte {
 		return b
 	}
 	switch (*p)[0] {
+	case 34:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 33:
 		b = p.appendSingularField(b, "deprecated", nil)
 	case 999:
@@ -361,16 +369,39 @@ func (p *SourcePath) appendFieldOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "debug_redact", nil)
 	case 17:
 		b = p.appendSingularField(b, "retention", nil)
-	case 18:
-		b = p.appendSingularField(b, "target", nil)
 	case 19:
 		b = p.appendRepeatedField(b, "targets", nil)
+	case 20:
+		b = p.appendRepeatedField(b, "edition_defaults", (*SourcePath).appendFieldOptions_EditionDefault)
+	case 21:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
 	return b
 }
 
+func (p *SourcePath) appendFeatureSet(b []byte) []byte {
+	if len(*p) == 0 {
+		return b
+	}
+	switch (*p)[0] {
+	case 1:
+		b = p.appendSingularField(b, "field_presence", nil)
+	case 2:
+		b = p.appendSingularField(b, "enum_type", nil)
+	case 3:
+		b = p.appendSingularField(b, "repeated_field_encoding", nil)
+	case 4:
+		b = p.appendSingularField(b, "utf8_validation", nil)
+	case 5:
+		b = p.appendSingularField(b, "message_encoding", nil)
+	case 6:
+		b = p.appendSingularField(b, "json_format", nil)
+	}
+	return b
+}
+
 func (p *SourcePath) appendUninterpretedOption(b []byte) []byte {
 	if len(*p) == 0 {
 		return b
@@ -422,6 +453,8 @@ func (p *SourcePath) appendExtensionRangeOptions(b []byte) []byte {
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	case 2:
 		b = p.appendRepeatedField(b, "declaration", (*SourcePath).appendExtensionRangeOptions_Declaration)
+	case 50:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 3:
 		b = p.appendSingularField(b, "verification", nil)
 	}
@@ -433,6 +466,8 @@ func (p *SourcePath) appendOneofOptions(b []byte) []byte {
 		return b
 	}
 	switch (*p)[0] {
+	case 1:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -446,6 +481,10 @@ func (p *SourcePath) appendEnumValueOptions(b []byte) []byte {
 	switch (*p)[0] {
 	case 1:
 		b = p.appendSingularField(b, "deprecated", nil)
+	case 2:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
+	case 3:
+		b = p.appendSingularField(b, "debug_redact", nil)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -461,12 +500,27 @@ func (p *SourcePath) appendMethodOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "deprecated", nil)
 	case 34:
 		b = p.appendSingularField(b, "idempotency_level", nil)
+	case 35:
+		b = p.appendSingularField(b, "features", (*SourcePath).appendFeatureSet)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
 	return b
 }
 
+func (p *SourcePath) appendFieldOptions_EditionDefault(b []byte) []byte {
+	if len(*p) == 0 {
+		return b
+	}
+	switch (*p)[0] {
+	case 3:
+		b = p.appendSingularField(b, "edition", nil)
+	case 2:
+		b = p.appendSingularField(b, "value", nil)
+	}
+	return b
+}
+
 func (p *SourcePath) appendUninterpretedOption_NamePart(b []byte) []byte {
 	if len(*p) == 0 {
 		return b
@@ -491,8 +545,6 @@ func (p *SourcePath) appendExtensionRangeOptions_Declaration(b []byte) []byte {
 		b = p.appendSingularField(b, "full_name", nil)
 	case 3:
 		b = p.appendSingularField(b, "type", nil)
-	case 4:
-		b = p.appendSingularField(b, "is_repeated", nil)
 	case 5:
 		b = p.appendSingularField(b, "reserved", nil)
 	case 6:
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_test.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_test.go
deleted file mode 100644
index 877ede59551..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protoreflect
-
-import "testing"
-
-func TestSourcePathString(t *testing.T) {
-	tests := []struct {
-		in   SourcePath
-		want string
-	}{
-		{nil, ""},
-		{SourcePath{}, ""},
-		{SourcePath{0}, ".0"},
-		{SourcePath{1}, ".name"},
-		{SourcePath{1, 1}, ".name.1"},
-		{SourcePath{1, 1, -2, 3}, ".name.1.-2.3"},
-		{SourcePath{3}, ".dependency"},
-		{SourcePath{3, 0}, ".dependency[0]"},
-		{SourcePath{3, -1}, ".dependency.-1"},
-		{SourcePath{3, 1, 2}, ".dependency[1].2"},
-		{SourcePath{4}, ".message_type"},
-		{SourcePath{4, 0}, ".message_type[0]"},
-		{SourcePath{4, -1}, ".message_type.-1"},
-		{SourcePath{4, 1, 0}, ".message_type[1].0"},
-		{SourcePath{4, 1, 1}, ".message_type[1].name"},
-	}
-	for _, tt := range tests {
-		if got := tt.in.String(); got != tt.want {
-			t.Errorf("SourcePath(%d).String() = %v, want %v", tt.in, got, tt.want)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/type.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
index 3867470d30a..60ff62b4c85 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/type.go
@@ -12,7 +12,7 @@ package protoreflect
 // exactly identical. However, it is possible for the same semantically
 // identical proto type to be represented by multiple type descriptors.
 //
-// For example, suppose we have t1 and t2 which are both MessageDescriptors.
+// For example, suppose we have t1 and t2 which are both an [MessageDescriptor].
 // If t1 == t2, then the types are definitely equal and all accessors return
 // the same information. However, if t1 != t2, then it is still possible that
 // they still represent the same proto type (e.g., t1.FullName == t2.FullName).
@@ -115,7 +115,7 @@ type Descriptor interface {
 // corresponds with the google.protobuf.FileDescriptorProto message.
 //
 // Top-level declarations:
-// EnumDescriptor, MessageDescriptor, FieldDescriptor, and/or ServiceDescriptor.
+// [EnumDescriptor], [MessageDescriptor], [FieldDescriptor], and/or [ServiceDescriptor].
 type FileDescriptor interface {
 	Descriptor // Descriptor.FullName is identical to Package
 
@@ -180,8 +180,8 @@ type FileImport struct {
 // corresponds with the google.protobuf.DescriptorProto message.
 //
 // Nested declarations:
-// FieldDescriptor, OneofDescriptor, FieldDescriptor, EnumDescriptor,
-// and/or MessageDescriptor.
+// [FieldDescriptor], [OneofDescriptor], [FieldDescriptor], [EnumDescriptor],
+// and/or [MessageDescriptor].
 type MessageDescriptor interface {
 	Descriptor
 
@@ -214,7 +214,7 @@ type MessageDescriptor interface {
 	ExtensionRanges() FieldRanges
 	// ExtensionRangeOptions returns the ith extension range options.
 	//
-	// To avoid a dependency cycle, this method returns a proto.Message value,
+	// To avoid a dependency cycle, this method returns a proto.Message] value,
 	// which always contains a google.protobuf.ExtensionRangeOptions message.
 	// This method returns a typed nil-pointer if no options are present.
 	// The caller must import the descriptorpb package to use this.
@@ -231,9 +231,9 @@ type MessageDescriptor interface {
 }
 type isMessageDescriptor interface{ ProtoType(MessageDescriptor) }
 
-// MessageType encapsulates a MessageDescriptor with a concrete Go implementation.
+// MessageType encapsulates a [MessageDescriptor] with a concrete Go implementation.
 // It is recommended that implementations of this interface also implement the
-// MessageFieldTypes interface.
+// [MessageFieldTypes] interface.
 type MessageType interface {
 	// New returns a newly allocated empty message.
 	// It may return nil for synthetic messages representing a map entry.
@@ -249,19 +249,19 @@ type MessageType interface {
 	Descriptor() MessageDescriptor
 }
 
-// MessageFieldTypes extends a MessageType by providing type information
+// MessageFieldTypes extends a [MessageType] by providing type information
 // regarding enums and messages referenced by the message fields.
 type MessageFieldTypes interface {
 	MessageType
 
-	// Enum returns the EnumType for the ith field in Descriptor.Fields.
+	// Enum returns the EnumType for the ith field in MessageDescriptor.Fields.
 	// It returns nil if the ith field is not an enum kind.
 	// It panics if out of bounds.
 	//
 	// Invariant: mt.Enum(i).Descriptor() == mt.Descriptor().Fields(i).Enum()
 	Enum(i int) EnumType
 
-	// Message returns the MessageType for the ith field in Descriptor.Fields.
+	// Message returns the MessageType for the ith field in MessageDescriptor.Fields.
 	// It returns nil if the ith field is not a message or group kind.
 	// It panics if out of bounds.
 	//
@@ -286,8 +286,8 @@ type MessageDescriptors interface {
 // corresponds with the google.protobuf.FieldDescriptorProto message.
 //
 // It is used for both normal fields defined within the parent message
-// (e.g., MessageDescriptor.Fields) and fields that extend some remote message
-// (e.g., FileDescriptor.Extensions or MessageDescriptor.Extensions).
+// (e.g., [MessageDescriptor.Fields]) and fields that extend some remote message
+// (e.g., [FileDescriptor.Extensions] or [MessageDescriptor.Extensions]).
 type FieldDescriptor interface {
 	Descriptor
 
@@ -344,7 +344,7 @@ type FieldDescriptor interface {
 	// IsMap reports whether this field represents a map,
 	// where the value type for the associated field is a Map.
 	// It is equivalent to checking whether Cardinality is Repeated,
-	// that the Kind is MessageKind, and that Message.IsMapEntry reports true.
+	// that the Kind is MessageKind, and that MessageDescriptor.IsMapEntry reports true.
 	IsMap() bool
 
 	// MapKey returns the field descriptor for the key in the map entry.
@@ -419,7 +419,7 @@ type OneofDescriptor interface {
 
 	// IsSynthetic reports whether this is a synthetic oneof created to support
 	// proto3 optional semantics. If true, Fields contains exactly one field
-	// with HasOptionalKeyword specified.
+	// with FieldDescriptor.HasOptionalKeyword specified.
 	IsSynthetic() bool
 
 	// Fields is a list of fields belonging to this oneof.
@@ -442,10 +442,10 @@ type OneofDescriptors interface {
 	doNotImplement
 }
 
-// ExtensionDescriptor is an alias of FieldDescriptor for documentation.
+// ExtensionDescriptor is an alias of [FieldDescriptor] for documentation.
 type ExtensionDescriptor = FieldDescriptor
 
-// ExtensionTypeDescriptor is an ExtensionDescriptor with an associated ExtensionType.
+// ExtensionTypeDescriptor is an [ExtensionDescriptor] with an associated [ExtensionType].
 type ExtensionTypeDescriptor interface {
 	ExtensionDescriptor
 
@@ -470,12 +470,12 @@ type ExtensionDescriptors interface {
 	doNotImplement
 }
 
-// ExtensionType encapsulates an ExtensionDescriptor with a concrete
+// ExtensionType encapsulates an [ExtensionDescriptor] with a concrete
 // Go implementation. The nested field descriptor must be for a extension field.
 //
 // While a normal field is a member of the parent message that it is declared
-// within (see Descriptor.Parent), an extension field is a member of some other
-// target message (see ExtensionDescriptor.Extendee) and may have no
+// within (see [Descriptor.Parent]), an extension field is a member of some other
+// target message (see [FieldDescriptor.ContainingMessage]) and may have no
 // relationship with the parent. However, the full name of an extension field is
 // relative to the parent that it is declared within.
 //
@@ -532,7 +532,7 @@ type ExtensionType interface {
 // corresponds with the google.protobuf.EnumDescriptorProto message.
 //
 // Nested declarations:
-// EnumValueDescriptor.
+// [EnumValueDescriptor].
 type EnumDescriptor interface {
 	Descriptor
 
@@ -548,7 +548,7 @@ type EnumDescriptor interface {
 }
 type isEnumDescriptor interface{ ProtoType(EnumDescriptor) }
 
-// EnumType encapsulates an EnumDescriptor with a concrete Go implementation.
+// EnumType encapsulates an [EnumDescriptor] with a concrete Go implementation.
 type EnumType interface {
 	// New returns an instance of this enum type with its value set to n.
 	New(n EnumNumber) Enum
@@ -610,7 +610,7 @@ type EnumValueDescriptors interface {
 // ServiceDescriptor describes a service and
 // corresponds with the google.protobuf.ServiceDescriptorProto message.
 //
-// Nested declarations: MethodDescriptor.
+// Nested declarations: [MethodDescriptor].
 type ServiceDescriptor interface {
 	Descriptor
 
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
index 37601b78199..a7b0d06ff32 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
@@ -27,16 +27,16 @@ type Enum interface {
 // Message is a reflective interface for a concrete message value,
 // encapsulating both type and value information for the message.
 //
-// Accessor/mutators for individual fields are keyed by FieldDescriptor.
+// Accessor/mutators for individual fields are keyed by [FieldDescriptor].
 // For non-extension fields, the descriptor must exactly match the
 // field known by the parent message.
-// For extension fields, the descriptor must implement ExtensionTypeDescriptor,
-// extend the parent message (i.e., have the same message FullName), and
+// For extension fields, the descriptor must implement [ExtensionTypeDescriptor],
+// extend the parent message (i.e., have the same message [FullName]), and
 // be within the parent's extension range.
 //
-// Each field Value can be a scalar or a composite type (Message, List, or Map).
-// See Value for the Go types associated with a FieldDescriptor.
-// Providing a Value that is invalid or of an incorrect type panics.
+// Each field [Value] can be a scalar or a composite type ([Message], [List], or [Map]).
+// See [Value] for the Go types associated with a [FieldDescriptor].
+// Providing a [Value] that is invalid or of an incorrect type panics.
 type Message interface {
 	// Descriptor returns message descriptor, which contains only the protobuf
 	// type information for the message.
@@ -152,7 +152,7 @@ type Message interface {
 	// This method may return nil.
 	//
 	// The returned methods type is identical to
-	// "google.golang.org/protobuf/runtime/protoiface".Methods.
+	// google.golang.org/protobuf/runtime/protoiface.Methods.
 	// Consult the protoiface package documentation for details.
 	ProtoMethods() *methods
 }
@@ -175,8 +175,8 @@ func (b RawFields) IsValid() bool {
 }
 
 // List is a zero-indexed, ordered list.
-// The element Value type is determined by FieldDescriptor.Kind.
-// Providing a Value that is invalid or of an incorrect type panics.
+// The element [Value] type is determined by [FieldDescriptor.Kind].
+// Providing a [Value] that is invalid or of an incorrect type panics.
 type List interface {
 	// Len reports the number of entries in the List.
 	// Get, Set, and Truncate panic with out of bound indexes.
@@ -226,9 +226,9 @@ type List interface {
 }
 
 // Map is an unordered, associative map.
-// The entry MapKey type is determined by FieldDescriptor.MapKey.Kind.
-// The entry Value type is determined by FieldDescriptor.MapValue.Kind.
-// Providing a MapKey or Value that is invalid or of an incorrect type panics.
+// The entry [MapKey] type is determined by [FieldDescriptor.MapKey].Kind.
+// The entry [Value] type is determined by [FieldDescriptor.MapValue].Kind.
+// Providing a [MapKey] or [Value] that is invalid or of an incorrect type panics.
 type Map interface {
 	// Len reports the number of elements in the map.
 	Len() int
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
index 591652541f2..654599d4493 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
@@ -24,19 +24,19 @@ import (
 //     Unlike the == operator, a NaN is equal to another NaN.
 //
 //   - Enums are equal if they contain the same number.
-//     Since Value does not contain an enum descriptor,
+//     Since [Value] does not contain an enum descriptor,
 //     enum values do not consider the type of the enum.
 //
 //   - Other scalar values are equal if they contain the same value.
 //
-//   - Message values are equal if they belong to the same message descriptor,
+//   - [Message] values are equal if they belong to the same message descriptor,
 //     have the same set of populated known and extension field values,
 //     and the same set of unknown fields values.
 //
-//   - Lists are equal if they are the same length and
+//   - [List] values are equal if they are the same length and
 //     each corresponding element is equal.
 //
-//   - Maps are equal if they have the same set of keys and
+//   - [Map] values are equal if they have the same set of keys and
 //     the corresponding value for each key is equal.
 func (v1 Value) Equal(v2 Value) bool {
 	return equalValue(v1, v2)
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_test.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_test.go
deleted file mode 100644
index d3879001dbc..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protoreflect
-
-import (
-	"bytes"
-	"math"
-	"reflect"
-	"testing"
-)
-
-var (
-	fakeMessage = new(struct{ Message })
-	fakeList    = new(struct{ List })
-	fakeMap     = new(struct{ Map })
-)
-
-func TestValue(t *testing.T) {
-
-	tests := []struct {
-		in   Value
-		want interface{}
-	}{
-		{in: Value{}},
-		{in: ValueOf(nil)},
-		{in: ValueOf(true), want: true},
-		{in: ValueOf(int32(math.MaxInt32)), want: int32(math.MaxInt32)},
-		{in: ValueOf(int64(math.MaxInt64)), want: int64(math.MaxInt64)},
-		{in: ValueOf(uint32(math.MaxUint32)), want: uint32(math.MaxUint32)},
-		{in: ValueOf(uint64(math.MaxUint64)), want: uint64(math.MaxUint64)},
-		{in: ValueOf(float32(math.MaxFloat32)), want: float32(math.MaxFloat32)},
-		{in: ValueOf(float64(math.MaxFloat64)), want: float64(math.MaxFloat64)},
-		{in: ValueOf(string("hello")), want: string("hello")},
-		{in: ValueOf([]byte("hello")), want: []byte("hello")},
-		{in: ValueOf(fakeMessage), want: fakeMessage},
-		{in: ValueOf(fakeList), want: fakeList},
-		{in: ValueOf(fakeMap), want: fakeMap},
-	}
-
-	for _, tt := range tests {
-		got := tt.in.Interface()
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("Value(%v).Interface() = %v, want %v", tt.in, got, tt.want)
-		}
-
-		if got := tt.in.IsValid(); got != (tt.want != nil) {
-			t.Errorf("Value(%v).IsValid() = %v, want %v", tt.in, got, tt.want != nil)
-		}
-		switch want := tt.want.(type) {
-		case int32:
-			if got := tt.in.Int(); got != int64(want) {
-				t.Errorf("Value(%v).Int() = %v, want %v", tt.in, got, tt.want)
-			}
-		case int64:
-			if got := tt.in.Int(); got != int64(want) {
-				t.Errorf("Value(%v).Int() = %v, want %v", tt.in, got, tt.want)
-			}
-		case uint32:
-			if got := tt.in.Uint(); got != uint64(want) {
-				t.Errorf("Value(%v).Uint() = %v, want %v", tt.in, got, tt.want)
-			}
-		case uint64:
-			if got := tt.in.Uint(); got != uint64(want) {
-				t.Errorf("Value(%v).Uint() = %v, want %v", tt.in, got, tt.want)
-			}
-		case float32:
-			if got := tt.in.Float(); got != float64(want) {
-				t.Errorf("Value(%v).Float() = %v, want %v", tt.in, got, tt.want)
-			}
-		case float64:
-			if got := tt.in.Float(); got != float64(want) {
-				t.Errorf("Value(%v).Float() = %v, want %v", tt.in, got, tt.want)
-			}
-		case string:
-			if got := tt.in.String(); got != string(want) {
-				t.Errorf("Value(%v).String() = %v, want %v", tt.in, got, tt.want)
-			}
-		case []byte:
-			if got := tt.in.Bytes(); !bytes.Equal(got, want) {
-				t.Errorf("Value(%v).Bytes() = %v, want %v", tt.in, got, tt.want)
-			}
-		case EnumNumber:
-			if got := tt.in.Enum(); got != want {
-				t.Errorf("Value(%v).Enum() = %v, want %v", tt.in, got, tt.want)
-			}
-		case Message:
-			if got := tt.in.Message(); got != want {
-				t.Errorf("Value(%v).Message() = %v, want %v", tt.in, got, tt.want)
-			}
-		case List:
-			if got := tt.in.List(); got != want {
-				t.Errorf("Value(%v).List() = %v, want %v", tt.in, got, tt.want)
-			}
-		case Map:
-			if got := tt.in.Map(); got != want {
-				t.Errorf("Value(%v).Map() = %v, want %v", tt.in, got, tt.want)
-			}
-		}
-	}
-}
-
-func TestValueEqual(t *testing.T) {
-	tests := []struct {
-		x, y Value
-		want bool
-	}{
-		{Value{}, Value{}, true},
-		{Value{}, ValueOfBool(true), false},
-		{ValueOfBool(true), ValueOfBool(true), true},
-		{ValueOfBool(true), ValueOfBool(false), false},
-		{ValueOfBool(false), ValueOfInt32(0), false},
-		{ValueOfInt32(0), ValueOfInt32(0), true},
-		{ValueOfInt32(0), ValueOfInt32(1), false},
-		{ValueOfInt32(0), ValueOfInt64(0), false},
-		{ValueOfInt64(123), ValueOfInt64(123), true},
-		{ValueOfFloat64(0), ValueOfFloat64(0), true},
-		{ValueOfFloat64(math.NaN()), ValueOfFloat64(math.NaN()), true},
-		{ValueOfFloat64(math.NaN()), ValueOfFloat64(0), false},
-		{ValueOfFloat64(math.Inf(1)), ValueOfFloat64(math.Inf(1)), true},
-		{ValueOfFloat64(math.Inf(-1)), ValueOfFloat64(math.Inf(1)), false},
-		{ValueOfBytes(nil), ValueOfBytes(nil), true},
-		{ValueOfBytes(nil), ValueOfBytes([]byte{}), true},
-		{ValueOfBytes(nil), ValueOfBytes([]byte{1}), false},
-		{ValueOfEnum(0), ValueOfEnum(0), true},
-		{ValueOfEnum(0), ValueOfEnum(1), false},
-		{ValueOfBool(false), ValueOfMessage(fakeMessage), false},
-		{ValueOfMessage(fakeMessage), ValueOfList(fakeList), false},
-		{ValueOfList(fakeList), ValueOfMap(fakeMap), false},
-		{ValueOfMap(fakeMap), ValueOfMessage(fakeMessage), false},
-
-		// Composite types are not tested here.
-		// See proto.TestEqual.
-	}
-
-	for _, tt := range tests {
-		got := tt.x.Equal(tt.y)
-		if got != tt.want {
-			t.Errorf("(%v).Equal(%v) = %v, want %v", tt.x, tt.y, got, tt.want)
-		}
-	}
-}
-
-func BenchmarkValue(b *testing.B) {
-	const testdata = "The quick brown fox jumped over the lazy dog."
-	var sink1 string
-	var sink2 Value
-	var sink3 interface{}
-
-	// Baseline measures the time to store a string into a native variable.
-	b.Run("Baseline", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			sink1 = testdata[:len(testdata)%(i+1)]
-		}
-	})
-
-	// Inline measures the time to store a string into a Value,
-	// assuming that the compiler could inline the ValueOf function call.
-	b.Run("Inline", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			sink2 = valueOfString(testdata[:len(testdata)%(i+1)])
-		}
-	})
-
-	// Value measures the time to store a string into a Value using the general
-	// ValueOf function call. This should be identical to Inline.
-	//
-	// NOTE: As of Go1.11, this is not as efficient as Inline due to the lack
-	// of some compiler optimizations:
-	//	https://golang.org/issue/22310
-	//	https://golang.org/issue/25189
-	b.Run("Value", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			sink2 = ValueOf(string(testdata[:len(testdata)%(i+1)]))
-		}
-	})
-
-	// Interface measures the time to store a string into an interface.
-	b.Run("Interface", func(b *testing.B) {
-		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
-			sink3 = string(testdata[:len(testdata)%(i+1)])
-		}
-	})
-
-	_, _, _ = sink1, sink2, sink3
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
index 08e5ef73fc0..1603097311e 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
@@ -11,7 +11,7 @@ import (
 
 // Value is a union where only one Go type may be set at a time.
 // The Value is used to represent all possible values a field may take.
-// The following shows which Go type is used to represent each proto Kind:
+// The following shows which Go type is used to represent each proto [Kind]:
 //
 //	╔════════════╤═════════════════════════════════════╗
 //	║ Go type    │ Protobuf kind                       ║
@@ -31,22 +31,22 @@ import (
 //
 // Multiple protobuf Kinds may be represented by a single Go type if the type
 // can losslessly represent the information for the proto kind. For example,
-// Int64Kind, Sint64Kind, and Sfixed64Kind are all represented by int64,
+// [Int64Kind], [Sint64Kind], and [Sfixed64Kind] are all represented by int64,
 // but use different integer encoding methods.
 //
-// The List or Map types are used if the field cardinality is repeated.
-// A field is a List if FieldDescriptor.IsList reports true.
-// A field is a Map if FieldDescriptor.IsMap reports true.
+// The [List] or [Map] types are used if the field cardinality is repeated.
+// A field is a [List] if [FieldDescriptor.IsList] reports true.
+// A field is a [Map] if [FieldDescriptor.IsMap] reports true.
 //
 // Converting to/from a Value and a concrete Go value panics on type mismatch.
-// For example, ValueOf("hello").Int() panics because this attempts to
+// For example, [ValueOf]("hello").Int() panics because this attempts to
 // retrieve an int64 from a string.
 //
-// List, Map, and Message Values are called "composite" values.
+// [List], [Map], and [Message] Values are called "composite" values.
 //
 // A composite Value may alias (reference) memory at some location,
 // such that changes to the Value updates the that location.
-// A composite value acquired with a Mutable method, such as Message.Mutable,
+// A composite value acquired with a Mutable method, such as [Message.Mutable],
 // always references the source object.
 //
 // For example:
@@ -65,7 +65,7 @@ import (
 //	// appending to the List here may or may not modify the message.
 //	list.Append(protoreflect.ValueOfInt32(0))
 //
-// Some operations, such as Message.Get, may return an "empty, read-only"
+// Some operations, such as [Message.Get], may return an "empty, read-only"
 // composite Value. Modifying an empty, read-only value panics.
 type Value value
 
@@ -306,7 +306,7 @@ func (v Value) Float() float64 {
 	}
 }
 
-// String returns v as a string. Since this method implements fmt.Stringer,
+// String returns v as a string. Since this method implements [fmt.Stringer],
 // this returns the formatted string value for any non-string type.
 func (v Value) String() string {
 	switch v.typ {
@@ -327,7 +327,7 @@ func (v Value) Bytes() []byte {
 	}
 }
 
-// Enum returns v as a EnumNumber and panics if the type is not a EnumNumber.
+// Enum returns v as a [EnumNumber] and panics if the type is not a [EnumNumber].
 func (v Value) Enum() EnumNumber {
 	switch v.typ {
 	case enumType:
@@ -337,7 +337,7 @@ func (v Value) Enum() EnumNumber {
 	}
 }
 
-// Message returns v as a Message and panics if the type is not a Message.
+// Message returns v as a [Message] and panics if the type is not a [Message].
 func (v Value) Message() Message {
 	switch vi := v.getIface().(type) {
 	case Message:
@@ -347,7 +347,7 @@ func (v Value) Message() Message {
 	}
 }
 
-// List returns v as a List and panics if the type is not a List.
+// List returns v as a [List] and panics if the type is not a [List].
 func (v Value) List() List {
 	switch vi := v.getIface().(type) {
 	case List:
@@ -357,7 +357,7 @@ func (v Value) List() List {
 	}
 }
 
-// Map returns v as a Map and panics if the type is not a Map.
+// Map returns v as a [Map] and panics if the type is not a [Map].
 func (v Value) Map() Map {
 	switch vi := v.getIface().(type) {
 	case Map:
@@ -367,7 +367,7 @@ func (v Value) Map() Map {
 	}
 }
 
-// MapKey returns v as a MapKey and panics for invalid MapKey types.
+// MapKey returns v as a [MapKey] and panics for invalid [MapKey] types.
 func (v Value) MapKey() MapKey {
 	switch v.typ {
 	case boolType, int32Type, int64Type, uint32Type, uint64Type, stringType:
@@ -378,8 +378,8 @@ func (v Value) MapKey() MapKey {
 }
 
 // MapKey is used to index maps, where the Go type of the MapKey must match
-// the specified key Kind (see MessageDescriptor.IsMapEntry).
-// The following shows what Go type is used to represent each proto Kind:
+// the specified key [Kind] (see [MessageDescriptor.IsMapEntry]).
+// The following shows what Go type is used to represent each proto [Kind]:
 //
 //	╔═════════╤═════════════════════════════════════╗
 //	║ Go type │ Protobuf kind                       ║
@@ -392,13 +392,13 @@ func (v Value) MapKey() MapKey {
 //	║ string  │ StringKind                          ║
 //	╚═════════╧═════════════════════════════════════╝
 //
-// A MapKey is constructed and accessed through a Value:
+// A MapKey is constructed and accessed through a [Value]:
 //
 //	k := ValueOf("hash").MapKey() // convert string to MapKey
 //	s := k.String()               // convert MapKey to string
 //
-// The MapKey is a strict subset of valid types used in Value;
-// converting a Value to a MapKey with an invalid type panics.
+// The MapKey is a strict subset of valid types used in [Value];
+// converting a [Value] to a MapKey with an invalid type panics.
 type MapKey value
 
 // IsValid reports whether k is populated with a value.
@@ -426,13 +426,13 @@ func (k MapKey) Uint() uint64 {
 	return Value(k).Uint()
 }
 
-// String returns k as a string. Since this method implements fmt.Stringer,
+// String returns k as a string. Since this method implements [fmt.Stringer],
 // this returns the formatted string value for any non-string type.
 func (k MapKey) String() string {
 	return Value(k).String()
 }
 
-// Value returns k as a Value.
+// Value returns k as a [Value].
 func (k MapKey) Value() Value {
 	return Value(k)
 }
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe_go121.go
index 702ddf22a27..43547011173 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe_go121.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !purego && !appengine
-// +build !purego,!appengine
+//go:build !purego && !appengine && go1.21
+// +build !purego,!appengine,go1.21
 
 package protoreflect
 
@@ -14,16 +14,8 @@ import (
 )
 
 type (
-	stringHeader struct {
-		Data unsafe.Pointer
-		Len  int
-	}
-	sliceHeader struct {
-		Data unsafe.Pointer
-		Len  int
-		Cap  int
-	}
 	ifaceHeader struct {
+		_    [0]interface{} // if interfaces have greater alignment than unsafe.Pointer, this will enforce it.
 		Type unsafe.Pointer
 		Data unsafe.Pointer
 	}
@@ -73,25 +65,21 @@ type value struct {
 }
 
 func valueOfString(v string) Value {
-	p := (*stringHeader)(unsafe.Pointer(&v))
-	return Value{typ: stringType, ptr: p.Data, num: uint64(len(v))}
+	return Value{typ: stringType, ptr: unsafe.Pointer(unsafe.StringData(v)), num: uint64(len(v))}
 }
 func valueOfBytes(v []byte) Value {
-	p := (*sliceHeader)(unsafe.Pointer(&v))
-	return Value{typ: bytesType, ptr: p.Data, num: uint64(len(v))}
+	return Value{typ: bytesType, ptr: unsafe.Pointer(unsafe.SliceData(v)), num: uint64(len(v))}
 }
 func valueOfIface(v interface{}) Value {
 	p := (*ifaceHeader)(unsafe.Pointer(&v))
 	return Value{typ: p.Type, ptr: p.Data}
 }
 
-func (v Value) getString() (x string) {
-	*(*stringHeader)(unsafe.Pointer(&x)) = stringHeader{Data: v.ptr, Len: int(v.num)}
-	return x
+func (v Value) getString() string {
+	return unsafe.String((*byte)(v.ptr), v.num)
 }
-func (v Value) getBytes() (x []byte) {
-	*(*sliceHeader)(unsafe.Pointer(&x)) = sliceHeader{Data: v.ptr, Len: int(v.num), Cap: int(v.num)}
-	return x
+func (v Value) getBytes() []byte {
+	return unsafe.Slice((*byte)(v.ptr), v.num)
 }
 func (v Value) getIface() (x interface{}) {
 	*(*ifaceHeader)(unsafe.Pointer(&x)) = ifaceHeader{Type: v.typ, Data: v.ptr}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/ya.make b/vendor/google.golang.org/protobuf/reflect/protoreflect/ya.make
index 2ae75783044..7cef01fc145 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/ya.make
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/ya.make
@@ -11,15 +11,7 @@ SRCS(
     value.go
     value_equal.go
     value_union.go
-    value_unsafe.go
-)
-
-GO_TEST_SRCS(
-    proto_test.go
-    source_test.go
-    value_test.go
+    value_unsafe_go121.go
 )
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/gotest/ya.make b/vendor/google.golang.org/protobuf/reflect/protoregistry/gotest/ya.make
deleted file mode 100644
index a9d4a12c2a6..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoregistry/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/reflect/protoregistry)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
index aeb55977446..6267dc52a67 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
@@ -5,12 +5,12 @@
 // Package protoregistry provides data structures to register and lookup
 // protobuf descriptor types.
 //
-// The Files registry contains file descriptors and provides the ability
+// The [Files] registry contains file descriptors and provides the ability
 // to iterate over the files or lookup a specific descriptor within the files.
-// Files only contains protobuf descriptors and has no understanding of Go
+// [Files] only contains protobuf descriptors and has no understanding of Go
 // type information that may be associated with each descriptor.
 //
-// The Types registry contains descriptor types for which there is a known
+// The [Types] registry contains descriptor types for which there is a known
 // Go type associated with that descriptor. It provides the ability to iterate
 // over the registered types or lookup a type by name.
 package protoregistry
@@ -218,7 +218,7 @@ func (r *Files) checkGenProtoConflict(path string) {
 
 // FindDescriptorByName looks up a descriptor by the full name.
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Files) FindDescriptorByName(name protoreflect.FullName) (protoreflect.Descriptor, error) {
 	if r == nil {
 		return nil, NotFound
@@ -310,7 +310,7 @@ func (s *nameSuffix) Pop() (name protoreflect.Name) {
 
 // FindFileByPath looks up a file by the path.
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 // This returns an error if multiple files have the same path.
 func (r *Files) FindFileByPath(path string) (protoreflect.FileDescriptor, error) {
 	if r == nil {
@@ -431,7 +431,7 @@ func rangeTopLevelDescriptors(fd protoreflect.FileDescriptor, f func(protoreflec
 // A compliant implementation must deterministically return the same type
 // if no error is encountered.
 //
-// The Types type implements this interface.
+// The [Types] type implements this interface.
 type MessageTypeResolver interface {
 	// FindMessageByName looks up a message by its full name.
 	// E.g., "google.protobuf.Any"
@@ -451,7 +451,7 @@ type MessageTypeResolver interface {
 // A compliant implementation must deterministically return the same type
 // if no error is encountered.
 //
-// The Types type implements this interface.
+// The [Types] type implements this interface.
 type ExtensionTypeResolver interface {
 	// FindExtensionByName looks up a extension field by the field's full name.
 	// Note that this is the full name of the field as determined by
@@ -590,7 +590,7 @@ func (r *Types) register(kind string, desc protoreflect.Descriptor, typ interfac
 // FindEnumByName looks up an enum by its full name.
 // E.g., "google.protobuf.Field.Kind".
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Types) FindEnumByName(enum protoreflect.FullName) (protoreflect.EnumType, error) {
 	if r == nil {
 		return nil, NotFound
@@ -611,7 +611,7 @@ func (r *Types) FindEnumByName(enum protoreflect.FullName) (protoreflect.EnumTyp
 // FindMessageByName looks up a message by its full name,
 // e.g. "google.protobuf.Any".
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Types) FindMessageByName(message protoreflect.FullName) (protoreflect.MessageType, error) {
 	if r == nil {
 		return nil, NotFound
@@ -632,7 +632,7 @@ func (r *Types) FindMessageByName(message protoreflect.FullName) (protoreflect.M
 // FindMessageByURL looks up a message by a URL identifier.
 // See documentation on google.protobuf.Any.type_url for the URL format.
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Types) FindMessageByURL(url string) (protoreflect.MessageType, error) {
 	// This function is similar to FindMessageByName but
 	// truncates anything before and including '/' in the URL.
@@ -662,7 +662,7 @@ func (r *Types) FindMessageByURL(url string) (protoreflect.MessageType, error) {
 // where the extension is declared and is unrelated to the full name of the
 // message being extended.
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Types) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
 	if r == nil {
 		return nil, NotFound
@@ -703,7 +703,7 @@ func (r *Types) FindExtensionByName(field protoreflect.FullName) (protoreflect.E
 // FindExtensionByNumber looks up a extension field by the field number
 // within some parent message, identified by full name.
 //
-// This returns (nil, NotFound) if not found.
+// This returns (nil, [NotFound]) if not found.
 func (r *Types) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
 	if r == nil {
 		return nil, NotFound
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry_test.go b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry_test.go
deleted file mode 100644
index 8baf12f03b0..00000000000
--- a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry_test.go
+++ /dev/null
@@ -1,655 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package protoregistry_test
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	pimpl "google.golang.org/protobuf/internal/impl"
-	"google.golang.org/protobuf/reflect/protodesc"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/registry"
-	"google.golang.org/protobuf/types/descriptorpb"
-)
-
-func mustMakeFile(s string) protoreflect.FileDescriptor {
-	pb := new(descriptorpb.FileDescriptorProto)
-	if err := prototext.Unmarshal([]byte(s), pb); err != nil {
-		panic(err)
-	}
-	fd, err := protodesc.NewFile(pb, nil)
-	if err != nil {
-		panic(err)
-	}
-	return fd
-}
-
-func TestFiles(t *testing.T) {
-	type (
-		file struct {
-			Path string
-			Pkg  protoreflect.FullName
-		}
-		testFile struct {
-			inFile  protoreflect.FileDescriptor
-			wantErr string
-		}
-		testFindDesc struct {
-			inName    protoreflect.FullName
-			wantFound bool
-		}
-		testRangePkg struct {
-			inPkg     protoreflect.FullName
-			wantFiles []file
-		}
-		testFindPath struct {
-			inPath    string
-			wantFiles []file
-			wantErr   string
-		}
-	)
-
-	tests := []struct {
-		files     []testFile
-		findDescs []testFindDesc
-		rangePkgs []testRangePkg
-		findPaths []testFindPath
-	}{{
-		// Test that overlapping packages and files are permitted.
-		files: []testFile{
-			{inFile: mustMakeFile(`syntax:"proto2" name:"test1.proto" package:"foo.bar"`)},
-			{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/test.proto" package:"my.test"`)},
-			{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/test.proto" package:"foo.bar.baz"`), wantErr: "already registered"},
-			{inFile: mustMakeFile(`syntax:"proto2" name:"test2.proto" package:"my.test.package"`)},
-			{inFile: mustMakeFile(`syntax:"proto2" name:"weird" package:"foo.bar"`)},
-			{inFile: mustMakeFile(`syntax:"proto2" name:"foo/bar/baz/../test.proto" package:"my.test"`)},
-		},
-
-		rangePkgs: []testRangePkg{{
-			inPkg: "nothing",
-		}, {
-			inPkg: "",
-		}, {
-			inPkg: ".",
-		}, {
-			inPkg: "foo",
-		}, {
-			inPkg: "foo.",
-		}, {
-			inPkg: "foo..",
-		}, {
-			inPkg: "foo.bar",
-			wantFiles: []file{
-				{"test1.proto", "foo.bar"},
-				{"weird", "foo.bar"},
-			},
-		}, {
-			inPkg: "my.test",
-			wantFiles: []file{
-				{"foo/bar/baz/../test.proto", "my.test"},
-				{"foo/bar/test.proto", "my.test"},
-			},
-		}, {
-			inPkg: "fo",
-		}},
-
-		findPaths: []testFindPath{{
-			inPath:  "nothing",
-			wantErr: "not found",
-		}, {
-			inPath: "weird",
-			wantFiles: []file{
-				{"weird", "foo.bar"},
-			},
-		}, {
-			inPath: "foo/bar/test.proto",
-			wantFiles: []file{
-				{"foo/bar/test.proto", "my.test"},
-			},
-		}},
-	}, {
-		// Test when new enum conflicts with existing package.
-		files: []testFile{{
-			inFile: mustMakeFile(`syntax:"proto2" name:"test1a.proto" package:"foo.bar.baz"`),
-		}, {
-			inFile:  mustMakeFile(`syntax:"proto2" name:"test1b.proto" enum_type:[{name:"foo" value:[{name:"VALUE" number:0}]}]`),
-			wantErr: `file "test1b.proto" has a name conflict over foo`,
-		}},
-	}, {
-		// Test when new package conflicts with existing enum.
-		files: []testFile{{
-			inFile: mustMakeFile(`syntax:"proto2" name:"test2a.proto" enum_type:[{name:"foo" value:[{name:"VALUE" number:0}]}]`),
-		}, {
-			inFile:  mustMakeFile(`syntax:"proto2" name:"test2b.proto" package:"foo.bar.baz"`),
-			wantErr: `file "test2b.proto" has a package name conflict over foo`,
-		}},
-	}, {
-		// Test when new enum conflicts with existing enum in same package.
-		files: []testFile{{
-			inFile: mustMakeFile(`syntax:"proto2" name:"test3a.proto" package:"foo" enum_type:[{name:"BAR" value:[{name:"VALUE" number:0}]}]`),
-		}, {
-			inFile:  mustMakeFile(`syntax:"proto2" name:"test3b.proto" package:"foo" enum_type:[{name:"BAR" value:[{name:"VALUE2" number:0}]}]`),
-			wantErr: `file "test3b.proto" has a name conflict over foo.BAR`,
-		}},
-	}, {
-		files: []testFile{{
-			inFile: mustMakeFile(`
-				syntax:  "proto2"
-				name:    "test1.proto"
-				package: "fizz.buzz"
-				message_type: [{
-					name: "Message"
-					field: [
-						{name:"Field" number:1 label:LABEL_OPTIONAL type:TYPE_STRING oneof_index:0}
-					]
-					oneof_decl:      [{name:"Oneof"}]
-					extension_range: [{start:1000 end:2000}]
-
-					enum_type: [
-						{name:"Enum" value:[{name:"EnumValue" number:0}]}
-					]
-					nested_type: [
-						{name:"Message" field:[{name:"Field" number:1 label:LABEL_OPTIONAL type:TYPE_STRING}]}
-					]
-					extension: [
-						{name:"Extension" number:1001 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".fizz.buzz.Message"}
-					]
-				}]
-				enum_type: [{
-					name:  "Enum"
-					value: [{name:"EnumValue" number:0}]
-				}]
-				extension: [
-					{name:"Extension" number:1000 label:LABEL_OPTIONAL type:TYPE_STRING extendee:".fizz.buzz.Message"}
-				]
-				service: [{
-					name: "Service"
-					method: [{
-						name:             "Method"
-						input_type:       ".fizz.buzz.Message"
-						output_type:      ".fizz.buzz.Message"
-						client_streaming: true
-						server_streaming: true
-					}]
-				}]
-			`),
-		}, {
-			inFile: mustMakeFile(`
-				syntax:  "proto2"
-				name:    "test2.proto"
-				package: "fizz.buzz.gazz"
-				enum_type: [{
-					name:  "Enum"
-					value: [{name:"EnumValue" number:0}]
-				}]
-			`),
-		}, {
-			inFile: mustMakeFile(`
-				syntax:  "proto2"
-				name:    "test3.proto"
-				package: "fizz.buzz"
-				enum_type: [{
-					name:  "Enum1"
-					value: [{name:"EnumValue1" number:0}]
-				}, {
-					name:  "Enum2"
-					value: [{name:"EnumValue2" number:0}]
-				}]
-			`),
-		}, {
-			// Make sure we can register without package name.
-			inFile: mustMakeFile(`
-				name:   "weird"
-				syntax: "proto2"
-				message_type: [{
-					name: "Message"
-					nested_type: [{
-						name: "Message"
-						nested_type: [{
-							name: "Message"
-						}]
-					}]
-				}]
-			`),
-		}},
-		findDescs: []testFindDesc{
-			{inName: "fizz.buzz.message", wantFound: false},
-			{inName: "fizz.buzz.Message", wantFound: true},
-			{inName: "fizz.buzz.Message.X", wantFound: false},
-			{inName: "fizz.buzz.Field", wantFound: false},
-			{inName: "fizz.buzz.Oneof", wantFound: false},
-			{inName: "fizz.buzz.Message.Field", wantFound: true},
-			{inName: "fizz.buzz.Message.Field.X", wantFound: false},
-			{inName: "fizz.buzz.Message.Oneof", wantFound: true},
-			{inName: "fizz.buzz.Message.Oneof.X", wantFound: false},
-			{inName: "fizz.buzz.Message.Message", wantFound: true},
-			{inName: "fizz.buzz.Message.Message.X", wantFound: false},
-			{inName: "fizz.buzz.Message.Enum", wantFound: true},
-			{inName: "fizz.buzz.Message.Enum.X", wantFound: false},
-			{inName: "fizz.buzz.Message.EnumValue", wantFound: true},
-			{inName: "fizz.buzz.Message.EnumValue.X", wantFound: false},
-			{inName: "fizz.buzz.Message.Extension", wantFound: true},
-			{inName: "fizz.buzz.Message.Extension.X", wantFound: false},
-			{inName: "fizz.buzz.enum", wantFound: false},
-			{inName: "fizz.buzz.Enum", wantFound: true},
-			{inName: "fizz.buzz.Enum.X", wantFound: false},
-			{inName: "fizz.buzz.EnumValue", wantFound: true},
-			{inName: "fizz.buzz.EnumValue.X", wantFound: false},
-			{inName: "fizz.buzz.Enum.EnumValue", wantFound: false},
-			{inName: "fizz.buzz.Extension", wantFound: true},
-			{inName: "fizz.buzz.Extension.X", wantFound: false},
-			{inName: "fizz.buzz.service", wantFound: false},
-			{inName: "fizz.buzz.Service", wantFound: true},
-			{inName: "fizz.buzz.Service.X", wantFound: false},
-			{inName: "fizz.buzz.Method", wantFound: false},
-			{inName: "fizz.buzz.Service.Method", wantFound: true},
-			{inName: "fizz.buzz.Service.Method.X", wantFound: false},
-
-			{inName: "fizz.buzz.gazz", wantFound: false},
-			{inName: "fizz.buzz.gazz.Enum", wantFound: true},
-			{inName: "fizz.buzz.gazz.EnumValue", wantFound: true},
-			{inName: "fizz.buzz.gazz.Enum.EnumValue", wantFound: false},
-
-			{inName: "fizz.buzz", wantFound: false},
-			{inName: "fizz.buzz.Enum1", wantFound: true},
-			{inName: "fizz.buzz.EnumValue1", wantFound: true},
-			{inName: "fizz.buzz.Enum1.EnumValue1", wantFound: false},
-			{inName: "fizz.buzz.Enum2", wantFound: true},
-			{inName: "fizz.buzz.EnumValue2", wantFound: true},
-			{inName: "fizz.buzz.Enum2.EnumValue2", wantFound: false},
-			{inName: "fizz.buzz.Enum3", wantFound: false},
-
-			{inName: "", wantFound: false},
-			{inName: "Message", wantFound: true},
-			{inName: "Message.Message", wantFound: true},
-			{inName: "Message.Message.Message", wantFound: true},
-			{inName: "Message.Message.Message.Message", wantFound: false},
-		},
-	}}
-
-	sortFiles := cmpopts.SortSlices(func(x, y file) bool {
-		return x.Path < y.Path || (x.Path == y.Path && x.Pkg < y.Pkg)
-	})
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			var files protoregistry.Files
-			for i, tc := range tt.files {
-				gotErr := files.RegisterFile(tc.inFile)
-				if ((gotErr == nil) != (tc.wantErr == "")) || !strings.Contains(fmt.Sprint(gotErr), tc.wantErr) {
-					t.Errorf("file %d, Register() = %v, want %v", i, gotErr, tc.wantErr)
-				}
-			}
-
-			for _, tc := range tt.findDescs {
-				d, _ := files.FindDescriptorByName(tc.inName)
-				gotFound := d != nil
-				if gotFound != tc.wantFound {
-					t.Errorf("FindDescriptorByName(%v) find mismatch: got %v, want %v", tc.inName, gotFound, tc.wantFound)
-				}
-			}
-
-			for _, tc := range tt.rangePkgs {
-				var gotFiles []file
-				var gotCnt int
-				wantCnt := files.NumFilesByPackage(tc.inPkg)
-				files.RangeFilesByPackage(tc.inPkg, func(fd protoreflect.FileDescriptor) bool {
-					gotFiles = append(gotFiles, file{fd.Path(), fd.Package()})
-					gotCnt++
-					return true
-				})
-				if gotCnt != wantCnt {
-					t.Errorf("NumFilesByPackage(%v) = %v, want %v", tc.inPkg, gotCnt, wantCnt)
-				}
-				if diff := cmp.Diff(tc.wantFiles, gotFiles, sortFiles); diff != "" {
-					t.Errorf("RangeFilesByPackage(%v) mismatch (-want +got):\n%v", tc.inPkg, diff)
-				}
-			}
-
-			for _, tc := range tt.findPaths {
-				var gotFiles []file
-				fd, gotErr := files.FindFileByPath(tc.inPath)
-				if gotErr == nil {
-					gotFiles = append(gotFiles, file{fd.Path(), fd.Package()})
-				}
-				if ((gotErr == nil) != (tc.wantErr == "")) || !strings.Contains(fmt.Sprint(gotErr), tc.wantErr) {
-					t.Errorf("FindFileByPath(%v) = %v, want %v", tc.inPath, gotErr, tc.wantErr)
-				}
-				if diff := cmp.Diff(tc.wantFiles, gotFiles, sortFiles); diff != "" {
-					t.Errorf("FindFileByPath(%v) mismatch (-want +got):\n%v", tc.inPath, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestTypes(t *testing.T) {
-	mt1 := pimpl.Export{}.MessageTypeOf(&testpb.Message1{})
-	et1 := pimpl.Export{}.EnumTypeOf(testpb.Enum1_ONE)
-	xt1 := testpb.E_StringField
-	xt2 := testpb.E_Message4_MessageField
-	registry := new(protoregistry.Types)
-	if err := registry.RegisterMessage(mt1); err != nil {
-		t.Fatalf("registry.RegisterMessage(%v) returns unexpected error: %v", mt1.Descriptor().FullName(), err)
-	}
-	if err := registry.RegisterEnum(et1); err != nil {
-		t.Fatalf("registry.RegisterEnum(%v) returns unexpected error: %v", et1.Descriptor().FullName(), err)
-	}
-	if err := registry.RegisterExtension(xt1); err != nil {
-		t.Fatalf("registry.RegisterExtension(%v) returns unexpected error: %v", xt1.TypeDescriptor().FullName(), err)
-	}
-	if err := registry.RegisterExtension(xt2); err != nil {
-		t.Fatalf("registry.RegisterExtension(%v) returns unexpected error: %v", xt2.TypeDescriptor().FullName(), err)
-	}
-
-	t.Run("FindMessageByName", func(t *testing.T) {
-		tests := []struct {
-			name         string
-			messageType  protoreflect.MessageType
-			wantErr      bool
-			wantNotFound bool
-		}{{
-			name:        "testprotos.Message1",
-			messageType: mt1,
-		}, {
-			name:         "testprotos.NoSuchMessage",
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			name:    "testprotos.Enum1",
-			wantErr: true,
-		}, {
-			name:    "testprotos.Enum2",
-			wantErr: true,
-		}, {
-			name:    "testprotos.Enum3",
-			wantErr: true,
-		}}
-		for _, tc := range tests {
-			got, err := registry.FindMessageByName(protoreflect.FullName(tc.name))
-			gotErr := err != nil
-			if gotErr != tc.wantErr {
-				t.Errorf("FindMessageByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
-				continue
-			}
-			if tc.wantNotFound && err != protoregistry.NotFound {
-				t.Errorf("FindMessageByName(%v) got error: %v, want NotFound error", tc.name, err)
-				continue
-			}
-			if got != tc.messageType {
-				t.Errorf("FindMessageByName(%v) got wrong value: %v", tc.name, got)
-			}
-		}
-	})
-
-	t.Run("FindMessageByURL", func(t *testing.T) {
-		tests := []struct {
-			name         string
-			messageType  protoreflect.MessageType
-			wantErr      bool
-			wantNotFound bool
-		}{{
-			name:        "testprotos.Message1",
-			messageType: mt1,
-		}, {
-			name:         "type.googleapis.com/testprotos.Nada",
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			name:    "testprotos.Enum1",
-			wantErr: true,
-		}}
-		for _, tc := range tests {
-			got, err := registry.FindMessageByURL(tc.name)
-			gotErr := err != nil
-			if gotErr != tc.wantErr {
-				t.Errorf("FindMessageByURL(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
-				continue
-			}
-			if tc.wantNotFound && err != protoregistry.NotFound {
-				t.Errorf("FindMessageByURL(%v) got error: %v, want NotFound error", tc.name, err)
-				continue
-			}
-			if got != tc.messageType {
-				t.Errorf("FindMessageByURL(%v) got wrong value: %v", tc.name, got)
-			}
-		}
-	})
-
-	t.Run("FindEnumByName", func(t *testing.T) {
-		tests := []struct {
-			name         string
-			enumType     protoreflect.EnumType
-			wantErr      bool
-			wantNotFound bool
-		}{{
-			name:     "testprotos.Enum1",
-			enumType: et1,
-		}, {
-			name:         "testprotos.None",
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			name:    "testprotos.Message1",
-			wantErr: true,
-		}}
-		for _, tc := range tests {
-			got, err := registry.FindEnumByName(protoreflect.FullName(tc.name))
-			gotErr := err != nil
-			if gotErr != tc.wantErr {
-				t.Errorf("FindEnumByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
-				continue
-			}
-			if tc.wantNotFound && err != protoregistry.NotFound {
-				t.Errorf("FindEnumByName(%v) got error: %v, want NotFound error", tc.name, err)
-				continue
-			}
-			if got != tc.enumType {
-				t.Errorf("FindEnumByName(%v) got wrong value: %v", tc.name, got)
-			}
-		}
-	})
-
-	t.Run("FindExtensionByName", func(t *testing.T) {
-		tests := []struct {
-			name          string
-			extensionType protoreflect.ExtensionType
-			wantErr       bool
-			wantNotFound  bool
-		}{{
-			name:          "testprotos.string_field",
-			extensionType: xt1,
-		}, {
-			name:          "testprotos.Message4.message_field",
-			extensionType: xt2,
-		}, {
-			name:         "testprotos.None",
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			name:    "testprotos.Message1",
-			wantErr: true,
-		}}
-		for _, tc := range tests {
-			got, err := registry.FindExtensionByName(protoreflect.FullName(tc.name))
-			gotErr := err != nil
-			if gotErr != tc.wantErr {
-				t.Errorf("FindExtensionByName(%v) = (_, %v), want error? %t", tc.name, err, tc.wantErr)
-				continue
-			}
-			if tc.wantNotFound && err != protoregistry.NotFound {
-				t.Errorf("FindExtensionByName(%v) got error: %v, want NotFound error", tc.name, err)
-				continue
-			}
-			if got != tc.extensionType {
-				t.Errorf("FindExtensionByName(%v) got wrong value: %v", tc.name, got)
-			}
-		}
-	})
-
-	t.Run("FindExtensionByNumber", func(t *testing.T) {
-		tests := []struct {
-			parent        string
-			number        int32
-			extensionType protoreflect.ExtensionType
-			wantErr       bool
-			wantNotFound  bool
-		}{{
-			parent:        "testprotos.Message1",
-			number:        11,
-			extensionType: xt1,
-		}, {
-			parent:       "testprotos.Message1",
-			number:       13,
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			parent:        "testprotos.Message1",
-			number:        21,
-			extensionType: xt2,
-		}, {
-			parent:       "testprotos.Message1",
-			number:       23,
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			parent:       "testprotos.NoSuchMessage",
-			number:       11,
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			parent:       "testprotos.Message1",
-			number:       30,
-			wantErr:      true,
-			wantNotFound: true,
-		}, {
-			parent:       "testprotos.Message1",
-			number:       99,
-			wantErr:      true,
-			wantNotFound: true,
-		}}
-		for _, tc := range tests {
-			got, err := registry.FindExtensionByNumber(protoreflect.FullName(tc.parent), protoreflect.FieldNumber(tc.number))
-			gotErr := err != nil
-			if gotErr != tc.wantErr {
-				t.Errorf("FindExtensionByNumber(%v, %d) = (_, %v), want error? %t", tc.parent, tc.number, err, tc.wantErr)
-				continue
-			}
-			if tc.wantNotFound && err != protoregistry.NotFound {
-				t.Errorf("FindExtensionByNumber(%v, %d) got error %v, want NotFound error", tc.parent, tc.number, err)
-				continue
-			}
-			if got != tc.extensionType {
-				t.Errorf("FindExtensionByNumber(%v, %d) got wrong value: %v", tc.parent, tc.number, got)
-			}
-		}
-	})
-
-	sortTypes := cmp.Options{
-		cmpopts.SortSlices(func(x, y protoreflect.EnumType) bool {
-			return x.Descriptor().FullName() < y.Descriptor().FullName()
-		}),
-		cmpopts.SortSlices(func(x, y protoreflect.MessageType) bool {
-			return x.Descriptor().FullName() < y.Descriptor().FullName()
-		}),
-		cmpopts.SortSlices(func(x, y protoreflect.ExtensionType) bool {
-			return x.TypeDescriptor().FullName() < y.TypeDescriptor().FullName()
-		}),
-	}
-	compare := cmp.Options{
-		cmp.Comparer(func(x, y protoreflect.EnumType) bool {
-			return x == y
-		}),
-		cmp.Comparer(func(x, y protoreflect.ExtensionType) bool {
-			return x == y
-		}),
-		cmp.Comparer(func(x, y protoreflect.MessageType) bool {
-			return x == y
-		}),
-	}
-
-	t.Run("RangeEnums", func(t *testing.T) {
-		want := []protoreflect.EnumType{et1}
-		var got []protoreflect.EnumType
-		var gotCnt int
-		wantCnt := registry.NumEnums()
-		registry.RangeEnums(func(et protoreflect.EnumType) bool {
-			got = append(got, et)
-			gotCnt++
-			return true
-		})
-
-		if gotCnt != wantCnt {
-			t.Errorf("NumEnums() = %v, want %v", gotCnt, wantCnt)
-		}
-		if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
-			t.Errorf("RangeEnums() mismatch (-want +got):\n%v", diff)
-		}
-	})
-
-	t.Run("RangeMessages", func(t *testing.T) {
-		want := []protoreflect.MessageType{mt1}
-		var got []protoreflect.MessageType
-		var gotCnt int
-		wantCnt := registry.NumMessages()
-		registry.RangeMessages(func(mt protoreflect.MessageType) bool {
-			got = append(got, mt)
-			gotCnt++
-			return true
-		})
-
-		if gotCnt != wantCnt {
-			t.Errorf("NumMessages() = %v, want %v", gotCnt, wantCnt)
-		}
-		if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
-			t.Errorf("RangeMessages() mismatch (-want +got):\n%v", diff)
-		}
-	})
-
-	t.Run("RangeExtensions", func(t *testing.T) {
-		want := []protoreflect.ExtensionType{xt1, xt2}
-		var got []protoreflect.ExtensionType
-		var gotCnt int
-		wantCnt := registry.NumExtensions()
-		registry.RangeExtensions(func(xt protoreflect.ExtensionType) bool {
-			got = append(got, xt)
-			gotCnt++
-			return true
-		})
-
-		if gotCnt != wantCnt {
-			t.Errorf("NumExtensions() = %v, want %v", gotCnt, wantCnt)
-		}
-		if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
-			t.Errorf("RangeExtensions() mismatch (-want +got):\n%v", diff)
-		}
-	})
-
-	t.Run("RangeExtensionsByMessage", func(t *testing.T) {
-		want := []protoreflect.ExtensionType{xt1, xt2}
-		var got []protoreflect.ExtensionType
-		var gotCnt int
-		wantCnt := registry.NumExtensionsByMessage("testprotos.Message1")
-		registry.RangeExtensionsByMessage("testprotos.Message1", func(xt protoreflect.ExtensionType) bool {
-			got = append(got, xt)
-			gotCnt++
-			return true
-		})
-
-		if gotCnt != wantCnt {
-			t.Errorf("NumExtensionsByMessage() = %v, want %v", gotCnt, wantCnt)
-		}
-		if diff := cmp.Diff(want, got, sortTypes, compare); diff != "" {
-			t.Errorf("RangeExtensionsByMessage() mismatch (-want +got):\n%v", diff)
-		}
-	})
-}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/ya.make b/vendor/google.golang.org/protobuf/reflect/protoregistry/ya.make
index 85b2be51279..a6fda0d69da 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoregistry/ya.make
+++ b/vendor/google.golang.org/protobuf/reflect/protoregistry/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(registry.go)
-
-GO_XTEST_SRCS(registry_test.go)
+SRCS(
+    registry.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/testing/protocmp/util.go b/vendor/google.golang.org/protobuf/testing/protocmp/util.go
index ee66ae9893b..dec34f20c43 100644
--- a/vendor/google.golang.org/protobuf/testing/protocmp/util.go
+++ b/vendor/google.golang.org/protobuf/testing/protocmp/util.go
@@ -23,34 +23,34 @@ var (
 	messageReflectType = reflect.TypeOf(Message{})
 )
 
-// FilterEnum filters opt to only be applicable on standalone Enums,
+// FilterEnum filters opt to only be applicable on a standalone [Enum],
 // singular fields of enums, list fields of enums, or map fields of enum values,
 // where the enum is the same type as the specified enum.
 //
 // The Go type of the last path step may be an:
-//   - Enum for singular fields, elements of a repeated field,
-//     values of a map field, or standalone Enums
-//   - []Enum for list fields
-//   - map[K]Enum for map fields
-//   - interface{} for a Message map entry value
+//   - [Enum] for singular fields, elements of a repeated field,
+//     values of a map field, or standalone [Enum] values
+//   - [][Enum] for list fields
+//   - map[K][Enum] for map fields
+//   - interface{} for a [Message] map entry value
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func FilterEnum(enum protoreflect.Enum, opt cmp.Option) cmp.Option {
 	return FilterDescriptor(enum.Descriptor(), opt)
 }
 
-// FilterMessage filters opt to only be applicable on standalone Messages,
+// FilterMessage filters opt to only be applicable on a standalone [Message] values,
 // singular fields of messages, list fields of messages, or map fields of
 // message values, where the message is the same type as the specified message.
 //
 // The Go type of the last path step may be an:
-//   - Message for singular fields, elements of a repeated field,
-//     values of a map field, or standalone Messages
-//   - []Message for list fields
-//   - map[K]Message for map fields
-//   - interface{} for a Message map entry value
+//   - [Message] for singular fields, elements of a repeated field,
+//     values of a map field, or standalone [Message] values
+//   - [][Message] for list fields
+//   - map[K][Message] for map fields
+//   - interface{} for a [Message] map entry value
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func FilterMessage(message proto.Message, opt cmp.Option) cmp.Option {
 	return FilterDescriptor(message.ProtoReflect().Descriptor(), opt)
 }
@@ -62,9 +62,9 @@ func FilterMessage(message proto.Message, opt cmp.Option) cmp.Option {
 //   - T for singular fields
 //   - []T for list fields
 //   - map[K]T for map fields
-//   - interface{} for a Message map entry value
+//   - interface{} for a [Message] map entry value
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func FilterField(message proto.Message, name protoreflect.Name, opt cmp.Option) cmp.Option {
 	md := message.ProtoReflect().Descriptor()
 	return FilterDescriptor(mustFindFieldDescriptor(md, name), opt)
@@ -78,9 +78,9 @@ func FilterField(message proto.Message, name protoreflect.Name, opt cmp.Option)
 //   - T for singular fields
 //   - []T for list fields
 //   - map[K]T for map fields
-//   - interface{} for a Message map entry value
+//   - interface{} for a [Message] map entry value
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func FilterOneof(message proto.Message, name protoreflect.Name, opt cmp.Option) cmp.Option {
 	md := message.ProtoReflect().Descriptor()
 	return FilterDescriptor(mustFindOneofDescriptor(md, name), opt)
@@ -89,17 +89,17 @@ func FilterOneof(message proto.Message, name protoreflect.Name, opt cmp.Option)
 // FilterDescriptor ignores the specified descriptor.
 //
 // The following descriptor types may be specified:
-//   - protoreflect.EnumDescriptor
-//   - protoreflect.MessageDescriptor
-//   - protoreflect.FieldDescriptor
-//   - protoreflect.OneofDescriptor
+//   - [protoreflect.EnumDescriptor]
+//   - [protoreflect.MessageDescriptor]
+//   - [protoreflect.FieldDescriptor]
+//   - [protoreflect.OneofDescriptor]
 //
 // For the behavior of each, see the corresponding filter function.
-// Since this filter accepts a protoreflect.FieldDescriptor, it can be used
-// to also filter for extension fields as a protoreflect.ExtensionDescriptor
-// is just an alias to protoreflect.FieldDescriptor.
+// Since this filter accepts a [protoreflect.FieldDescriptor], it can be used
+// to also filter for extension fields as a [protoreflect.ExtensionDescriptor]
+// is just an alias to [protoreflect.FieldDescriptor].
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func FilterDescriptor(desc protoreflect.Descriptor, opt cmp.Option) cmp.Option {
 	f := newNameFilters(desc)
 	return cmp.FilterPath(f.Filter, opt)
@@ -108,7 +108,7 @@ func FilterDescriptor(desc protoreflect.Descriptor, opt cmp.Option) cmp.Option {
 // IgnoreEnums ignores all enums of the specified types.
 // It is equivalent to FilterEnum(enum, cmp.Ignore()) for each enum.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreEnums(enums ...protoreflect.Enum) cmp.Option {
 	var ds []protoreflect.Descriptor
 	for _, e := range enums {
@@ -118,9 +118,9 @@ func IgnoreEnums(enums ...protoreflect.Enum) cmp.Option {
 }
 
 // IgnoreMessages ignores all messages of the specified types.
-// It is equivalent to FilterMessage(message, cmp.Ignore()) for each message.
+// It is equivalent to [FilterMessage](message, [cmp.Ignore]()) for each message.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreMessages(messages ...proto.Message) cmp.Option {
 	var ds []protoreflect.Descriptor
 	for _, m := range messages {
@@ -130,10 +130,10 @@ func IgnoreMessages(messages ...proto.Message) cmp.Option {
 }
 
 // IgnoreFields ignores the specified fields in the specified message.
-// It is equivalent to FilterField(message, name, cmp.Ignore()) for each field
+// It is equivalent to [FilterField](message, name, [cmp.Ignore]()) for each field
 // in the message.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreFields(message proto.Message, names ...protoreflect.Name) cmp.Option {
 	var ds []protoreflect.Descriptor
 	md := message.ProtoReflect().Descriptor()
@@ -147,7 +147,7 @@ func IgnoreFields(message proto.Message, names ...protoreflect.Name) cmp.Option
 // It is equivalent to FilterOneof(message, name, cmp.Ignore()) for each oneof
 // in the message.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreOneofs(message proto.Message, names ...protoreflect.Name) cmp.Option {
 	var ds []protoreflect.Descriptor
 	md := message.ProtoReflect().Descriptor()
@@ -158,9 +158,9 @@ func IgnoreOneofs(message proto.Message, names ...protoreflect.Name) cmp.Option
 }
 
 // IgnoreDescriptors ignores the specified set of descriptors.
-// It is equivalent to FilterDescriptor(desc, cmp.Ignore()) for each descriptor.
+// It is equivalent to [FilterDescriptor](desc, [cmp.Ignore]()) for each descriptor.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreDescriptors(descs ...protoreflect.Descriptor) cmp.Option {
 	return cmp.FilterPath(newNameFilters(descs...).Filter, cmp.Ignore())
 }
@@ -348,7 +348,7 @@ func (f *nameFilters) filterValue(v reflect.Value) bool {
 // explicitly set to the default value.
 // This option does not effect elements in a list or entries in a map.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreDefaultScalars() cmp.Option {
 	return cmp.FilterPath(func(p cmp.Path) bool {
 		// Filter for Message maps.
@@ -408,10 +408,10 @@ func equalFloat64(x, y float64) bool {
 }
 
 // IgnoreEmptyMessages ignores messages that are empty or unpopulated.
-// It applies to standalone Messages, singular message fields,
+// It applies to standalone [Message] values, singular message fields,
 // list fields of messages, and map fields of message values.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreEmptyMessages() cmp.Option {
 	return cmp.FilterPath(func(p cmp.Path) bool {
 		vx, vy := p.Last().Values()
@@ -490,7 +490,7 @@ func isEmptyMessage(v reflect.Value) bool {
 
 // IgnoreUnknown ignores unknown fields in all messages.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func IgnoreUnknown() cmp.Option {
 	return cmp.FilterPath(func(p cmp.Path) bool {
 		// Filter for Message maps.
@@ -515,16 +515,16 @@ func IgnoreUnknown() cmp.Option {
 // The element type T can be one of the following:
 //   - Go type for a protobuf scalar kind except for an enum
 //     (i.e., bool, int32, int64, uint32, uint64, float32, float64, string, and []byte)
-//   - E where E is a concrete enum type that implements protoreflect.Enum
-//   - M where M is a concrete message type that implement proto.Message
+//   - E where E is a concrete enum type that implements [protoreflect.Enum]
+//   - M where M is a concrete message type that implement [proto.Message]
 //
 // This option only applies to repeated fields within a protobuf message.
 // It does not operate on higher-order Go types that seem like a repeated field.
 // For example, a []T outside the context of a protobuf message will not be
 // handled by this option. To sort Go slices that are not repeated fields,
-// consider using "github.com/google/go-cmp/cmp/cmpopts".SortSlices instead.
+// consider using [github.com/google/go-cmp/cmp/cmpopts.SortSlices] instead.
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func SortRepeated(lessFunc interface{}) cmp.Option {
 	t, ok := checkTTBFunc(lessFunc)
 	if !ok {
@@ -613,8 +613,8 @@ func checkTTBFunc(lessFunc interface{}) (reflect.Type, bool) {
 //   - Floating-point numbers are sorted in ascending order according to
 //     the total ordering defined by IEEE-754 (section 5.10).
 //   - Strings and bytes are sorted lexicographically in ascending order.
-//   - Enums are sorted in ascending order based on its numeric value.
-//   - Messages are sorted according to some arbitrary ordering
+//   - [Enum] values are sorted in ascending order based on its numeric value.
+//   - [Message] values are sorted according to some arbitrary ordering
 //     which is undefined and may change in future implementations.
 //
 // The ordering chosen for repeated messages is unlikely to be aesthetically
@@ -624,7 +624,7 @@ func checkTTBFunc(lessFunc interface{}) (reflect.Type, bool) {
 //	    ... // user-provided definition for less
 //	}))
 //
-// This must be used in conjunction with Transform.
+// This must be used in conjunction with [Transform].
 func SortRepeatedFields(message proto.Message, names ...protoreflect.Name) cmp.Option {
 	var opts cmp.Options
 	md := message.ProtoReflect().Descriptor()
diff --git a/vendor/google.golang.org/protobuf/testing/protocmp/xform.go b/vendor/google.golang.org/protobuf/testing/protocmp/xform.go
index 364a55ca768..1527af7ad4d 100644
--- a/vendor/google.golang.org/protobuf/testing/protocmp/xform.go
+++ b/vendor/google.golang.org/protobuf/testing/protocmp/xform.go
@@ -3,11 +3,11 @@
 // license that can be found in the LICENSE file.
 
 // Package protocmp provides protobuf specific options for the
-// "github.com/google/go-cmp/cmp" package.
+// [github.com/google/go-cmp/cmp] package.
 //
-// The primary feature is the Transform option, which transform proto.Message
-// types into a Message map that is suitable for cmp to introspect upon.
-// All other options in this package must be used in conjunction with Transform.
+// The primary feature is the [Transform] option, which transform [proto.Message]
+// types into a [Message] map that is suitable for cmp to introspect upon.
+// All other options in this package must be used in conjunction with [Transform].
 package protocmp
 
 import (
@@ -33,7 +33,7 @@ var (
 )
 
 // Enum is a dynamic representation of a protocol buffer enum that is
-// suitable for cmp.Equal and cmp.Diff to compare upon.
+// suitable for [cmp.Equal] and [cmp.Diff] to compare upon.
 type Enum struct {
 	num protoreflect.EnumNumber
 	ed  protoreflect.EnumDescriptor
@@ -94,15 +94,15 @@ func (t1 messageMeta) Equal(t2 messageMeta) bool {
 }
 
 // Message is a dynamic representation of a protocol buffer message that is
-// suitable for cmp.Equal and cmp.Diff to directly operate upon.
+// suitable for [cmp.Equal] and [cmp.Diff] to directly operate upon.
 //
 // Every populated known field (excluding extension fields) is stored in the map
 // with the key being the short name of the field (e.g., "field_name") and
 // the value determined by the kind and cardinality of the field.
 //
-// Singular scalars are represented by the same Go type as protoreflect.Value,
-// singular messages are represented by the Message type,
-// singular enums are represented by the Enum type,
+// Singular scalars are represented by the same Go type as [protoreflect.Value],
+// singular messages are represented by the [Message] type,
+// singular enums are represented by the [Enum] type,
 // list fields are represented as a Go slice, and
 // map fields are represented as a Go map.
 //
@@ -112,7 +112,7 @@ func (t1 messageMeta) Equal(t2 messageMeta) bool {
 //
 // Every unknown field is stored in the map with the key being the field number
 // encoded as a decimal string (e.g., "132") and the value being the raw bytes
-// of the encoded field (as the protoreflect.RawFields type).
+// of the encoded field (as the [protoreflect.RawFields] type).
 //
 // Message values must not be created by or mutated by users.
 type Message map[string]interface{}
@@ -132,7 +132,7 @@ func (m Message) Descriptor() protoreflect.MessageDescriptor {
 }
 
 // ProtoReflect returns a reflective view of m.
-// It only implements the read-only operations of protoreflect.Message.
+// It only implements the read-only operations of [protoreflect.Message].
 // Calling any mutating operations on m panics.
 func (m Message) ProtoReflect() protoreflect.Message {
 	return (reflectMessage)(m)
@@ -162,11 +162,11 @@ func (m Message) String() string {
 
 type option struct{}
 
-// Transform returns a cmp.Option that converts each proto.Message to a Message.
+// Transform returns a [cmp.Option] that converts each [proto.Message] to a [Message].
 // The transformation does not mutate nor alias any converted messages.
 //
 // The google.protobuf.Any message is automatically unmarshaled such that the
-// "value" field is a Message representing the underlying message value
+// "value" field is a [Message] representing the underlying message value
 // assuming it could be resolved and properly unmarshaled.
 //
 // This does not directly transform higher-order composite Go types.
diff --git a/vendor/google.golang.org/protobuf/testing/protocmp/ya.make b/vendor/google.golang.org/protobuf/testing/protocmp/ya.make
index a9aef9a8609..293c3a4f2f9 100644
--- a/vendor/google.golang.org/protobuf/testing/protocmp/ya.make
+++ b/vendor/google.golang.org/protobuf/testing/protocmp/ya.make
@@ -8,12 +8,4 @@ SRCS(
     xform.go
 )
 
-GO_TEST_SRCS(
-    reflect_test.go
-    util_test.go
-    xform_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/testing/protopack/pack.go b/vendor/google.golang.org/protobuf/testing/protopack/pack.go
index ada10f3391d..1cecbac3f73 100644
--- a/vendor/google.golang.org/protobuf/testing/protopack/pack.go
+++ b/vendor/google.golang.org/protobuf/testing/protopack/pack.go
@@ -25,10 +25,10 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-// Number is the field number; aliased from the protowire package for convenience.
+// Number is the field number; aliased from the [protowire] package for convenience.
 type Number = protowire.Number
 
-// Number type constants; copied from the protowire package for convenience.
+// Number type constants; copied from the [protowire] package for convenience.
 const (
 	MinValidNumber      Number = protowire.MinValidNumber
 	FirstReservedNumber Number = protowire.FirstReservedNumber
@@ -36,10 +36,10 @@ const (
 	MaxValidNumber      Number = protowire.MaxValidNumber
 )
 
-// Type is the wire type; aliased from the protowire package for convenience.
+// Type is the wire type; aliased from the [protowire] package for convenience.
 type Type = protowire.Type
 
-// Wire type constants; copied from the protowire package for convenience.
+// Wire type constants; copied from the [protowire] package for convenience.
 const (
 	VarintType     Type = protowire.VarintType
 	Fixed32Type    Type = protowire.Fixed32Type
@@ -50,9 +50,9 @@ const (
 )
 
 type (
-	// Token is any other type (e.g., Message, Tag, Varint, Float32, etc).
+	// Token is any other type (e.g., [Message], [Tag], [Varint], [Float32], etc).
 	Token token
-	// Message is an ordered sequence of  Tokens, where certain tokens may
+	// Message is an ordered sequence of [Token] values, where certain tokens may
 	// contain other tokens. It is functionally a concrete syntax tree that
 	// losslessly represents any arbitrary wire data (including invalid input).
 	Message []Token
@@ -96,10 +96,10 @@ type (
 	// using more bytes than is strictly necessary. The number of extra bytes
 	// alone is sufficient to losslessly represent the denormalized varint.
 	//
-	// The value may be one of Tag, Bool, Varint, Svarint, or Uvarint,
+	// The value may be one of [Tag], [Bool], [Varint], [Svarint], or [Uvarint],
 	// where the varint representation of each token is denormalized.
 	//
-	// Alternatively, the value may be one of String, Bytes, or LengthPrefix,
+	// Alternatively, the value may be one of [String], [Bytes], or [LengthPrefix],
 	// where the varint representation of the length-prefix is denormalized.
 	Denormalized struct {
 		Count uint // number of extra bytes
@@ -249,21 +249,21 @@ func (m Message) Marshal() []byte {
 
 // Unmarshal parses the input protobuf wire data as a syntax tree.
 // Any parsing error results in the remainder of the input being
-// concatenated to the message as a Raw type.
+// concatenated to the message as a [Raw] type.
 //
 // Each tag (a tuple of the field number and wire type) encountered is
-// inserted into the syntax tree as a Tag.
+// inserted into the syntax tree as a [Tag].
 //
 // The contents of each wire type is mapped to the following Go types:
 //
-//	VarintType   => Uvarint
-//	Fixed32Type  => Uint32
-//	Fixed64Type  => Uint64
-//	BytesType    => Bytes
-//	GroupType    => Message
+//   - [VarintType] ⇒ [Uvarint]
+//   - [Fixed32Type] ⇒ [Uint32]
+//   - [Fixed64Type] ⇒ [Uint64]
+//   - [BytesType] ⇒ [Bytes]
+//   - [StartGroupType] and [StartGroupType] ⇒ [Message]
 //
 // Since the wire format is not self-describing, this function cannot parse
-// sub-messages and will leave them as the Bytes type. Further manual parsing
+// sub-messages and will leave them as the [Bytes] type. Further manual parsing
 // can be performed as such:
 //
 //	var m, m1, m2 Message
@@ -280,25 +280,25 @@ func (m *Message) Unmarshal(in []byte) {
 
 // UnmarshalDescriptor parses the input protobuf wire data as a syntax tree
 // using the provided message descriptor for more accurate parsing of fields.
-// It operates like Unmarshal, but may use a wider range of Go types to
+// It operates like [Message.Unmarshal], but may use a wider range of Go types to
 // represent the wire data.
 //
 // The contents of each wire type is mapped to one of the following Go types:
 //
-//	VarintType   => Bool, Varint, Svarint, Uvarint
-//	Fixed32Type  => Int32, Uint32, Float32
-//	Fixed64Type  => Uint32, Uint64, Float64
-//	BytesType    => String, Bytes, LengthPrefix
-//	GroupType    => Message
+//   - [VarintType] ⇒ [Bool], [Varint], [Svarint], [Uvarint]
+//   - [Fixed32Type] ⇒ [Int32], [Uint32], [Float32]
+//   - [Fixed64Type] ⇒ [Uint32], [Uint64], [Float64]
+//   - [BytesType] ⇒ [String], [Bytes], [LengthPrefix]
+//   - [StartGroupType] and [StartGroupType] ⇒ [Message]
 //
-// If the field is unknown, it uses the same mapping as Unmarshal.
+// If the field is unknown, it uses the same mapping as [Message.Unmarshal].
 // Known sub-messages are parsed as a Message and packed repeated fields are
-// parsed as a LengthPrefix.
+// parsed as a [LengthPrefix].
 func (m *Message) UnmarshalDescriptor(in []byte, desc protoreflect.MessageDescriptor) {
 	m.unmarshal(in, desc, false)
 }
 
-// UnmarshalAbductive is like UnmarshalDescriptor, but infers abductively
+// UnmarshalAbductive is like [Message.UnmarshalDescriptor], but infers abductively
 // whether any unknown bytes values is a message based on whether it is
 // a syntactically well-formed message.
 //
diff --git a/vendor/google.golang.org/protobuf/testing/protopack/ya.make b/vendor/google.golang.org/protobuf/testing/protopack/ya.make
index 1e3ec307643..bdd0d42ea51 100644
--- a/vendor/google.golang.org/protobuf/testing/protopack/ya.make
+++ b/vendor/google.golang.org/protobuf/testing/protopack/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(pack.go)
-
-GO_TEST_SRCS(pack_test.go)
+SRCS(
+    pack.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/testing/prototest/enum.go b/vendor/google.golang.org/protobuf/testing/prototest/enum.go
deleted file mode 100644
index db9dacd459c..00000000000
--- a/vendor/google.golang.org/protobuf/testing/prototest/enum.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package prototest
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-// Enum tests an EnumType implementation.
-type Enum struct{}
-
-func (test Enum) Test(t testing.TB, et protoreflect.EnumType) {
-	ed := et.Descriptor()
-	values := ed.Values()
-	for i := 0; i < values.Len(); i++ {
-		evd := values.Get(i)
-		num := evd.Number()
-		e := et.New(num)
-		if e.Descriptor() != ed {
-			t.Errorf("enumType.New(%v).Descriptor() != enumType.Descriptor(), should match", num)
-		}
-		if e.Type() != et {
-			t.Errorf("enumType.New(%v).Type() != enumType, should match", num)
-		}
-		if got, want := e.Number(), num; got != want {
-			t.Errorf("enumType.New(%v).Number() = %v, want %v", num, got, want)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/testing/prototest/message.go b/vendor/google.golang.org/protobuf/testing/prototest/message.go
deleted file mode 100644
index d64b0af5f6f..00000000000
--- a/vendor/google.golang.org/protobuf/testing/prototest/message.go
+++ /dev/null
@@ -1,893 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package prototest exercises protobuf reflection.
-package prototest
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/encoding/protowire"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-)
-
-// TODO: Test invalid field descriptors or oneof descriptors.
-// TODO: This should test the functionality that can be provided by fast-paths.
-
-// Message tests a message implementation.
-type Message struct {
-	// Resolver is used to determine the list of extension fields to test with.
-	// If nil, this defaults to using protoregistry.GlobalTypes.
-	Resolver interface {
-		FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error)
-		FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error)
-		RangeExtensionsByMessage(message protoreflect.FullName, f func(protoreflect.ExtensionType) bool)
-	}
-}
-
-// Test performs tests on a MessageType implementation.
-func (test Message) Test(t testing.TB, mt protoreflect.MessageType) {
-	testType(t, mt)
-
-	md := mt.Descriptor()
-	m1 := mt.New()
-	for i := 0; i < md.Fields().Len(); i++ {
-		fd := md.Fields().Get(i)
-		testField(t, m1, fd)
-	}
-	if test.Resolver == nil {
-		test.Resolver = protoregistry.GlobalTypes
-	}
-	var extTypes []protoreflect.ExtensionType
-	test.Resolver.RangeExtensionsByMessage(md.FullName(), func(e protoreflect.ExtensionType) bool {
-		extTypes = append(extTypes, e)
-		return true
-	})
-	for _, xt := range extTypes {
-		testField(t, m1, xt.TypeDescriptor())
-	}
-	for i := 0; i < md.Oneofs().Len(); i++ {
-		testOneof(t, m1, md.Oneofs().Get(i))
-	}
-	testUnknown(t, m1)
-
-	// Test round-trip marshal/unmarshal.
-	m2 := mt.New().Interface()
-	populateMessage(m2.ProtoReflect(), 1, nil)
-	for _, xt := range extTypes {
-		m2.ProtoReflect().Set(xt.TypeDescriptor(), newValue(m2.ProtoReflect(), xt.TypeDescriptor(), 1, nil))
-	}
-	b, err := proto.MarshalOptions{
-		AllowPartial: true,
-	}.Marshal(m2)
-	if err != nil {
-		t.Errorf("Marshal() = %v, want nil\n%v", err, prototext.Format(m2))
-	}
-	m3 := mt.New().Interface()
-	if err := (proto.UnmarshalOptions{
-		AllowPartial: true,
-		Resolver:     test.Resolver,
-	}.Unmarshal(b, m3)); err != nil {
-		t.Errorf("Unmarshal() = %v, want nil\n%v", err, prototext.Format(m2))
-	}
-	if !proto.Equal(m2, m3) {
-		t.Errorf("round-trip marshal/unmarshal did not preserve message\nOriginal:\n%v\nNew:\n%v", prototext.Format(m2), prototext.Format(m3))
-	}
-}
-
-func testType(t testing.TB, mt protoreflect.MessageType) {
-	m := mt.New().Interface()
-	want := reflect.TypeOf(m)
-	if got := reflect.TypeOf(m.ProtoReflect().Interface()); got != want {
-		t.Errorf("type mismatch: reflect.TypeOf(m) != reflect.TypeOf(m.ProtoReflect().Interface()): %v != %v", got, want)
-	}
-	if got := reflect.TypeOf(m.ProtoReflect().New().Interface()); got != want {
-		t.Errorf("type mismatch: reflect.TypeOf(m) != reflect.TypeOf(m.ProtoReflect().New().Interface()): %v != %v", got, want)
-	}
-	if got := reflect.TypeOf(m.ProtoReflect().Type().Zero().Interface()); got != want {
-		t.Errorf("type mismatch: reflect.TypeOf(m) != reflect.TypeOf(m.ProtoReflect().Type().Zero().Interface()): %v != %v", got, want)
-	}
-	if mt, ok := mt.(protoreflect.MessageFieldTypes); ok {
-		testFieldTypes(t, mt)
-	}
-}
-
-func testFieldTypes(t testing.TB, mt protoreflect.MessageFieldTypes) {
-	descName := func(d protoreflect.Descriptor) protoreflect.FullName {
-		if d == nil {
-			return "<nil>"
-		}
-		return d.FullName()
-	}
-	typeName := func(mt protoreflect.MessageType) protoreflect.FullName {
-		if mt == nil {
-			return "<nil>"
-		}
-		return mt.Descriptor().FullName()
-	}
-	adjustExpr := func(idx int, expr string) string {
-		expr = strings.Replace(expr, "fd.", "md.Fields().Get(i).", -1)
-		expr = strings.Replace(expr, "(fd)", "(md.Fields().Get(i))", -1)
-		expr = strings.Replace(expr, "mti.", "mt.Message(i).", -1)
-		expr = strings.Replace(expr, "(i)", fmt.Sprintf("(%d)", idx), -1)
-		return expr
-	}
-	checkEnumDesc := func(idx int, gotExpr, wantExpr string, got, want protoreflect.EnumDescriptor) {
-		if got != want {
-			t.Errorf("descriptor mismatch: %v != %v: %v != %v", adjustExpr(idx, gotExpr), adjustExpr(idx, wantExpr), descName(got), descName(want))
-		}
-	}
-	checkMessageDesc := func(idx int, gotExpr, wantExpr string, got, want protoreflect.MessageDescriptor) {
-		if got != want {
-			t.Errorf("descriptor mismatch: %v != %v: %v != %v", adjustExpr(idx, gotExpr), adjustExpr(idx, wantExpr), descName(got), descName(want))
-		}
-	}
-	checkMessageType := func(idx int, gotExpr, wantExpr string, got, want protoreflect.MessageType) {
-		if got != want {
-			t.Errorf("type mismatch: %v != %v: %v != %v", adjustExpr(idx, gotExpr), adjustExpr(idx, wantExpr), typeName(got), typeName(want))
-		}
-	}
-
-	fds := mt.Descriptor().Fields()
-	m := mt.New()
-	for i := 0; i < fds.Len(); i++ {
-		fd := fds.Get(i)
-		switch {
-		case fd.IsList():
-			if fd.Enum() != nil {
-				checkEnumDesc(i,
-					"mt.Enum(i).Descriptor()", "fd.Enum()",
-					mt.Enum(i).Descriptor(), fd.Enum())
-			}
-			if fd.Message() != nil {
-				checkMessageDesc(i,
-					"mt.Message(i).Descriptor()", "fd.Message()",
-					mt.Message(i).Descriptor(), fd.Message())
-				checkMessageType(i,
-					"mt.Message(i)", "m.NewField(fd).List().NewElement().Message().Type()",
-					mt.Message(i), m.NewField(fd).List().NewElement().Message().Type())
-			}
-		case fd.IsMap():
-			mti := mt.Message(i)
-			if m := mti.New(); m != nil {
-				checkMessageDesc(i,
-					"m.Descriptor()", "fd.Message()",
-					m.Descriptor(), fd.Message())
-			}
-			if m := mti.Zero(); m != nil {
-				checkMessageDesc(i,
-					"m.Descriptor()", "fd.Message()",
-					m.Descriptor(), fd.Message())
-			}
-			checkMessageDesc(i,
-				"mti.Descriptor()", "fd.Message()",
-				mti.Descriptor(), fd.Message())
-			if mti := mti.(protoreflect.MessageFieldTypes); mti != nil {
-				if fd.MapValue().Enum() != nil {
-					checkEnumDesc(i,
-						"mti.Enum(fd.MapValue().Index()).Descriptor()", "fd.MapValue().Enum()",
-						mti.Enum(fd.MapValue().Index()).Descriptor(), fd.MapValue().Enum())
-				}
-				if fd.MapValue().Message() != nil {
-					checkMessageDesc(i,
-						"mti.Message(fd.MapValue().Index()).Descriptor()", "fd.MapValue().Message()",
-						mti.Message(fd.MapValue().Index()).Descriptor(), fd.MapValue().Message())
-					checkMessageType(i,
-						"mti.Message(fd.MapValue().Index())", "m.NewField(fd).Map().NewValue().Message().Type()",
-						mti.Message(fd.MapValue().Index()), m.NewField(fd).Map().NewValue().Message().Type())
-				}
-			}
-		default:
-			if fd.Enum() != nil {
-				checkEnumDesc(i,
-					"mt.Enum(i).Descriptor()", "fd.Enum()",
-					mt.Enum(i).Descriptor(), fd.Enum())
-			}
-			if fd.Message() != nil {
-				checkMessageDesc(i,
-					"mt.Message(i).Descriptor()", "fd.Message()",
-					mt.Message(i).Descriptor(), fd.Message())
-				checkMessageType(i,
-					"mt.Message(i)", "m.NewField(fd).Message().Type()",
-					mt.Message(i), m.NewField(fd).Message().Type())
-			}
-		}
-	}
-}
-
-// testField exercises set/get/has/clear of a field.
-func testField(t testing.TB, m protoreflect.Message, fd protoreflect.FieldDescriptor) {
-	name := fd.FullName()
-	num := fd.Number()
-
-	switch {
-	case fd.IsList():
-		testFieldList(t, m, fd)
-	case fd.IsMap():
-		testFieldMap(t, m, fd)
-	case fd.Message() != nil:
-	default:
-		if got, want := m.NewField(fd), fd.Default(); !valueEqual(got, want) {
-			t.Errorf("Message.NewField(%v) = %v, want default value %v", name, formatValue(got), formatValue(want))
-		}
-		if fd.Kind() == protoreflect.FloatKind || fd.Kind() == protoreflect.DoubleKind {
-			testFieldFloat(t, m, fd)
-		}
-	}
-
-	// Set to a non-zero value, the zero value, different non-zero values.
-	for _, n := range []seed{1, 0, minVal, maxVal} {
-		v := newValue(m, fd, n, nil)
-		m.Set(fd, v)
-		wantHas := true
-		if n == 0 {
-			if fd.Syntax() == protoreflect.Proto3 && fd.Message() == nil {
-				wantHas = false
-			}
-			if fd.IsExtension() {
-				wantHas = true
-			}
-			if fd.Cardinality() == protoreflect.Repeated {
-				wantHas = false
-			}
-			if fd.ContainingOneof() != nil {
-				wantHas = true
-			}
-		}
-		if fd.Syntax() == protoreflect.Proto3 && fd.Cardinality() != protoreflect.Repeated && fd.ContainingOneof() == nil && fd.Kind() == protoreflect.EnumKind && v.Enum() == 0 {
-			wantHas = false
-		}
-		if got, want := m.Has(fd), wantHas; got != want {
-			t.Errorf("after setting %q to %v:\nMessage.Has(%v) = %v, want %v", name, formatValue(v), num, got, want)
-		}
-		if got, want := m.Get(fd), v; !valueEqual(got, want) {
-			t.Errorf("after setting %q:\nMessage.Get(%v) = %v, want %v", name, num, formatValue(got), formatValue(want))
-		}
-		found := false
-		m.Range(func(d protoreflect.FieldDescriptor, got protoreflect.Value) bool {
-			if fd != d {
-				return true
-			}
-			found = true
-			if want := v; !valueEqual(got, want) {
-				t.Errorf("after setting %q:\nMessage.Range got value %v, want %v", name, formatValue(got), formatValue(want))
-			}
-			return true
-		})
-		if got, want := wantHas, found; got != want {
-			t.Errorf("after setting %q:\nMessageRange saw field: %v, want %v", name, got, want)
-		}
-	}
-
-	m.Clear(fd)
-	if got, want := m.Has(fd), false; got != want {
-		t.Errorf("after clearing %q:\nMessage.Has(%v) = %v, want %v", name, num, got, want)
-	}
-	switch {
-	case fd.IsList():
-		if got := m.Get(fd); got.List().Len() != 0 {
-			t.Errorf("after clearing %q:\nMessage.Get(%v) = %v, want empty list", name, num, formatValue(got))
-		}
-	case fd.IsMap():
-		if got := m.Get(fd); got.Map().Len() != 0 {
-			t.Errorf("after clearing %q:\nMessage.Get(%v) = %v, want empty map", name, num, formatValue(got))
-		}
-	case fd.Message() == nil:
-		if got, want := m.Get(fd), fd.Default(); !valueEqual(got, want) {
-			t.Errorf("after clearing %q:\nMessage.Get(%v) = %v, want default %v", name, num, formatValue(got), formatValue(want))
-		}
-	}
-
-	// Set to the default value.
-	switch {
-	case fd.IsList() || fd.IsMap():
-		m.Set(fd, m.Mutable(fd))
-		if got, want := m.Has(fd), (fd.IsExtension() && fd.Cardinality() != protoreflect.Repeated) || fd.ContainingOneof() != nil; got != want {
-			t.Errorf("after setting %q to default:\nMessage.Has(%v) = %v, want %v", name, num, got, want)
-		}
-	case fd.Message() == nil:
-		m.Set(fd, m.Get(fd))
-		if got, want := m.Get(fd), fd.Default(); !valueEqual(got, want) {
-			t.Errorf("after setting %q to default:\nMessage.Get(%v) = %v, want default %v", name, num, formatValue(got), formatValue(want))
-		}
-	}
-	m.Clear(fd)
-
-	// Set to the wrong type.
-	v := protoreflect.ValueOfString("")
-	if fd.Kind() == protoreflect.StringKind {
-		v = protoreflect.ValueOfInt32(0)
-	}
-	if !panics(func() {
-		m.Set(fd, v)
-	}) {
-		t.Errorf("setting %v to %T succeeds, want panic", name, v.Interface())
-	}
-}
-
-// testFieldMap tests set/get/has/clear of entries in a map field.
-func testFieldMap(t testing.TB, m protoreflect.Message, fd protoreflect.FieldDescriptor) {
-	name := fd.FullName()
-	num := fd.Number()
-
-	// New values.
-	m.Clear(fd) // start with an empty map
-	mapv := m.Get(fd).Map()
-	if mapv.IsValid() {
-		t.Errorf("after clearing field: message.Get(%v).IsValid() = true, want false", name)
-	}
-	if got, want := mapv.NewValue(), newMapValue(fd, mapv, 0, nil); !valueEqual(got, want) {
-		t.Errorf("message.Get(%v).NewValue() = %v, want %v", name, formatValue(got), formatValue(want))
-	}
-	if !panics(func() {
-		m.Set(fd, protoreflect.ValueOfMap(mapv))
-	}) {
-		t.Errorf("message.Set(%v, <invalid>) does not panic", name)
-	}
-	if !panics(func() {
-		mapv.Set(newMapKey(fd, 0), newMapValue(fd, mapv, 0, nil))
-	}) {
-		t.Errorf("message.Get(%v).Set(...) of invalid map does not panic", name)
-	}
-	mapv = m.Mutable(fd).Map() // mutable map
-	if !mapv.IsValid() {
-		t.Errorf("message.Mutable(%v).IsValid() = false, want true", name)
-	}
-	if got, want := mapv.NewValue(), newMapValue(fd, mapv, 0, nil); !valueEqual(got, want) {
-		t.Errorf("message.Mutable(%v).NewValue() = %v, want %v", name, formatValue(got), formatValue(want))
-	}
-
-	// Add values.
-	want := make(testMap)
-	for i, n := range []seed{1, 0, minVal, maxVal} {
-		if got, want := m.Has(fd), i > 0; got != want {
-			t.Errorf("after inserting %d elements to %q:\nMessage.Has(%v) = %v, want %v", i, name, num, got, want)
-		}
-
-		k := newMapKey(fd, n)
-		v := newMapValue(fd, mapv, n, nil)
-		mapv.Set(k, v)
-		want.Set(k, v)
-		if got, want := m.Get(fd), protoreflect.ValueOfMap(want); !valueEqual(got, want) {
-			t.Errorf("after inserting %d elements to %q:\nMessage.Get(%v) = %v, want %v", i, name, num, formatValue(got), formatValue(want))
-		}
-	}
-
-	// Set values.
-	want.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-		nv := newMapValue(fd, mapv, 10, nil)
-		mapv.Set(k, nv)
-		want.Set(k, nv)
-		if got, want := m.Get(fd), protoreflect.ValueOfMap(want); !valueEqual(got, want) {
-			t.Errorf("after setting element %v of %q:\nMessage.Get(%v) = %v, want %v", formatValue(k.Value()), name, num, formatValue(got), formatValue(want))
-		}
-		return true
-	})
-
-	// Clear values.
-	want.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-		mapv.Clear(k)
-		want.Clear(k)
-		if got, want := m.Has(fd), want.Len() > 0; got != want {
-			t.Errorf("after clearing elements of %q:\nMessage.Has(%v) = %v, want %v", name, num, got, want)
-		}
-		if got, want := m.Get(fd), protoreflect.ValueOfMap(want); !valueEqual(got, want) {
-			t.Errorf("after clearing elements of %q:\nMessage.Get(%v) = %v, want %v", name, num, formatValue(got), formatValue(want))
-		}
-		return true
-	})
-	if mapv := m.Get(fd).Map(); mapv.IsValid() {
-		t.Errorf("after clearing all elements: message.Get(%v).IsValid() = true, want false %v", name, formatValue(protoreflect.ValueOfMap(mapv)))
-	}
-
-	// Non-existent map keys.
-	missingKey := newMapKey(fd, 1)
-	if got, want := mapv.Has(missingKey), false; got != want {
-		t.Errorf("non-existent map key in %q: Map.Has(%v) = %v, want %v", name, formatValue(missingKey.Value()), got, want)
-	}
-	if got, want := mapv.Get(missingKey).IsValid(), false; got != want {
-		t.Errorf("non-existent map key in %q: Map.Get(%v).IsValid() = %v, want %v", name, formatValue(missingKey.Value()), got, want)
-	}
-	mapv.Clear(missingKey) // noop
-
-	// Mutable.
-	if fd.MapValue().Message() == nil {
-		if !panics(func() {
-			mapv.Mutable(newMapKey(fd, 1))
-		}) {
-			t.Errorf("Mutable on %q succeeds, want panic", name)
-		}
-	} else {
-		k := newMapKey(fd, 1)
-		v := mapv.Mutable(k)
-		if got, want := mapv.Len(), 1; got != want {
-			t.Errorf("after Mutable on %q, Map.Len() = %v, want %v", name, got, want)
-		}
-		populateMessage(v.Message(), 1, nil)
-		if !valueEqual(mapv.Get(k), v) {
-			t.Errorf("after Mutable on %q, changing new mutable value does not change map entry", name)
-		}
-		mapv.Clear(k)
-	}
-}
-
-type testMap map[interface{}]protoreflect.Value
-
-func (m testMap) Get(k protoreflect.MapKey) protoreflect.Value     { return m[k.Interface()] }
-func (m testMap) Set(k protoreflect.MapKey, v protoreflect.Value)  { m[k.Interface()] = v }
-func (m testMap) Has(k protoreflect.MapKey) bool                   { return m.Get(k).IsValid() }
-func (m testMap) Clear(k protoreflect.MapKey)                      { delete(m, k.Interface()) }
-func (m testMap) Mutable(k protoreflect.MapKey) protoreflect.Value { panic("unimplemented") }
-func (m testMap) Len() int                                         { return len(m) }
-func (m testMap) NewValue() protoreflect.Value                     { panic("unimplemented") }
-func (m testMap) Range(f func(protoreflect.MapKey, protoreflect.Value) bool) {
-	for k, v := range m {
-		if !f(protoreflect.ValueOf(k).MapKey(), v) {
-			return
-		}
-	}
-}
-func (m testMap) IsValid() bool { return true }
-
-// testFieldList exercises set/get/append/truncate of values in a list.
-func testFieldList(t testing.TB, m protoreflect.Message, fd protoreflect.FieldDescriptor) {
-	name := fd.FullName()
-	num := fd.Number()
-
-	m.Clear(fd) // start with an empty list
-	list := m.Get(fd).List()
-	if list.IsValid() {
-		t.Errorf("message.Get(%v).IsValid() = true, want false", name)
-	}
-	if !panics(func() {
-		m.Set(fd, protoreflect.ValueOfList(list))
-	}) {
-		t.Errorf("message.Set(%v, <invalid>) does not panic", name)
-	}
-	if !panics(func() {
-		list.Append(newListElement(fd, list, 0, nil))
-	}) {
-		t.Errorf("message.Get(%v).Append(...) of invalid list does not panic", name)
-	}
-	if got, want := list.NewElement(), newListElement(fd, list, 0, nil); !valueEqual(got, want) {
-		t.Errorf("message.Get(%v).NewElement() = %v, want %v", name, formatValue(got), formatValue(want))
-	}
-	list = m.Mutable(fd).List() // mutable list
-	if !list.IsValid() {
-		t.Errorf("message.Get(%v).IsValid() = false, want true", name)
-	}
-	if got, want := list.NewElement(), newListElement(fd, list, 0, nil); !valueEqual(got, want) {
-		t.Errorf("message.Mutable(%v).NewElement() = %v, want %v", name, formatValue(got), formatValue(want))
-	}
-
-	// Append values.
-	var want protoreflect.List = &testList{}
-	for i, n := range []seed{1, 0, minVal, maxVal} {
-		if got, want := m.Has(fd), i > 0; got != want {
-			t.Errorf("after appending %d elements to %q:\nMessage.Has(%v) = %v, want %v", i, name, num, got, want)
-		}
-		v := newListElement(fd, list, n, nil)
-		want.Append(v)
-		list.Append(v)
-
-		if got, want := m.Get(fd), protoreflect.ValueOfList(want); !valueEqual(got, want) {
-			t.Errorf("after appending %d elements to %q:\nMessage.Get(%v) = %v, want %v", i+1, name, num, formatValue(got), formatValue(want))
-		}
-	}
-
-	// Set values.
-	for i := 0; i < want.Len(); i++ {
-		v := newListElement(fd, list, seed(i+10), nil)
-		want.Set(i, v)
-		list.Set(i, v)
-		if got, want := m.Get(fd), protoreflect.ValueOfList(want); !valueEqual(got, want) {
-			t.Errorf("after setting element %d of %q:\nMessage.Get(%v) = %v, want %v", i, name, num, formatValue(got), formatValue(want))
-		}
-	}
-
-	// Truncate.
-	for want.Len() > 0 {
-		n := want.Len() - 1
-		want.Truncate(n)
-		list.Truncate(n)
-		if got, want := m.Has(fd), want.Len() > 0; got != want {
-			t.Errorf("after truncating %q to %d:\nMessage.Has(%v) = %v, want %v", name, n, num, got, want)
-		}
-		if got, want := m.Get(fd), protoreflect.ValueOfList(want); !valueEqual(got, want) {
-			t.Errorf("after truncating %q to %d:\nMessage.Get(%v) = %v, want %v", name, n, num, formatValue(got), formatValue(want))
-		}
-	}
-
-	// AppendMutable.
-	if fd.Message() == nil {
-		if !panics(func() {
-			list.AppendMutable()
-		}) {
-			t.Errorf("AppendMutable on %q succeeds, want panic", name)
-		}
-	} else {
-		v := list.AppendMutable()
-		if got, want := list.Len(), 1; got != want {
-			t.Errorf("after AppendMutable on %q, list.Len() = %v, want %v", name, got, want)
-		}
-		populateMessage(v.Message(), 1, nil)
-		if !valueEqual(list.Get(0), v) {
-			t.Errorf("after AppendMutable on %q, changing new mutable value does not change list item 0", name)
-		}
-		want.Truncate(0)
-	}
-}
-
-type testList struct {
-	a []protoreflect.Value
-}
-
-func (l *testList) Append(v protoreflect.Value)       { l.a = append(l.a, v) }
-func (l *testList) AppendMutable() protoreflect.Value { panic("unimplemented") }
-func (l *testList) Get(n int) protoreflect.Value      { return l.a[n] }
-func (l *testList) Len() int                          { return len(l.a) }
-func (l *testList) Set(n int, v protoreflect.Value)   { l.a[n] = v }
-func (l *testList) Truncate(n int)                    { l.a = l.a[:n] }
-func (l *testList) NewElement() protoreflect.Value    { panic("unimplemented") }
-func (l *testList) IsValid() bool                     { return true }
-
-// testFieldFloat exercises some interesting floating-point scalar field values.
-func testFieldFloat(t testing.TB, m protoreflect.Message, fd protoreflect.FieldDescriptor) {
-	name := fd.FullName()
-	num := fd.Number()
-
-	for _, v := range []float64{math.Inf(-1), math.Inf(1), math.NaN(), math.Copysign(0, -1)} {
-		var val protoreflect.Value
-		if fd.Kind() == protoreflect.FloatKind {
-			val = protoreflect.ValueOfFloat32(float32(v))
-		} else {
-			val = protoreflect.ValueOfFloat64(float64(v))
-		}
-		m.Set(fd, val)
-		// Note that Has is true for -0.
-		if got, want := m.Has(fd), true; got != want {
-			t.Errorf("after setting %v to %v: Message.Has(%v) = %v, want %v", name, v, num, got, want)
-		}
-		if got, want := m.Get(fd), val; !valueEqual(got, want) {
-			t.Errorf("after setting %v: Message.Get(%v) = %v, want %v", name, num, formatValue(got), formatValue(want))
-		}
-	}
-}
-
-// testOneof tests the behavior of fields in a oneof.
-func testOneof(t testing.TB, m protoreflect.Message, od protoreflect.OneofDescriptor) {
-	for _, mutable := range []bool{false, true} {
-		for i := 0; i < od.Fields().Len(); i++ {
-			fda := od.Fields().Get(i)
-			if mutable {
-				// Set fields by requesting a mutable reference.
-				if !fda.IsMap() && !fda.IsList() && fda.Message() == nil {
-					continue
-				}
-				_ = m.Mutable(fda)
-			} else {
-				// Set fields explicitly.
-				m.Set(fda, newValue(m, fda, 1, nil))
-			}
-			if got, want := m.WhichOneof(od), fda; got != want {
-				t.Errorf("after setting oneof field %q:\nWhichOneof(%q) = %v, want %v", fda.FullName(), fda.Name(), got, want)
-			}
-			for j := 0; j < od.Fields().Len(); j++ {
-				fdb := od.Fields().Get(j)
-				if got, want := m.Has(fdb), i == j; got != want {
-					t.Errorf("after setting oneof field %q:\nGet(%q) = %v, want %v", fda.FullName(), fdb.FullName(), got, want)
-				}
-			}
-		}
-	}
-}
-
-// testUnknown tests the behavior of unknown fields.
-func testUnknown(t testing.TB, m protoreflect.Message) {
-	var b []byte
-	b = protowire.AppendTag(b, 1000, protowire.VarintType)
-	b = protowire.AppendVarint(b, 1001)
-	m.SetUnknown(protoreflect.RawFields(b))
-	if got, want := []byte(m.GetUnknown()), b; !bytes.Equal(got, want) {
-		t.Errorf("after setting unknown fields:\nGetUnknown() = %v, want %v", got, want)
-	}
-}
-
-func formatValue(v protoreflect.Value) string {
-	switch v := v.Interface().(type) {
-	case protoreflect.List:
-		var buf bytes.Buffer
-		buf.WriteString("list[")
-		for i := 0; i < v.Len(); i++ {
-			if i > 0 {
-				buf.WriteString(" ")
-			}
-			buf.WriteString(formatValue(v.Get(i)))
-		}
-		buf.WriteString("]")
-		return buf.String()
-	case protoreflect.Map:
-		var buf bytes.Buffer
-		buf.WriteString("map[")
-		var keys []protoreflect.MapKey
-		v.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-			keys = append(keys, k)
-			return true
-		})
-		sort.Slice(keys, func(i, j int) bool {
-			return keys[i].String() < keys[j].String()
-		})
-		for i, k := range keys {
-			if i > 0 {
-				buf.WriteString(" ")
-			}
-			buf.WriteString(formatValue(k.Value()))
-			buf.WriteString(":")
-			buf.WriteString(formatValue(v.Get(k)))
-		}
-		buf.WriteString("]")
-		return buf.String()
-	case protoreflect.Message:
-		b, err := prototext.Marshal(v.Interface())
-		if err != nil {
-			return fmt.Sprintf("<%v>", err)
-		}
-		return fmt.Sprintf("%v{%s}", v.Descriptor().FullName(), b)
-	case string:
-		return fmt.Sprintf("%q", v)
-	default:
-		return fmt.Sprint(v)
-	}
-}
-
-func valueEqual(a, b protoreflect.Value) bool {
-	ai, bi := a.Interface(), b.Interface()
-	switch ai.(type) {
-	case protoreflect.Message:
-		return proto.Equal(
-			a.Message().Interface(),
-			b.Message().Interface(),
-		)
-	case protoreflect.List:
-		lista, listb := a.List(), b.List()
-		if lista.Len() != listb.Len() {
-			return false
-		}
-		for i := 0; i < lista.Len(); i++ {
-			if !valueEqual(lista.Get(i), listb.Get(i)) {
-				return false
-			}
-		}
-		return true
-	case protoreflect.Map:
-		mapa, mapb := a.Map(), b.Map()
-		if mapa.Len() != mapb.Len() {
-			return false
-		}
-		equal := true
-		mapa.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-			if !valueEqual(v, mapb.Get(k)) {
-				equal = false
-				return false
-			}
-			return true
-		})
-		return equal
-	case []byte:
-		return bytes.Equal(a.Bytes(), b.Bytes())
-	case float32:
-		// NaNs are equal, but must be the same NaN.
-		return math.Float32bits(ai.(float32)) == math.Float32bits(bi.(float32))
-	case float64:
-		// NaNs are equal, but must be the same NaN.
-		return math.Float64bits(ai.(float64)) == math.Float64bits(bi.(float64))
-	default:
-		return ai == bi
-	}
-}
-
-// A seed is used to vary the content of a value.
-//
-// A seed of 0 is the zero value. Messages do not have a zero-value; a 0-seeded messages
-// is unpopulated.
-//
-// A seed of minVal or maxVal is the least or greatest value of the value type.
-type seed int
-
-const (
-	minVal seed = -1
-	maxVal seed = -2
-)
-
-// newSeed creates new seed values from a base, for example to create seeds for the
-// elements in a list. If the input seed is minVal or maxVal, so is the output.
-func newSeed(n seed, adjust ...int) seed {
-	switch n {
-	case minVal, maxVal:
-		return n
-	}
-	for _, a := range adjust {
-		n = 10*n + seed(a)
-	}
-	return n
-}
-
-// newValue returns a new value assignable to a field.
-//
-// The stack parameter is used to avoid infinite recursion when populating circular
-// data structures.
-func newValue(m protoreflect.Message, fd protoreflect.FieldDescriptor, n seed, stack []protoreflect.MessageDescriptor) protoreflect.Value {
-	switch {
-	case fd.IsList():
-		if n == 0 {
-			return m.New().Mutable(fd)
-		}
-		list := m.NewField(fd).List()
-		list.Append(newListElement(fd, list, 0, stack))
-		list.Append(newListElement(fd, list, minVal, stack))
-		list.Append(newListElement(fd, list, maxVal, stack))
-		list.Append(newListElement(fd, list, n, stack))
-		return protoreflect.ValueOfList(list)
-	case fd.IsMap():
-		if n == 0 {
-			return m.New().Mutable(fd)
-		}
-		mapv := m.NewField(fd).Map()
-		mapv.Set(newMapKey(fd, 0), newMapValue(fd, mapv, 0, stack))
-		mapv.Set(newMapKey(fd, minVal), newMapValue(fd, mapv, minVal, stack))
-		mapv.Set(newMapKey(fd, maxVal), newMapValue(fd, mapv, maxVal, stack))
-		mapv.Set(newMapKey(fd, n), newMapValue(fd, mapv, newSeed(n, 0), stack))
-		return protoreflect.ValueOfMap(mapv)
-	case fd.Message() != nil:
-		return populateMessage(m.NewField(fd).Message(), n, stack)
-	default:
-		return newScalarValue(fd, n)
-	}
-}
-
-func newListElement(fd protoreflect.FieldDescriptor, list protoreflect.List, n seed, stack []protoreflect.MessageDescriptor) protoreflect.Value {
-	if fd.Message() == nil {
-		return newScalarValue(fd, n)
-	}
-	return populateMessage(list.NewElement().Message(), n, stack)
-}
-
-func newMapKey(fd protoreflect.FieldDescriptor, n seed) protoreflect.MapKey {
-	kd := fd.MapKey()
-	return newScalarValue(kd, n).MapKey()
-}
-
-func newMapValue(fd protoreflect.FieldDescriptor, mapv protoreflect.Map, n seed, stack []protoreflect.MessageDescriptor) protoreflect.Value {
-	vd := fd.MapValue()
-	if vd.Message() == nil {
-		return newScalarValue(vd, n)
-	}
-	return populateMessage(mapv.NewValue().Message(), n, stack)
-}
-
-func newScalarValue(fd protoreflect.FieldDescriptor, n seed) protoreflect.Value {
-	switch fd.Kind() {
-	case protoreflect.BoolKind:
-		return protoreflect.ValueOfBool(n != 0)
-	case protoreflect.EnumKind:
-		vals := fd.Enum().Values()
-		var i int
-		switch n {
-		case minVal:
-			i = 0
-		case maxVal:
-			i = vals.Len() - 1
-		default:
-			i = int(n) % vals.Len()
-		}
-		return protoreflect.ValueOfEnum(vals.Get(i).Number())
-	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
-		switch n {
-		case minVal:
-			return protoreflect.ValueOfInt32(math.MinInt32)
-		case maxVal:
-			return protoreflect.ValueOfInt32(math.MaxInt32)
-		default:
-			return protoreflect.ValueOfInt32(int32(n))
-		}
-	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
-		switch n {
-		case minVal:
-			// Only use 0 for the zero value.
-			return protoreflect.ValueOfUint32(1)
-		case maxVal:
-			return protoreflect.ValueOfUint32(math.MaxInt32)
-		default:
-			return protoreflect.ValueOfUint32(uint32(n))
-		}
-	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
-		switch n {
-		case minVal:
-			return protoreflect.ValueOfInt64(math.MinInt64)
-		case maxVal:
-			return protoreflect.ValueOfInt64(math.MaxInt64)
-		default:
-			return protoreflect.ValueOfInt64(int64(n))
-		}
-	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
-		switch n {
-		case minVal:
-			// Only use 0 for the zero value.
-			return protoreflect.ValueOfUint64(1)
-		case maxVal:
-			return protoreflect.ValueOfUint64(math.MaxInt64)
-		default:
-			return protoreflect.ValueOfUint64(uint64(n))
-		}
-	case protoreflect.FloatKind:
-		switch n {
-		case minVal:
-			return protoreflect.ValueOfFloat32(math.SmallestNonzeroFloat32)
-		case maxVal:
-			return protoreflect.ValueOfFloat32(math.MaxFloat32)
-		default:
-			return protoreflect.ValueOfFloat32(1.5 * float32(n))
-		}
-	case protoreflect.DoubleKind:
-		switch n {
-		case minVal:
-			return protoreflect.ValueOfFloat64(math.SmallestNonzeroFloat64)
-		case maxVal:
-			return protoreflect.ValueOfFloat64(math.MaxFloat64)
-		default:
-			return protoreflect.ValueOfFloat64(1.5 * float64(n))
-		}
-	case protoreflect.StringKind:
-		if n == 0 {
-			return protoreflect.ValueOfString("")
-		}
-		return protoreflect.ValueOfString(fmt.Sprintf("%d", n))
-	case protoreflect.BytesKind:
-		if n == 0 {
-			return protoreflect.ValueOfBytes(nil)
-		}
-		return protoreflect.ValueOfBytes([]byte{byte(n >> 24), byte(n >> 16), byte(n >> 8), byte(n)})
-	}
-	panic("unhandled kind")
-}
-
-func populateMessage(m protoreflect.Message, n seed, stack []protoreflect.MessageDescriptor) protoreflect.Value {
-	if n == 0 {
-		return protoreflect.ValueOfMessage(m)
-	}
-	md := m.Descriptor()
-	for _, x := range stack {
-		if md == x {
-			return protoreflect.ValueOfMessage(m)
-		}
-	}
-	stack = append(stack, md)
-	for i := 0; i < md.Fields().Len(); i++ {
-		fd := md.Fields().Get(i)
-		if fd.IsWeak() {
-			continue
-		}
-		m.Set(fd, newValue(m, fd, newSeed(n, i), stack))
-	}
-	return protoreflect.ValueOfMessage(m)
-}
-
-func panics(f func()) (didPanic bool) {
-	defer func() {
-		if err := recover(); err != nil {
-			didPanic = true
-		}
-	}()
-	f()
-	return false
-}
diff --git a/vendor/google.golang.org/protobuf/testing/prototest/ya.make b/vendor/google.golang.org/protobuf/testing/prototest/ya.make
deleted file mode 100644
index 8b13cdadf13..00000000000
--- a/vendor/google.golang.org/protobuf/testing/prototest/ya.make
+++ /dev/null
@@ -1,14 +0,0 @@
-GO_LIBRARY()
-
-LICENSE(BSD-3-Clause)
-
-SRCS(
-    enum.go
-    message.go
-)
-
-GO_XTEST_SRCS(prototest_test.go)
-
-END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
index 04c00f737c1..38daa858d07 100644
--- a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
+++ b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
@@ -48,6 +48,94 @@ import (
 	sync "sync"
 )
 
+// The full set of known editions.
+type Edition int32
+
+const (
+	// A placeholder for an unknown edition value.
+	Edition_EDITION_UNKNOWN Edition = 0
+	// Legacy syntax "editions".  These pre-date editions, but behave much like
+	// distinct editions.  These can't be used to specify the edition of proto
+	// files, but feature definitions must supply proto2/proto3 defaults for
+	// backwards compatibility.
+	Edition_EDITION_PROTO2 Edition = 998
+	Edition_EDITION_PROTO3 Edition = 999
+	// Editions that have been released.  The specific values are arbitrary and
+	// should not be depended on, but they will always be time-ordered for easy
+	// comparison.
+	Edition_EDITION_2023 Edition = 1000
+	// Placeholder editions for testing feature resolution.  These should not be
+	// used or relyed on outside of tests.
+	Edition_EDITION_1_TEST_ONLY     Edition = 1
+	Edition_EDITION_2_TEST_ONLY     Edition = 2
+	Edition_EDITION_99997_TEST_ONLY Edition = 99997
+	Edition_EDITION_99998_TEST_ONLY Edition = 99998
+	Edition_EDITION_99999_TEST_ONLY Edition = 99999
+)
+
+// Enum value maps for Edition.
+var (
+	Edition_name = map[int32]string{
+		0:     "EDITION_UNKNOWN",
+		998:   "EDITION_PROTO2",
+		999:   "EDITION_PROTO3",
+		1000:  "EDITION_2023",
+		1:     "EDITION_1_TEST_ONLY",
+		2:     "EDITION_2_TEST_ONLY",
+		99997: "EDITION_99997_TEST_ONLY",
+		99998: "EDITION_99998_TEST_ONLY",
+		99999: "EDITION_99999_TEST_ONLY",
+	}
+	Edition_value = map[string]int32{
+		"EDITION_UNKNOWN":         0,
+		"EDITION_PROTO2":          998,
+		"EDITION_PROTO3":          999,
+		"EDITION_2023":            1000,
+		"EDITION_1_TEST_ONLY":     1,
+		"EDITION_2_TEST_ONLY":     2,
+		"EDITION_99997_TEST_ONLY": 99997,
+		"EDITION_99998_TEST_ONLY": 99998,
+		"EDITION_99999_TEST_ONLY": 99999,
+	}
+)
+
+func (x Edition) Enum() *Edition {
+	p := new(Edition)
+	*p = x
+	return p
+}
+
+func (x Edition) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Edition) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[0].Descriptor()
+}
+
+func (Edition) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[0]
+}
+
+func (x Edition) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *Edition) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = Edition(num)
+	return nil
+}
+
+// Deprecated: Use Edition.Descriptor instead.
+func (Edition) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{0}
+}
+
 // The verification state of the extension range.
 type ExtensionRangeOptions_VerificationState int32
 
@@ -80,11 +168,11 @@ func (x ExtensionRangeOptions_VerificationState) String() string {
 }
 
 func (ExtensionRangeOptions_VerificationState) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[0].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[1].Descriptor()
 }
 
 func (ExtensionRangeOptions_VerificationState) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[0]
+	return &file_google_protobuf_descriptor_proto_enumTypes[1]
 }
 
 func (x ExtensionRangeOptions_VerificationState) Number() protoreflect.EnumNumber {
@@ -125,9 +213,10 @@ const (
 	FieldDescriptorProto_TYPE_BOOL    FieldDescriptorProto_Type = 8
 	FieldDescriptorProto_TYPE_STRING  FieldDescriptorProto_Type = 9
 	// Tag-delimited aggregate.
-	// Group type is deprecated and not supported in proto3. However, Proto3
+	// Group type is deprecated and not supported after google.protobuf. However, Proto3
 	// implementations should still be able to parse the group wire format and
-	// treat group fields as unknown fields.
+	// treat group fields as unknown fields.  In Editions, the group wire format
+	// can be enabled via the `message_encoding` feature.
 	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
 	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11 // Length-delimited aggregate.
 	// New in version 2.
@@ -195,11 +284,11 @@ func (x FieldDescriptorProto_Type) String() string {
 }
 
 func (FieldDescriptorProto_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[1].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[2].Descriptor()
 }
 
 func (FieldDescriptorProto_Type) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[1]
+	return &file_google_protobuf_descriptor_proto_enumTypes[2]
 }
 
 func (x FieldDescriptorProto_Type) Number() protoreflect.EnumNumber {
@@ -226,21 +315,24 @@ type FieldDescriptorProto_Label int32
 const (
 	// 0 is reserved for errors
 	FieldDescriptorProto_LABEL_OPTIONAL FieldDescriptorProto_Label = 1
-	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
 	FieldDescriptorProto_LABEL_REPEATED FieldDescriptorProto_Label = 3
+	// The required label is only allowed in google.protobuf.  In proto3 and Editions
+	// it's explicitly prohibited.  In Editions, the `field_presence` feature
+	// can be used to get this behavior.
+	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
 )
 
 // Enum value maps for FieldDescriptorProto_Label.
 var (
 	FieldDescriptorProto_Label_name = map[int32]string{
 		1: "LABEL_OPTIONAL",
-		2: "LABEL_REQUIRED",
 		3: "LABEL_REPEATED",
+		2: "LABEL_REQUIRED",
 	}
 	FieldDescriptorProto_Label_value = map[string]int32{
 		"LABEL_OPTIONAL": 1,
-		"LABEL_REQUIRED": 2,
 		"LABEL_REPEATED": 3,
+		"LABEL_REQUIRED": 2,
 	}
 )
 
@@ -255,11 +347,11 @@ func (x FieldDescriptorProto_Label) String() string {
 }
 
 func (FieldDescriptorProto_Label) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[2].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[3].Descriptor()
 }
 
 func (FieldDescriptorProto_Label) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[2]
+	return &file_google_protobuf_descriptor_proto_enumTypes[3]
 }
 
 func (x FieldDescriptorProto_Label) Number() protoreflect.EnumNumber {
@@ -316,11 +408,11 @@ func (x FileOptions_OptimizeMode) String() string {
 }
 
 func (FileOptions_OptimizeMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[3].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[4].Descriptor()
 }
 
 func (FileOptions_OptimizeMode) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[3]
+	return &file_google_protobuf_descriptor_proto_enumTypes[4]
 }
 
 func (x FileOptions_OptimizeMode) Number() protoreflect.EnumNumber {
@@ -382,11 +474,11 @@ func (x FieldOptions_CType) String() string {
 }
 
 func (FieldOptions_CType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[4].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
 }
 
 func (FieldOptions_CType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[4]
+	return &file_google_protobuf_descriptor_proto_enumTypes[5]
 }
 
 func (x FieldOptions_CType) Number() protoreflect.EnumNumber {
@@ -444,11 +536,11 @@ func (x FieldOptions_JSType) String() string {
 }
 
 func (FieldOptions_JSType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[6].Descriptor()
 }
 
 func (FieldOptions_JSType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[5]
+	return &file_google_protobuf_descriptor_proto_enumTypes[6]
 }
 
 func (x FieldOptions_JSType) Number() protoreflect.EnumNumber {
@@ -506,11 +598,11 @@ func (x FieldOptions_OptionRetention) String() string {
 }
 
 func (FieldOptions_OptionRetention) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[6].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[7].Descriptor()
 }
 
 func (FieldOptions_OptionRetention) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[6]
+	return &file_google_protobuf_descriptor_proto_enumTypes[7]
 }
 
 func (x FieldOptions_OptionRetention) Number() protoreflect.EnumNumber {
@@ -590,11 +682,11 @@ func (x FieldOptions_OptionTargetType) String() string {
 }
 
 func (FieldOptions_OptionTargetType) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[7].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[8].Descriptor()
 }
 
 func (FieldOptions_OptionTargetType) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[7]
+	return &file_google_protobuf_descriptor_proto_enumTypes[8]
 }
 
 func (x FieldOptions_OptionTargetType) Number() protoreflect.EnumNumber {
@@ -652,11 +744,11 @@ func (x MethodOptions_IdempotencyLevel) String() string {
 }
 
 func (MethodOptions_IdempotencyLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[8].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[9].Descriptor()
 }
 
 func (MethodOptions_IdempotencyLevel) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[8]
+	return &file_google_protobuf_descriptor_proto_enumTypes[9]
 }
 
 func (x MethodOptions_IdempotencyLevel) Number() protoreflect.EnumNumber {
@@ -678,6 +770,363 @@ func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{17, 0}
 }
 
+type FeatureSet_FieldPresence int32
+
+const (
+	FeatureSet_FIELD_PRESENCE_UNKNOWN FeatureSet_FieldPresence = 0
+	FeatureSet_EXPLICIT               FeatureSet_FieldPresence = 1
+	FeatureSet_IMPLICIT               FeatureSet_FieldPresence = 2
+	FeatureSet_LEGACY_REQUIRED        FeatureSet_FieldPresence = 3
+)
+
+// Enum value maps for FeatureSet_FieldPresence.
+var (
+	FeatureSet_FieldPresence_name = map[int32]string{
+		0: "FIELD_PRESENCE_UNKNOWN",
+		1: "EXPLICIT",
+		2: "IMPLICIT",
+		3: "LEGACY_REQUIRED",
+	}
+	FeatureSet_FieldPresence_value = map[string]int32{
+		"FIELD_PRESENCE_UNKNOWN": 0,
+		"EXPLICIT":               1,
+		"IMPLICIT":               2,
+		"LEGACY_REQUIRED":        3,
+	}
+)
+
+func (x FeatureSet_FieldPresence) Enum() *FeatureSet_FieldPresence {
+	p := new(FeatureSet_FieldPresence)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_FieldPresence) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_FieldPresence) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[10].Descriptor()
+}
+
+func (FeatureSet_FieldPresence) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[10]
+}
+
+func (x FeatureSet_FieldPresence) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_FieldPresence) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_FieldPresence(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_FieldPresence.Descriptor instead.
+func (FeatureSet_FieldPresence) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 0}
+}
+
+type FeatureSet_EnumType int32
+
+const (
+	FeatureSet_ENUM_TYPE_UNKNOWN FeatureSet_EnumType = 0
+	FeatureSet_OPEN              FeatureSet_EnumType = 1
+	FeatureSet_CLOSED            FeatureSet_EnumType = 2
+)
+
+// Enum value maps for FeatureSet_EnumType.
+var (
+	FeatureSet_EnumType_name = map[int32]string{
+		0: "ENUM_TYPE_UNKNOWN",
+		1: "OPEN",
+		2: "CLOSED",
+	}
+	FeatureSet_EnumType_value = map[string]int32{
+		"ENUM_TYPE_UNKNOWN": 0,
+		"OPEN":              1,
+		"CLOSED":            2,
+	}
+)
+
+func (x FeatureSet_EnumType) Enum() *FeatureSet_EnumType {
+	p := new(FeatureSet_EnumType)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_EnumType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_EnumType) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[11].Descriptor()
+}
+
+func (FeatureSet_EnumType) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[11]
+}
+
+func (x FeatureSet_EnumType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_EnumType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_EnumType(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_EnumType.Descriptor instead.
+func (FeatureSet_EnumType) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 1}
+}
+
+type FeatureSet_RepeatedFieldEncoding int32
+
+const (
+	FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN FeatureSet_RepeatedFieldEncoding = 0
+	FeatureSet_PACKED                          FeatureSet_RepeatedFieldEncoding = 1
+	FeatureSet_EXPANDED                        FeatureSet_RepeatedFieldEncoding = 2
+)
+
+// Enum value maps for FeatureSet_RepeatedFieldEncoding.
+var (
+	FeatureSet_RepeatedFieldEncoding_name = map[int32]string{
+		0: "REPEATED_FIELD_ENCODING_UNKNOWN",
+		1: "PACKED",
+		2: "EXPANDED",
+	}
+	FeatureSet_RepeatedFieldEncoding_value = map[string]int32{
+		"REPEATED_FIELD_ENCODING_UNKNOWN": 0,
+		"PACKED":                          1,
+		"EXPANDED":                        2,
+	}
+)
+
+func (x FeatureSet_RepeatedFieldEncoding) Enum() *FeatureSet_RepeatedFieldEncoding {
+	p := new(FeatureSet_RepeatedFieldEncoding)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_RepeatedFieldEncoding) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_RepeatedFieldEncoding) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[12].Descriptor()
+}
+
+func (FeatureSet_RepeatedFieldEncoding) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[12]
+}
+
+func (x FeatureSet_RepeatedFieldEncoding) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_RepeatedFieldEncoding) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_RepeatedFieldEncoding(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_RepeatedFieldEncoding.Descriptor instead.
+func (FeatureSet_RepeatedFieldEncoding) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 2}
+}
+
+type FeatureSet_Utf8Validation int32
+
+const (
+	FeatureSet_UTF8_VALIDATION_UNKNOWN FeatureSet_Utf8Validation = 0
+	FeatureSet_NONE                    FeatureSet_Utf8Validation = 1
+	FeatureSet_VERIFY                  FeatureSet_Utf8Validation = 2
+)
+
+// Enum value maps for FeatureSet_Utf8Validation.
+var (
+	FeatureSet_Utf8Validation_name = map[int32]string{
+		0: "UTF8_VALIDATION_UNKNOWN",
+		1: "NONE",
+		2: "VERIFY",
+	}
+	FeatureSet_Utf8Validation_value = map[string]int32{
+		"UTF8_VALIDATION_UNKNOWN": 0,
+		"NONE":                    1,
+		"VERIFY":                  2,
+	}
+)
+
+func (x FeatureSet_Utf8Validation) Enum() *FeatureSet_Utf8Validation {
+	p := new(FeatureSet_Utf8Validation)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_Utf8Validation) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_Utf8Validation) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[13].Descriptor()
+}
+
+func (FeatureSet_Utf8Validation) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[13]
+}
+
+func (x FeatureSet_Utf8Validation) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_Utf8Validation) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_Utf8Validation(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_Utf8Validation.Descriptor instead.
+func (FeatureSet_Utf8Validation) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 3}
+}
+
+type FeatureSet_MessageEncoding int32
+
+const (
+	FeatureSet_MESSAGE_ENCODING_UNKNOWN FeatureSet_MessageEncoding = 0
+	FeatureSet_LENGTH_PREFIXED          FeatureSet_MessageEncoding = 1
+	FeatureSet_DELIMITED                FeatureSet_MessageEncoding = 2
+)
+
+// Enum value maps for FeatureSet_MessageEncoding.
+var (
+	FeatureSet_MessageEncoding_name = map[int32]string{
+		0: "MESSAGE_ENCODING_UNKNOWN",
+		1: "LENGTH_PREFIXED",
+		2: "DELIMITED",
+	}
+	FeatureSet_MessageEncoding_value = map[string]int32{
+		"MESSAGE_ENCODING_UNKNOWN": 0,
+		"LENGTH_PREFIXED":          1,
+		"DELIMITED":                2,
+	}
+)
+
+func (x FeatureSet_MessageEncoding) Enum() *FeatureSet_MessageEncoding {
+	p := new(FeatureSet_MessageEncoding)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_MessageEncoding) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_MessageEncoding) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[14].Descriptor()
+}
+
+func (FeatureSet_MessageEncoding) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[14]
+}
+
+func (x FeatureSet_MessageEncoding) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_MessageEncoding) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_MessageEncoding(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_MessageEncoding.Descriptor instead.
+func (FeatureSet_MessageEncoding) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 4}
+}
+
+type FeatureSet_JsonFormat int32
+
+const (
+	FeatureSet_JSON_FORMAT_UNKNOWN FeatureSet_JsonFormat = 0
+	FeatureSet_ALLOW               FeatureSet_JsonFormat = 1
+	FeatureSet_LEGACY_BEST_EFFORT  FeatureSet_JsonFormat = 2
+)
+
+// Enum value maps for FeatureSet_JsonFormat.
+var (
+	FeatureSet_JsonFormat_name = map[int32]string{
+		0: "JSON_FORMAT_UNKNOWN",
+		1: "ALLOW",
+		2: "LEGACY_BEST_EFFORT",
+	}
+	FeatureSet_JsonFormat_value = map[string]int32{
+		"JSON_FORMAT_UNKNOWN": 0,
+		"ALLOW":               1,
+		"LEGACY_BEST_EFFORT":  2,
+	}
+)
+
+func (x FeatureSet_JsonFormat) Enum() *FeatureSet_JsonFormat {
+	p := new(FeatureSet_JsonFormat)
+	*p = x
+	return p
+}
+
+func (x FeatureSet_JsonFormat) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FeatureSet_JsonFormat) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[15].Descriptor()
+}
+
+func (FeatureSet_JsonFormat) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[15]
+}
+
+func (x FeatureSet_JsonFormat) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FeatureSet_JsonFormat) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FeatureSet_JsonFormat(num)
+	return nil
+}
+
+// Deprecated: Use FeatureSet_JsonFormat.Descriptor instead.
+func (FeatureSet_JsonFormat) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 5}
+}
+
 // Represents the identified object's effect on the element in the original
 // .proto file.
 type GeneratedCodeInfo_Annotation_Semantic int32
@@ -716,11 +1165,11 @@ func (x GeneratedCodeInfo_Annotation_Semantic) String() string {
 }
 
 func (GeneratedCodeInfo_Annotation_Semantic) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[9].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[16].Descriptor()
 }
 
 func (GeneratedCodeInfo_Annotation_Semantic) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[9]
+	return &file_google_protobuf_descriptor_proto_enumTypes[16]
 }
 
 func (x GeneratedCodeInfo_Annotation_Semantic) Number() protoreflect.EnumNumber {
@@ -739,7 +1188,7 @@ func (x *GeneratedCodeInfo_Annotation_Semantic) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use GeneratedCodeInfo_Annotation_Semantic.Descriptor instead.
 func (GeneratedCodeInfo_Annotation_Semantic) EnumDescriptor() ([]byte, []int) {
-	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20, 0, 0}
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{22, 0, 0}
 }
 
 // The protocol compiler can output a FileDescriptorSet containing the .proto
@@ -822,8 +1271,8 @@ type FileDescriptorProto struct {
 	//
 	// If `edition` is present, this value must be "editions".
 	Syntax *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
-	// The edition of the proto file, which is an opaque string.
-	Edition *string `protobuf:"bytes,13,opt,name=edition" json:"edition,omitempty"`
+	// The edition of the proto file.
+	Edition *Edition `protobuf:"varint,14,opt,name=edition,enum=google.protobuf.Edition" json:"edition,omitempty"`
 }
 
 func (x *FileDescriptorProto) Reset() {
@@ -942,11 +1391,11 @@ func (x *FileDescriptorProto) GetSyntax() string {
 	return ""
 }
 
-func (x *FileDescriptorProto) GetEdition() string {
+func (x *FileDescriptorProto) GetEdition() Edition {
 	if x != nil && x.Edition != nil {
 		return *x.Edition
 	}
-	return ""
+	return Edition_EDITION_UNKNOWN
 }
 
 // Describes a message type.
@@ -1079,13 +1528,14 @@ type ExtensionRangeOptions struct {
 
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	// go/protobuf-stripping-extension-declarations
-	// Like Metadata, but we use a repeated field to hold all extension
-	// declarations. This should avoid the size increases of transforming a large
-	// extension range into small ranges in generated binaries.
+	// For external users: DO NOT USE. We are in the process of open sourcing
+	// extension declaration and executing internal cleanups before it can be
+	// used externally.
 	Declaration []*ExtensionRangeOptions_Declaration `protobuf:"bytes,2,rep,name=declaration" json:"declaration,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,50,opt,name=features" json:"features,omitempty"`
 	// The verification state of the range.
-	// TODO(b/278783756): flip the default to DECLARATION once all empty ranges
+	// TODO: flip the default to DECLARATION once all empty ranges
 	// are marked as UNVERIFIED.
 	Verification *ExtensionRangeOptions_VerificationState `protobuf:"varint,3,opt,name=verification,enum=google.protobuf.ExtensionRangeOptions_VerificationState,def=1" json:"verification,omitempty"`
 }
@@ -1141,6 +1591,13 @@ func (x *ExtensionRangeOptions) GetDeclaration() []*ExtensionRangeOptions_Declar
 	return nil
 }
 
+func (x *ExtensionRangeOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *ExtensionRangeOptions) GetVerification() ExtensionRangeOptions_VerificationState {
 	if x != nil && x.Verification != nil {
 		return *x.Verification
@@ -1772,6 +2229,8 @@ type FileOptions struct {
 	// is empty. When this option is not set, the package name will be used for
 	// determining the ruby package.
 	RubyPackage *string `protobuf:"bytes,45,opt,name=ruby_package,json=rubyPackage" json:"ruby_package,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,50,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here.
 	// See the documentation for the "Options" section above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
@@ -1963,6 +2422,13 @@ func (x *FileOptions) GetRubyPackage() string {
 	return ""
 }
 
+func (x *FileOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2039,11 +2505,13 @@ type MessageOptions struct {
 	// This should only be used as a temporary measure against broken builds due
 	// to the change in behavior for JSON field name conflicts.
 	//
-	// TODO(b/261750190) This is legacy behavior we plan to remove once downstream
+	// TODO This is legacy behavior we plan to remove once downstream
 	// teams have had time to migrate.
 	//
 	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
 	DeprecatedLegacyJsonFieldConflicts *bool `protobuf:"varint,11,opt,name=deprecated_legacy_json_field_conflicts,json=deprecatedLegacyJsonFieldConflicts" json:"deprecated_legacy_json_field_conflicts,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,12,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2123,6 +2591,13 @@ func (x *MessageOptions) GetDeprecatedLegacyJsonFieldConflicts() bool {
 	return false
 }
 
+func (x *MessageOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2147,7 +2622,9 @@ type FieldOptions struct {
 	// a more efficient representation on the wire. Rather than repeatedly
 	// writing the tag and type for each element, the entire array is encoded as
 	// a single length-delimited blob. In proto3, only explicit setting it to
-	// false will avoid using packed encoding.
+	// false will avoid using packed encoding.  This option is prohibited in
+	// Editions, but the `repeated_field_encoding` feature can be used to control
+	// the behavior.
 	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
 	// The jstype option determines the JavaScript type used for values of the
 	// field.  The option is permitted only for 64 bit integral and fixed types
@@ -2205,11 +2682,12 @@ type FieldOptions struct {
 	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
 	// Indicate that the field value should not be printed out when using debug
 	// formats, e.g. when the field contains sensitive credentials.
-	DebugRedact *bool                         `protobuf:"varint,16,opt,name=debug_redact,json=debugRedact,def=0" json:"debug_redact,omitempty"`
-	Retention   *FieldOptions_OptionRetention `protobuf:"varint,17,opt,name=retention,enum=google.protobuf.FieldOptions_OptionRetention" json:"retention,omitempty"`
-	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
-	Target  *FieldOptions_OptionTargetType  `protobuf:"varint,18,opt,name=target,enum=google.protobuf.FieldOptions_OptionTargetType" json:"target,omitempty"`
-	Targets []FieldOptions_OptionTargetType `protobuf:"varint,19,rep,name=targets,enum=google.protobuf.FieldOptions_OptionTargetType" json:"targets,omitempty"`
+	DebugRedact     *bool                           `protobuf:"varint,16,opt,name=debug_redact,json=debugRedact,def=0" json:"debug_redact,omitempty"`
+	Retention       *FieldOptions_OptionRetention   `protobuf:"varint,17,opt,name=retention,enum=google.protobuf.FieldOptions_OptionRetention" json:"retention,omitempty"`
+	Targets         []FieldOptions_OptionTargetType `protobuf:"varint,19,rep,name=targets,enum=google.protobuf.FieldOptions_OptionTargetType" json:"targets,omitempty"`
+	EditionDefaults []*FieldOptions_EditionDefault  `protobuf:"bytes,20,rep,name=edition_defaults,json=editionDefaults" json:"edition_defaults,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,21,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2320,17 +2798,23 @@ func (x *FieldOptions) GetRetention() FieldOptions_OptionRetention {
 	return FieldOptions_RETENTION_UNKNOWN
 }
 
-// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
-func (x *FieldOptions) GetTarget() FieldOptions_OptionTargetType {
-	if x != nil && x.Target != nil {
-		return *x.Target
+func (x *FieldOptions) GetTargets() []FieldOptions_OptionTargetType {
+	if x != nil {
+		return x.Targets
 	}
-	return FieldOptions_TARGET_TYPE_UNKNOWN
+	return nil
 }
 
-func (x *FieldOptions) GetTargets() []FieldOptions_OptionTargetType {
+func (x *FieldOptions) GetEditionDefaults() []*FieldOptions_EditionDefault {
 	if x != nil {
-		return x.Targets
+		return x.EditionDefaults
+	}
+	return nil
+}
+
+func (x *FieldOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
 	}
 	return nil
 }
@@ -2348,6 +2832,8 @@ type OneofOptions struct {
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
 
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,1,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2384,6 +2870,13 @@ func (*OneofOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{13}
 }
 
+func (x *OneofOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *OneofOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2409,11 +2902,13 @@ type EnumOptions struct {
 	// and strips underscored from the fields before comparison in proto3 only.
 	// The new behavior takes `json_name` into account and applies to proto2 as
 	// well.
-	// TODO(b/261750190) Remove this legacy behavior once downstream teams have
+	// TODO Remove this legacy behavior once downstream teams have
 	// had time to migrate.
 	//
 	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
 	DeprecatedLegacyJsonFieldConflicts *bool `protobuf:"varint,6,opt,name=deprecated_legacy_json_field_conflicts,json=deprecatedLegacyJsonFieldConflicts" json:"deprecated_legacy_json_field_conflicts,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,7,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2477,6 +2972,13 @@ func (x *EnumOptions) GetDeprecatedLegacyJsonFieldConflicts() bool {
 	return false
 }
 
+func (x *EnumOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2495,13 +2997,20 @@ type EnumValueOptions struct {
 	// for the enum value, or it will be completely ignored; in the very least,
 	// this is a formalization for deprecating enum values.
 	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,2,opt,name=features" json:"features,omitempty"`
+	// Indicate that fields annotated with this enum value should not be printed
+	// out when using debug formats, e.g. when the field contains sensitive
+	// credentials.
+	DebugRedact *bool `protobuf:"varint,3,opt,name=debug_redact,json=debugRedact,def=0" json:"debug_redact,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
 
 // Default values for EnumValueOptions fields.
 const (
-	Default_EnumValueOptions_Deprecated = bool(false)
+	Default_EnumValueOptions_Deprecated  = bool(false)
+	Default_EnumValueOptions_DebugRedact = bool(false)
 )
 
 func (x *EnumValueOptions) Reset() {
@@ -2543,6 +3052,20 @@ func (x *EnumValueOptions) GetDeprecated() bool {
 	return Default_EnumValueOptions_Deprecated
 }
 
+func (x *EnumValueOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
+func (x *EnumValueOptions) GetDebugRedact() bool {
+	if x != nil && x.DebugRedact != nil {
+		return *x.DebugRedact
+	}
+	return Default_EnumValueOptions_DebugRedact
+}
+
 func (x *EnumValueOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2556,6 +3079,8 @@ type ServiceOptions struct {
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
 
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,34,opt,name=features" json:"features,omitempty"`
 	// Is this service deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the service, or it will be completely ignored; in the very least,
@@ -2602,6 +3127,13 @@ func (*ServiceOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{16}
 }
 
+func (x *ServiceOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *ServiceOptions) GetDeprecated() bool {
 	if x != nil && x.Deprecated != nil {
 		return *x.Deprecated
@@ -2628,6 +3160,8 @@ type MethodOptions struct {
 	// this is a formalization for deprecating methods.
 	Deprecated       *bool                           `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	IdempotencyLevel *MethodOptions_IdempotencyLevel `protobuf:"varint,34,opt,name=idempotency_level,json=idempotencyLevel,enum=google.protobuf.MethodOptions_IdempotencyLevel,def=0" json:"idempotency_level,omitempty"`
+	// Any features defined in the specific edition.
+	Features *FeatureSet `protobuf:"bytes,35,opt,name=features" json:"features,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2684,6 +3218,13 @@ func (x *MethodOptions) GetIdempotencyLevel() MethodOptions_IdempotencyLevel {
 	return Default_MethodOptions_IdempotencyLevel
 }
 
+func (x *MethodOptions) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 func (x *MethodOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2794,6 +3335,171 @@ func (x *UninterpretedOption) GetAggregateValue() string {
 	return ""
 }
 
+// TODO Enums in C++ gencode (and potentially other languages) are
+// not well scoped.  This means that each of the feature enums below can clash
+// with each other.  The short names we've chosen maximize call-site
+// readability, but leave us very open to this scenario.  A future feature will
+// be designed and implemented to handle this, hopefully before we ever hit a
+// conflict here.
+type FeatureSet struct {
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
+
+	FieldPresence         *FeatureSet_FieldPresence         `protobuf:"varint,1,opt,name=field_presence,json=fieldPresence,enum=google.protobuf.FeatureSet_FieldPresence" json:"field_presence,omitempty"`
+	EnumType              *FeatureSet_EnumType              `protobuf:"varint,2,opt,name=enum_type,json=enumType,enum=google.protobuf.FeatureSet_EnumType" json:"enum_type,omitempty"`
+	RepeatedFieldEncoding *FeatureSet_RepeatedFieldEncoding `protobuf:"varint,3,opt,name=repeated_field_encoding,json=repeatedFieldEncoding,enum=google.protobuf.FeatureSet_RepeatedFieldEncoding" json:"repeated_field_encoding,omitempty"`
+	Utf8Validation        *FeatureSet_Utf8Validation        `protobuf:"varint,4,opt,name=utf8_validation,json=utf8Validation,enum=google.protobuf.FeatureSet_Utf8Validation" json:"utf8_validation,omitempty"`
+	MessageEncoding       *FeatureSet_MessageEncoding       `protobuf:"varint,5,opt,name=message_encoding,json=messageEncoding,enum=google.protobuf.FeatureSet_MessageEncoding" json:"message_encoding,omitempty"`
+	JsonFormat            *FeatureSet_JsonFormat            `protobuf:"varint,6,opt,name=json_format,json=jsonFormat,enum=google.protobuf.FeatureSet_JsonFormat" json:"json_format,omitempty"`
+}
+
+func (x *FeatureSet) Reset() {
+	*x = FeatureSet{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FeatureSet) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FeatureSet) ProtoMessage() {}
+
+func (x *FeatureSet) ProtoReflect() protoreflect.Message {
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FeatureSet.ProtoReflect.Descriptor instead.
+func (*FeatureSet) Descriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *FeatureSet) GetFieldPresence() FeatureSet_FieldPresence {
+	if x != nil && x.FieldPresence != nil {
+		return *x.FieldPresence
+	}
+	return FeatureSet_FIELD_PRESENCE_UNKNOWN
+}
+
+func (x *FeatureSet) GetEnumType() FeatureSet_EnumType {
+	if x != nil && x.EnumType != nil {
+		return *x.EnumType
+	}
+	return FeatureSet_ENUM_TYPE_UNKNOWN
+}
+
+func (x *FeatureSet) GetRepeatedFieldEncoding() FeatureSet_RepeatedFieldEncoding {
+	if x != nil && x.RepeatedFieldEncoding != nil {
+		return *x.RepeatedFieldEncoding
+	}
+	return FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN
+}
+
+func (x *FeatureSet) GetUtf8Validation() FeatureSet_Utf8Validation {
+	if x != nil && x.Utf8Validation != nil {
+		return *x.Utf8Validation
+	}
+	return FeatureSet_UTF8_VALIDATION_UNKNOWN
+}
+
+func (x *FeatureSet) GetMessageEncoding() FeatureSet_MessageEncoding {
+	if x != nil && x.MessageEncoding != nil {
+		return *x.MessageEncoding
+	}
+	return FeatureSet_MESSAGE_ENCODING_UNKNOWN
+}
+
+func (x *FeatureSet) GetJsonFormat() FeatureSet_JsonFormat {
+	if x != nil && x.JsonFormat != nil {
+		return *x.JsonFormat
+	}
+	return FeatureSet_JSON_FORMAT_UNKNOWN
+}
+
+// A compiled specification for the defaults of a set of features.  These
+// messages are generated from FeatureSet extensions and can be used to seed
+// feature resolution. The resolution with this object becomes a simple search
+// for the closest matching edition, followed by proto merges.
+type FeatureSetDefaults struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Defaults []*FeatureSetDefaults_FeatureSetEditionDefault `protobuf:"bytes,1,rep,name=defaults" json:"defaults,omitempty"`
+	// The minimum supported edition (inclusive) when this was constructed.
+	// Editions before this will not have defaults.
+	MinimumEdition *Edition `protobuf:"varint,4,opt,name=minimum_edition,json=minimumEdition,enum=google.protobuf.Edition" json:"minimum_edition,omitempty"`
+	// The maximum known edition (inclusive) when this was constructed. Editions
+	// after this will not have reliable defaults.
+	MaximumEdition *Edition `protobuf:"varint,5,opt,name=maximum_edition,json=maximumEdition,enum=google.protobuf.Edition" json:"maximum_edition,omitempty"`
+}
+
+func (x *FeatureSetDefaults) Reset() {
+	*x = FeatureSetDefaults{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FeatureSetDefaults) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FeatureSetDefaults) ProtoMessage() {}
+
+func (x *FeatureSetDefaults) ProtoReflect() protoreflect.Message {
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[20]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FeatureSetDefaults.ProtoReflect.Descriptor instead.
+func (*FeatureSetDefaults) Descriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *FeatureSetDefaults) GetDefaults() []*FeatureSetDefaults_FeatureSetEditionDefault {
+	if x != nil {
+		return x.Defaults
+	}
+	return nil
+}
+
+func (x *FeatureSetDefaults) GetMinimumEdition() Edition {
+	if x != nil && x.MinimumEdition != nil {
+		return *x.MinimumEdition
+	}
+	return Edition_EDITION_UNKNOWN
+}
+
+func (x *FeatureSetDefaults) GetMaximumEdition() Edition {
+	if x != nil && x.MaximumEdition != nil {
+		return *x.MaximumEdition
+	}
+	return Edition_EDITION_UNKNOWN
+}
+
 // Encapsulates information about the original source file from which a
 // FileDescriptorProto was generated.
 type SourceCodeInfo struct {
@@ -2855,7 +3561,7 @@ type SourceCodeInfo struct {
 func (x *SourceCodeInfo) Reset() {
 	*x = SourceCodeInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[19]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2868,7 +3574,7 @@ func (x *SourceCodeInfo) String() string {
 func (*SourceCodeInfo) ProtoMessage() {}
 
 func (x *SourceCodeInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[19]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2881,7 +3587,7 @@ func (x *SourceCodeInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SourceCodeInfo.ProtoReflect.Descriptor instead.
 func (*SourceCodeInfo) Descriptor() ([]byte, []int) {
-	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19}
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
@@ -2907,7 +3613,7 @@ type GeneratedCodeInfo struct {
 func (x *GeneratedCodeInfo) Reset() {
 	*x = GeneratedCodeInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[20]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2920,7 +3626,7 @@ func (x *GeneratedCodeInfo) String() string {
 func (*GeneratedCodeInfo) ProtoMessage() {}
 
 func (x *GeneratedCodeInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[20]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2933,7 +3639,7 @@ func (x *GeneratedCodeInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GeneratedCodeInfo.ProtoReflect.Descriptor instead.
 func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) {
-	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20}
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *GeneratedCodeInfo) GetAnnotation() []*GeneratedCodeInfo_Annotation {
@@ -2956,7 +3662,7 @@ type DescriptorProto_ExtensionRange struct {
 func (x *DescriptorProto_ExtensionRange) Reset() {
 	*x = DescriptorProto_ExtensionRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[21]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2969,7 +3675,7 @@ func (x *DescriptorProto_ExtensionRange) String() string {
 func (*DescriptorProto_ExtensionRange) ProtoMessage() {}
 
 func (x *DescriptorProto_ExtensionRange) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[21]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3021,7 +3727,7 @@ type DescriptorProto_ReservedRange struct {
 func (x *DescriptorProto_ReservedRange) Reset() {
 	*x = DescriptorProto_ReservedRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[22]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3034,7 +3740,7 @@ func (x *DescriptorProto_ReservedRange) String() string {
 func (*DescriptorProto_ReservedRange) ProtoMessage() {}
 
 func (x *DescriptorProto_ReservedRange) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[22]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3078,10 +3784,6 @@ type ExtensionRangeOptions_Declaration struct {
 	// Metadata.type, Declaration.type must have a leading dot for messages
 	// and enums.
 	Type *string `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
-	// Deprecated. Please use "repeated".
-	//
-	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
-	IsRepeated *bool `protobuf:"varint,4,opt,name=is_repeated,json=isRepeated" json:"is_repeated,omitempty"`
 	// If true, indicates that the number is reserved in the extension range,
 	// and any extension field with the number will fail to compile. Set this
 	// when a declared extension field is deleted.
@@ -3094,7 +3796,7 @@ type ExtensionRangeOptions_Declaration struct {
 func (x *ExtensionRangeOptions_Declaration) Reset() {
 	*x = ExtensionRangeOptions_Declaration{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3107,7 +3809,7 @@ func (x *ExtensionRangeOptions_Declaration) String() string {
 func (*ExtensionRangeOptions_Declaration) ProtoMessage() {}
 
 func (x *ExtensionRangeOptions_Declaration) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[23]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3144,14 +3846,6 @@ func (x *ExtensionRangeOptions_Declaration) GetType() string {
 	return ""
 }
 
-// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
-func (x *ExtensionRangeOptions_Declaration) GetIsRepeated() bool {
-	if x != nil && x.IsRepeated != nil {
-		return *x.IsRepeated
-	}
-	return false
-}
-
 func (x *ExtensionRangeOptions_Declaration) GetReserved() bool {
 	if x != nil && x.Reserved != nil {
 		return *x.Reserved
@@ -3184,7 +3878,7 @@ type EnumDescriptorProto_EnumReservedRange struct {
 func (x *EnumDescriptorProto_EnumReservedRange) Reset() {
 	*x = EnumDescriptorProto_EnumReservedRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3197,7 +3891,7 @@ func (x *EnumDescriptorProto_EnumReservedRange) String() string {
 func (*EnumDescriptorProto_EnumReservedRange) ProtoMessage() {}
 
 func (x *EnumDescriptorProto_EnumReservedRange) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[24]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3227,6 +3921,61 @@ func (x *EnumDescriptorProto_EnumReservedRange) GetEnd() int32 {
 	return 0
 }
 
+type FieldOptions_EditionDefault struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Edition *Edition `protobuf:"varint,3,opt,name=edition,enum=google.protobuf.Edition" json:"edition,omitempty"`
+	Value   *string  `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"` // Textproto value.
+}
+
+func (x *FieldOptions_EditionDefault) Reset() {
+	*x = FieldOptions_EditionDefault{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FieldOptions_EditionDefault) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FieldOptions_EditionDefault) ProtoMessage() {}
+
+func (x *FieldOptions_EditionDefault) ProtoReflect() protoreflect.Message {
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FieldOptions_EditionDefault.ProtoReflect.Descriptor instead.
+func (*FieldOptions_EditionDefault) Descriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 0}
+}
+
+func (x *FieldOptions_EditionDefault) GetEdition() Edition {
+	if x != nil && x.Edition != nil {
+		return *x.Edition
+	}
+	return Edition_EDITION_UNKNOWN
+}
+
+func (x *FieldOptions_EditionDefault) GetValue() string {
+	if x != nil && x.Value != nil {
+		return *x.Value
+	}
+	return ""
+}
+
 // The name of the uninterpreted option.  Each string represents a segment in
 // a dot-separated name.  is_extension is true iff a segment represents an
 // extension (denoted with parentheses in options specs in .proto files).
@@ -3244,7 +3993,7 @@ type UninterpretedOption_NamePart struct {
 func (x *UninterpretedOption_NamePart) Reset() {
 	*x = UninterpretedOption_NamePart{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3257,7 +4006,7 @@ func (x *UninterpretedOption_NamePart) String() string {
 func (*UninterpretedOption_NamePart) ProtoMessage() {}
 
 func (x *UninterpretedOption_NamePart) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[25]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3287,6 +4036,65 @@ func (x *UninterpretedOption_NamePart) GetIsExtension() bool {
 	return false
 }
 
+// A map from every known edition with a unique set of defaults to its
+// defaults. Not all editions may be contained here.  For a given edition,
+// the defaults at the closest matching edition ordered at or before it should
+// be used.  This field must be in strict ascending order by edition.
+type FeatureSetDefaults_FeatureSetEditionDefault struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Edition  *Edition    `protobuf:"varint,3,opt,name=edition,enum=google.protobuf.Edition" json:"edition,omitempty"`
+	Features *FeatureSet `protobuf:"bytes,2,opt,name=features" json:"features,omitempty"`
+}
+
+func (x *FeatureSetDefaults_FeatureSetEditionDefault) Reset() {
+	*x = FeatureSetDefaults_FeatureSetEditionDefault{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[29]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FeatureSetDefaults_FeatureSetEditionDefault) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FeatureSetDefaults_FeatureSetEditionDefault) ProtoMessage() {}
+
+func (x *FeatureSetDefaults_FeatureSetEditionDefault) ProtoReflect() protoreflect.Message {
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[29]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FeatureSetDefaults_FeatureSetEditionDefault.ProtoReflect.Descriptor instead.
+func (*FeatureSetDefaults_FeatureSetEditionDefault) Descriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20, 0}
+}
+
+func (x *FeatureSetDefaults_FeatureSetEditionDefault) GetEdition() Edition {
+	if x != nil && x.Edition != nil {
+		return *x.Edition
+	}
+	return Edition_EDITION_UNKNOWN
+}
+
+func (x *FeatureSetDefaults_FeatureSetEditionDefault) GetFeatures() *FeatureSet {
+	if x != nil {
+		return x.Features
+	}
+	return nil
+}
+
 type SourceCodeInfo_Location struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3388,7 +4196,7 @@ type SourceCodeInfo_Location struct {
 func (x *SourceCodeInfo_Location) Reset() {
 	*x = SourceCodeInfo_Location{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3401,7 +4209,7 @@ func (x *SourceCodeInfo_Location) String() string {
 func (*SourceCodeInfo_Location) ProtoMessage() {}
 
 func (x *SourceCodeInfo_Location) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[26]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3414,7 +4222,7 @@ func (x *SourceCodeInfo_Location) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SourceCodeInfo_Location.ProtoReflect.Descriptor instead.
 func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) {
-	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 0}
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{21, 0}
 }
 
 func (x *SourceCodeInfo_Location) GetPath() []int32 {
@@ -3475,7 +4283,7 @@ type GeneratedCodeInfo_Annotation struct {
 func (x *GeneratedCodeInfo_Annotation) Reset() {
 	*x = GeneratedCodeInfo_Annotation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
+		mi := &file_google_protobuf_descriptor_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3488,7 +4296,7 @@ func (x *GeneratedCodeInfo_Annotation) String() string {
 func (*GeneratedCodeInfo_Annotation) ProtoMessage() {}
 
 func (x *GeneratedCodeInfo_Annotation) ProtoReflect() protoreflect.Message {
-	mi := &file_google_protobuf_descriptor_proto_msgTypes[27]
+	mi := &file_google_protobuf_descriptor_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3501,7 +4309,7 @@ func (x *GeneratedCodeInfo_Annotation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GeneratedCodeInfo_Annotation.ProtoReflect.Descriptor instead.
 func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) {
-	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20, 0}
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{22, 0}
 }
 
 func (x *GeneratedCodeInfo_Annotation) GetPath() []int32 {
@@ -3550,7 +4358,7 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x04, 0x66, 0x69,
-	0x6c, 0x65, 0x22, 0xfe, 0x04, 0x0a, 0x13, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x6c, 0x65, 0x22, 0x98, 0x05, 0x0a, 0x13, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
 	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18,
 	0x0a, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
@@ -3588,527 +4396,687 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x75, 0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66,
 	0x6f, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66,
 	0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x64, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x64, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0xb9, 0x06, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x05, 0x66,
-	0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x43, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69,
-	0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a,
-	0x0b, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x52, 0x0a, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x41, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x58, 0x0a, 0x0f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67,
+	0x09, 0x52, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x12, 0x32, 0x0a, 0x07, 0x65, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb9, 0x06,
+	0x0a, 0x0f, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x66, 0x69, 0x65,
+	0x6c, 0x64, 0x12, 0x43, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x09, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0b, 0x6e, 0x65, 0x73, 0x74, 0x65,
+	0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67,
 	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x44, 0x0a,
-	0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x64, 0x65, 0x63, 0x6c, 0x18, 0x08, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x44,
-	0x65, 0x63, 0x6c, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x55,
-	0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65,
-	0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x0a,
+	0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x65, 0x6e,
+	0x75, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x52, 0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x58, 0x0a,
+	0x0f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x7a, 0x0a, 0x0e, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x65, 0x6e, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x37, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a,
-	0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22,
-	0xad, 0x04, 0x0a, 0x15, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13,
-	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a, 0x0b, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x44, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0x88, 0x01,
-	0x02, 0x52, 0x0b, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x68,
-	0x0a, 0x0c, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x56, 0x65, 0x72,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x0a,
-	0x55, 0x4e, 0x56, 0x45, 0x52, 0x49, 0x46, 0x49, 0x45, 0x44, 0x52, 0x0c, 0x76, 0x65, 0x72, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xb3, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x63,
-	0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-	0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x23, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65,
-	0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x22, 0x34,
-	0x0a, 0x11, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x43, 0x4c, 0x41, 0x52, 0x41, 0x54, 0x49,
-	0x4f, 0x4e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x4e, 0x56, 0x45, 0x52, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x01, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22,
-	0xc1, 0x06, 0x0a, 0x14, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c,
-	0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x3e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x79, 0x70, 0x65, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x79, 0x70, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x65,
-	0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x69,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f,
-	0x66, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6a, 0x73, 0x6f, 0x6e, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x18,
-	0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, 0xb6, 0x02, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f,
-	0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x12,
-	0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x02, 0x12,
-	0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x03, 0x12,
-	0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x04,
-	0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x05,
-	0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34,
-	0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44,
-	0x33, 0x32, 0x10, 0x07, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x4f, 0x4f,
-	0x4c, 0x10, 0x08, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49,
-	0x4e, 0x47, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f,
-	0x55, 0x50, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x53,
-	0x53, 0x41, 0x47, 0x45, 0x10, 0x0b, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42,
-	0x59, 0x54, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55,
-	0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x45, 0x4e, 0x55, 0x4d, 0x10, 0x0e, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
-	0x46, 0x49, 0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x0f, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34, 0x10, 0x10, 0x12, 0x0f, 0x0a, 0x0b,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x11, 0x12, 0x0f, 0x0a,
-	0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x12, 0x22, 0x43,
-	0x0a, 0x05, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c,
-	0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x4c,
-	0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x49, 0x52, 0x45, 0x44, 0x10, 0x02, 0x12,
-	0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54, 0x45,
-	0x44, 0x10, 0x03, 0x22, 0x63, 0x0a, 0x14, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe3, 0x02, 0x0a, 0x13, 0x45, 0x6e, 0x75,
-	0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5d, 0x0a,
-	0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x6e, 0x75, 0x6d,
-	0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0d, 0x72,
-	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d,
-	0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x61, 0x6d,
-	0x65, 0x1a, 0x3b, 0x0a, 0x11, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18,
+	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x44, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
+	0x5f, 0x64, 0x65, 0x63, 0x6c, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e,
+	0x65, 0x6f, 0x66, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x63, 0x6c, 0x12, 0x39, 0x0a,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x55, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x52, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12,
+	0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+	0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x7a, 0x0a, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03,
-	0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x83,
-	0x01, 0x0a, 0x18, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x40,
+	0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x1a, 0x37, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0xc7, 0x04, 0x0a, 0x15, 0x45, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74,
+	0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a,
+	0x0b, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x61,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0x88, 0x01, 0x02, 0x52, 0x0b, 0x64, 0x65, 0x63,
+	0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x18, 0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65,
+	0x73, 0x12, 0x68, 0x0a, 0x0c, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
+	0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x3a, 0x0a, 0x55, 0x4e, 0x56, 0x45, 0x52, 0x49, 0x46, 0x49, 0x45, 0x44, 0x52, 0x0c, 0x76,
+	0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x94, 0x01, 0x0a, 0x0b,
+	0x44, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e,
+	0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+	0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x4a, 0x04, 0x08, 0x04,
+	0x10, 0x05, 0x22, 0x34, 0x0a, 0x11, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x45, 0x43, 0x4c, 0x41,
+	0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x4e, 0x56, 0x45,
+	0x52, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x01, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80,
+	0x80, 0x80, 0x02, 0x22, 0xc1, 0x06, 0x0a, 0x14, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65,
+	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c,
+	0x61, 0x62, 0x65, 0x6c, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x3e, 0x0a, 0x04, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c,
+	0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74,
+	0x79, 0x70, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x74, 0x79, 0x70, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x64, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x64, 0x65, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x6e, 0x65,
+	0x6f, 0x66, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x73,
+	0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6a,
+	0x73, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, 0xb6, 0x02, 0x0a, 0x04, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c,
+	0x45, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4c, 0x4f, 0x41,
+	0x54, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x36,
+	0x34, 0x10, 0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54,
+	0x36, 0x34, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54,
+	0x33, 0x32, 0x10, 0x05, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58,
+	0x45, 0x44, 0x36, 0x34, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46,
+	0x49, 0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x07, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x08, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x10, 0x0b, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x42, 0x59, 0x54, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x10, 0x0e, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x0f, 0x12, 0x11, 0x0a,
+	0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34, 0x10, 0x10,
+	0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10,
+	0x11, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x36, 0x34,
+	0x10, 0x12, 0x22, 0x43, 0x0a, 0x05, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x0e, 0x4c,
+	0x41, 0x42, 0x45, 0x4c, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12,
+	0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54, 0x45,
+	0x44, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x51,
+	0x55, 0x49, 0x52, 0x45, 0x44, 0x10, 0x02, 0x22, 0x63, 0x0a, 0x14, 0x4f, 0x6e, 0x65, 0x6f, 0x66,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe3, 0x02, 0x0a,
+	0x13, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x6f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75,
+	0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x5d, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61,
+	0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x64, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x11, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74,
+	0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65,
+	0x6e, 0x64, 0x22, 0x83, 0x01, 0x0a, 0x18, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65,
 	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12,
 	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x06, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x89,
-	0x02, 0x0a, 0x15, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f,
-	0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x07,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x07, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
+	0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
+	0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52,
+	0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x22, 0x89, 0x02, 0x0a, 0x15, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x38, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x10, 0x63, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x63, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x30, 0x0a, 0x10,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x22, 0xca,
+	0x09, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21,
+	0x0a, 0x0c, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6a, 0x61, 0x76, 0x61, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67,
+	0x65, 0x12, 0x30, 0x0a, 0x14, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f,
+	0x63, 0x6c, 0x61, 0x73, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x12, 0x6a, 0x61, 0x76, 0x61, 0x4f, 0x75, 0x74, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6d, 0x75, 0x6c, 0x74,
+	0x69, 0x70, 0x6c, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x6a, 0x61, 0x76, 0x61, 0x4d, 0x75, 0x6c,
+	0x74, 0x69, 0x70, 0x6c, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x1d, 0x6a, 0x61,
+	0x76, 0x61, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x71, 0x75, 0x61,
+	0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x14, 0x20, 0x01, 0x28,
+	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x19, 0x6a, 0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x41, 0x6e, 0x64, 0x48, 0x61, 0x73, 0x68,
+	0x12, 0x3a, 0x0a, 0x16, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x75, 0x74, 0x66, 0x38, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x53, 0x74, 0x72,
+	0x69, 0x6e, 0x67, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x74, 0x66, 0x38, 0x12, 0x53, 0x0a, 0x0c,
+	0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x3a, 0x05, 0x53,
+	0x50, 0x45, 0x45, 0x44, 0x52, 0x0b, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x6f,
+	0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x6f, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x6f, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65,
+	0x12, 0x35, 0x0a, 0x13, 0x63, 0x63, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66,
+	0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x63, 0x63, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x15, 0x6a, 0x61, 0x76, 0x61, 0x5f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a,
+	0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x12, 0x35, 0x0a, 0x13, 0x70, 0x79, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
+	0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x3a,
+	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x70, 0x79, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69,
+	0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x14, 0x70, 0x68, 0x70,
+	0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x73, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x12,
+	0x70, 0x68, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x10, 0x63, 0x63, 0x5f,
+	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x18, 0x1f, 0x20,
+	0x01, 0x28, 0x08, 0x3a, 0x04, 0x74, 0x72, 0x75, 0x65, 0x52, 0x0e, 0x63, 0x63, 0x45, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x62, 0x6a,
+	0x63, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x24,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x62, 0x6a, 0x63, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50,
+	0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0f, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x21, 0x0a, 0x0c, 0x73, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
+	0x18, 0x27, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x77, 0x69, 0x66, 0x74, 0x50, 0x72, 0x65,
+	0x66, 0x69, 0x78, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x68, 0x70, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73,
+	0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70,
+	0x68, 0x70, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x23, 0x0a,
+	0x0d, 0x70, 0x68, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x29,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x68, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x68, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x2c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x14, 0x70, 0x68, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x75, 0x62, 0x79,
+	0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x72, 0x75, 0x62, 0x79, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x66,
+	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x10, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
-	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x30, 0x0a, 0x10, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x22, 0x91, 0x09, 0x0a, 0x0b, 0x46,
-	0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x6a, 0x61,
-	0x76, 0x61, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x6a, 0x61, 0x76, 0x61, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x30, 0x0a,
-	0x14, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x61, 0x73,
-	0x73, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6a, 0x61, 0x76,
-	0x61, 0x4f, 0x75, 0x74, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x35, 0x0a, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65,
-	0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
-	0x6c, 0x73, 0x65, 0x52, 0x11, 0x6a, 0x61, 0x76, 0x61, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c,
-	0x65, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x1d, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x67,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x5f, 0x61,
-	0x6e, 0x64, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18,
-	0x01, 0x52, 0x19, 0x6a, 0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x45,
-	0x71, 0x75, 0x61, 0x6c, 0x73, 0x41, 0x6e, 0x64, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x16,
-	0x6a, 0x61, 0x76, 0x61, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x68, 0x65, 0x63,
-	0x6b, 0x5f, 0x75, 0x74, 0x66, 0x38, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
-	0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x55, 0x74, 0x66, 0x38, 0x12, 0x53, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x69,
-	0x6d, 0x69, 0x7a, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74,
-	0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x3a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44,
-	0x52, 0x0b, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x6f, 0x72, 0x12, 0x1d, 0x0a,
-	0x0a, 0x67, 0x6f, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x67, 0x6f, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x35, 0x0a, 0x13,
-	0x63, 0x63, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65,
-	0x52, 0x11, 0x63, 0x63, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x15, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x67, 0x65, 0x6e, 0x65,
-	0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01,
-	0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x35,
-	0x0a, 0x13, 0x70, 0x79, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c,
-	0x73, 0x65, 0x52, 0x11, 0x70, 0x79, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x14, 0x70, 0x68, 0x70, 0x5f, 0x67, 0x65, 0x6e,
-	0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x2a, 0x20,
-	0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x12, 0x70, 0x68, 0x70, 0x47,
-	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x25,
-	0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x17, 0x20, 0x01,
-	0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65,
-	0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x10, 0x63, 0x63, 0x5f, 0x65, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x3a,
-	0x04, 0x74, 0x72, 0x75, 0x65, 0x52, 0x0e, 0x63, 0x63, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41,
-	0x72, 0x65, 0x6e, 0x61, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x62, 0x6a, 0x63, 0x5f, 0x63, 0x6c,
-	0x61, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x24, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x6f, 0x62, 0x6a, 0x63, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69,
-	0x78, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x73, 0x68,
-	0x61, 0x72, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c,
-	0x73, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x27, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x73, 0x77, 0x69, 0x66, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
-	0x28, 0x0a, 0x10, 0x70, 0x68, 0x70, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x68, 0x70, 0x43, 0x6c,
-	0x61, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x68, 0x70,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x29, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x70, 0x68, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x34,
-	0x0a, 0x16, 0x70, 0x68, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14,
-	0x70, 0x68, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x75, 0x62, 0x79, 0x5f, 0x70, 0x61, 0x63,
-	0x6b, 0x61, 0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x75, 0x62, 0x79,
-	0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x3a, 0x0a, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64,
-	0x65, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09,
-	0x43, 0x4f, 0x44, 0x45, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x4c,
-	0x49, 0x54, 0x45, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x03, 0x2a, 0x09, 0x08,
-	0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x26, 0x10, 0x27, 0x22, 0xbb,
-	0x03, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x3c, 0x0a, 0x17, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74,
-	0x5f, 0x77, 0x69, 0x72, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x14, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x53, 0x65, 0x74, 0x57, 0x69, 0x72, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12,
-	0x4c, 0x0a, 0x1f, 0x6e, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52,
-	0x1c, 0x6e, 0x6f, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x25, 0x0a,
-	0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x70, 0x5f, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x56, 0x0a, 0x26, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13,
-	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04,
-	0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07,
-	0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x22, 0x85, 0x09, 0x0a,
-	0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x41, 0x0a,
-	0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46,
-	0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x43, 0x54, 0x79, 0x70,
-	0x65, 0x3a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x47, 0x0a, 0x06, 0x6a, 0x73, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x09,
-	0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x52, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x19, 0x0a, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x3a,
-	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x12, 0x2e, 0x0a, 0x0f,
-	0x75, 0x6e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x7a, 0x79, 0x18,
-	0x0f, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0e, 0x75, 0x6e,
-	0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4c, 0x61, 0x7a, 0x79, 0x12, 0x25, 0x0a, 0x0a,
-	0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
-	0x74, 0x65, 0x64, 0x12, 0x19, 0x0a, 0x04, 0x77, 0x65, 0x61, 0x6b, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x04, 0x77, 0x65, 0x61, 0x6b, 0x12, 0x28,
-	0x0a, 0x0c, 0x64, 0x65, 0x62, 0x75, 0x67, 0x5f, 0x72, 0x65, 0x64, 0x61, 0x63, 0x74, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x62,
-	0x75, 0x67, 0x52, 0x65, 0x64, 0x61, 0x63, 0x74, 0x12, 0x4b, 0x0a, 0x09, 0x72, 0x65, 0x74, 0x65,
-	0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69,
-	0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x74, 0x65,
-	0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
-	0x12, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x54, 0x79, 0x70, 0x65, 0x42, 0x02, 0x18, 0x01, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x12, 0x48, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x13, 0x20, 0x03,
-	0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x0a, 0x05, 0x43, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a,
-	0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x4f,
-	0x52, 0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x50,
-	0x49, 0x45, 0x43, 0x45, 0x10, 0x02, 0x22, 0x35, 0x0a, 0x06, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x00, 0x12,
-	0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0d,
-	0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x22, 0x55, 0x0a,
-	0x0f, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e,
-	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45, 0x4e,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x14,
-	0x0a, 0x10, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x4f, 0x55, 0x52,
-	0x43, 0x45, 0x10, 0x02, 0x22, 0x8c, 0x02, 0x0a, 0x10, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52,
-	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
-	0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x41, 0x52, 0x47,
-	0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f,
-	0x4e, 0x5f, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52,
-	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45,
-	0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41, 0x52,
-	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x4e, 0x45, 0x4f, 0x46, 0x10, 0x05,
-	0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x45, 0x4e, 0x55, 0x4d, 0x10, 0x06, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59,
-	0x10, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x54,
-	0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f,
-	0x44, 0x10, 0x09, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04,
-	0x08, 0x04, 0x10, 0x05, 0x22, 0x73, 0x0a, 0x0c, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
 	0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
 	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09,
-	0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x98, 0x02, 0x0a, 0x0b, 0x45, 0x6e,
-	0x75, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a,
+	0x0a, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x09,
+	0x0a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x44,
+	0x45, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x4c, 0x49, 0x54, 0x45,
+	0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x03, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10,
+	0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x26, 0x10, 0x27, 0x22, 0xf4, 0x03, 0x0a, 0x0e,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c,
+	0x0a, 0x17, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x77, 0x69,
+	0x72, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a,
+	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x14, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53,
+	0x65, 0x74, 0x57, 0x69, 0x72, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x4c, 0x0a, 0x1f,
+	0x6e, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x1c, 0x6e, 0x6f,
+	0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x6f, 0x72, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65,
 	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05,
 	0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x12, 0x56, 0x0a, 0x26, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f,
-	0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13,
-	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04,
-	0x08, 0x05, 0x10, 0x06, 0x22, 0x9e, 0x01, 0x0a, 0x10, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70,
-	0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66,
-	0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
-	0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65,
-	0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10,
-	0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9c, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72,
-	0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
-	0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12,
+	0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x70, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x56,
+	0x0a, 0x26, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x67,
+	0x61, 0x63, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x22, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x4c, 0x65,
+	0x67, 0x61, 0x63, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x6f, 0x6e,
+	0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12,
 	0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64,
 	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
 	0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70,
 	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
 	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80,
-	0x80, 0x80, 0x80, 0x02, 0x22, 0xe0, 0x02, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
-	0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x71, 0x0a,
-	0x11, 0x69, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x6c, 0x65, 0x76,
-	0x65, 0x6c, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74,
-	0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x3a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50,
-	0x4f, 0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x52, 0x10,
-	0x69, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c,
-	0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65,
-	0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x10, 0x49, 0x64,
-	0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x17,
-	0x0a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e,
-	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x4f, 0x5f, 0x53, 0x49,
-	0x44, 0x45, 0x5f, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a,
-	0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x2a, 0x09, 0x08, 0xe8,
-	0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9a, 0x03, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x41, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e,
+	0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06,
+	0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x09,
+	0x10, 0x0a, 0x22, 0xad, 0x0a, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x41, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x2e, 0x43, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x52,
+	0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x47,
+	0x0a, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4a, 0x53,
+	0x54, 0x79, 0x70, 0x65, 0x3a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x52,
+	0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x61,
+	0x7a, 0x79, 0x12, 0x2e, 0x0a, 0x0f, 0x75, 0x6e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64,
+	0x5f, 0x6c, 0x61, 0x7a, 0x79, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c,
+	0x73, 0x65, 0x52, 0x0e, 0x75, 0x6e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4c, 0x61,
+	0x7a, 0x79, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x19, 0x0a, 0x04, 0x77, 0x65, 0x61,
+	0x6b, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x04,
+	0x77, 0x65, 0x61, 0x6b, 0x12, 0x28, 0x0a, 0x0c, 0x64, 0x65, 0x62, 0x75, 0x67, 0x5f, 0x72, 0x65,
+	0x64, 0x61, 0x63, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
+	0x65, 0x52, 0x0b, 0x64, 0x65, 0x62, 0x75, 0x67, 0x52, 0x65, 0x64, 0x61, 0x63, 0x74, 0x12, 0x4b,
+	0x0a, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x48, 0x0a, 0x07, 0x74,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x74, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x57, 0x0a, 0x10, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x45,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0f, 0x65,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x37,
+	0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66,
+	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x1a, 0x5a, 0x0a, 0x0e, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x12, 0x32, 0x0a, 0x07, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07,
+	0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2f, 0x0a,
+	0x05, 0x43, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47,
+	0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x4f, 0x52, 0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c,
+	0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x50, 0x49, 0x45, 0x43, 0x45, 0x10, 0x02, 0x22, 0x35,
+	0x0a, 0x06, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e,
+	0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x53, 0x54,
+	0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x55, 0x4d,
+	0x42, 0x45, 0x52, 0x10, 0x02, 0x22, 0x55, 0x0a, 0x0f, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45,
+	0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12,
+	0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x55, 0x4e,
+	0x54, 0x49, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54,
+	0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x02, 0x22, 0x8c, 0x02, 0x0a,
+	0x10, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41,
+	0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x01,
+	0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x10,
+	0x02, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41,
+	0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x10,
+	0x04, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x4f, 0x4e, 0x45, 0x4f, 0x46, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x52, 0x47,
+	0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x10, 0x06, 0x12, 0x1a,
+	0x0a, 0x16, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e,
+	0x55, 0x4d, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x10, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41,
+	0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43,
+	0x45, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x10, 0x09, 0x2a, 0x09, 0x08, 0xe8, 0x07,
+	0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x12,
+	0x10, 0x13, 0x22, 0xac, 0x01, 0x0a, 0x0c, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53,
+	0x65, 0x74, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14,
+	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80,
+	0x02, 0x22, 0xd1, 0x02, 0x0a, 0x0b, 0x45, 0x6e, 0x75, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x41, 0x6c, 0x69,
+	0x61, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x56, 0x0a, 0x26, 0x64, 0x65, 0x70,
+	0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x6a,
+	0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69,
+	0x63, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x64,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4a,
+	0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74,
+	0x73, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74,
+	0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a,
+	0x04, 0x08, 0x05, 0x10, 0x06, 0x22, 0x81, 0x02, 0x0a, 0x10, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65,
+	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05,
+	0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74,
+	0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0c, 0x64, 0x65,
+	0x62, 0x75, 0x67, 0x5f, 0x72, 0x65, 0x64, 0x61, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x62, 0x75, 0x67, 0x52, 0x65,
+	0x64, 0x61, 0x63, 0x74, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
+	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09,
+	0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0xd5, 0x01, 0x0a, 0x0e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x37, 0x0a, 0x08,
+	0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66, 0x65, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
+	0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65,
+	0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x58, 0x0a, 0x14,
+	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80,
+	0x02, 0x22, 0x99, 0x03, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a,
+	0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x71, 0x0a, 0x11, 0x69, 0x64,
+	0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
+	0x22, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63,
+	0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x3a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45,
+	0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x52, 0x10, 0x69, 0x64, 0x65,
+	0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x37, 0x0a,
+	0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x52, 0x08, 0x66, 0x65,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7,
+	0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x22, 0x50, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c,
+	0x65, 0x76, 0x65, 0x6c, 0x12, 0x17, 0x0a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45,
+	0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a,
+	0x0f, 0x4e, 0x4f, 0x5f, 0x53, 0x49, 0x44, 0x45, 0x5f, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53,
+	0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x54,
+	0x10, 0x02, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9a, 0x03,
+	0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
+	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x50, 0x61,
+	0x72, 0x74, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f,
+	0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x10, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x12, 0x2c, 0x0a, 0x12, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e,
+	0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6e,
+	0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x21, 0x0a, 0x0c, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
+	0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
+	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x4a,
+	0x0a, 0x08, 0x4e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61,
+	0x6d, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x08, 0x6e,
+	0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x02, 0x28, 0x08, 0x52, 0x0b, 0x69,
+	0x73, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xfc, 0x09, 0x0a, 0x0a, 0x46,
+	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x12, 0x8b, 0x01, 0x0a, 0x0e, 0x66, 0x69,
+	0x65, 0x6c, 0x64, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x2e,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x39, 0x88,
+	0x01, 0x01, 0x98, 0x01, 0x04, 0x98, 0x01, 0x01, 0xa2, 0x01, 0x0d, 0x12, 0x08, 0x45, 0x58, 0x50,
+	0x4c, 0x49, 0x43, 0x49, 0x54, 0x18, 0xe6, 0x07, 0xa2, 0x01, 0x0d, 0x12, 0x08, 0x49, 0x4d, 0x50,
+	0x4c, 0x49, 0x43, 0x49, 0x54, 0x18, 0xe7, 0x07, 0xa2, 0x01, 0x0d, 0x12, 0x08, 0x45, 0x58, 0x50,
+	0x4c, 0x49, 0x43, 0x49, 0x54, 0x18, 0xe8, 0x07, 0x52, 0x0d, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x50,
+	0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x66, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65,
+	0x42, 0x23, 0x88, 0x01, 0x01, 0x98, 0x01, 0x06, 0x98, 0x01, 0x01, 0xa2, 0x01, 0x0b, 0x12, 0x06,
+	0x43, 0x4c, 0x4f, 0x53, 0x45, 0x44, 0x18, 0xe6, 0x07, 0xa2, 0x01, 0x09, 0x12, 0x04, 0x4f, 0x50,
+	0x45, 0x4e, 0x18, 0xe7, 0x07, 0x52, 0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x92, 0x01, 0x0a, 0x17, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65,
+	0x6c, 0x64, 0x5f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x31, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x52,
+	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x63, 0x6f,
+	0x64, 0x69, 0x6e, 0x67, 0x42, 0x27, 0x88, 0x01, 0x01, 0x98, 0x01, 0x04, 0x98, 0x01, 0x01, 0xa2,
+	0x01, 0x0d, 0x12, 0x08, 0x45, 0x58, 0x50, 0x41, 0x4e, 0x44, 0x45, 0x44, 0x18, 0xe6, 0x07, 0xa2,
+	0x01, 0x0b, 0x12, 0x06, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x18, 0xe7, 0x07, 0x52, 0x15, 0x72,
+	0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x63, 0x6f,
+	0x64, 0x69, 0x6e, 0x67, 0x12, 0x78, 0x0a, 0x0f, 0x75, 0x74, 0x66, 0x38, 0x5f, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x55, 0x74, 0x66, 0x38, 0x56,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x23, 0x88, 0x01, 0x01, 0x98, 0x01,
+	0x04, 0x98, 0x01, 0x01, 0xa2, 0x01, 0x09, 0x12, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x18, 0xe6, 0x07,
+	0xa2, 0x01, 0x0b, 0x12, 0x06, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x18, 0xe7, 0x07, 0x52, 0x0e,
+	0x75, 0x74, 0x66, 0x38, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x78,
+	0x0a, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69,
+	0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x63,
+	0x6f, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x20, 0x88, 0x01, 0x01, 0x98, 0x01, 0x04, 0x98, 0x01, 0x01,
+	0xa2, 0x01, 0x14, 0x12, 0x0f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x5f, 0x50, 0x52, 0x45, 0x46,
+	0x49, 0x58, 0x45, 0x44, 0x18, 0xe6, 0x07, 0x52, 0x0f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x7c, 0x0a, 0x0b, 0x6a, 0x73, 0x6f, 0x6e,
+	0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x26, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a,
-	0x12, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x6e,
-	0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c,
-	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
-	0x27, 0x0a, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x4a, 0x0a, 0x08, 0x4e, 0x61, 0x6d, 0x65,
-	0x50, 0x61, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x72,
-	0x74, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72,
-	0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x18, 0x02, 0x20, 0x02, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x22, 0xa7, 0x02, 0x0a, 0x0e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43,
-	0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x44, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xce, 0x01,
-	0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
-	0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x6c, 0x65,
-	0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d,
-	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e,
-	0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x10, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x65,
-	0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x44, 0x65,
-	0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xd0,
-	0x02, 0x0a, 0x11, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65,
-	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4d, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x1a, 0xeb, 0x01, 0x0a, 0x0a, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
-	0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62,
-	0x65, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x65, 0x67, 0x69,
-	0x6e, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x65, 0x6e, 0x64, 0x12, 0x52, 0x0a, 0x08, 0x73, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x52, 0x08, 0x73,
-	0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x22, 0x28, 0x0a, 0x08, 0x53, 0x65, 0x6d, 0x61, 0x6e,
-	0x74, 0x69, 0x63, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a,
-	0x03, 0x53, 0x45, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x49, 0x41, 0x53, 0x10,
-	0x02, 0x42, 0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x10, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x2d, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x70, 0x62, 0xf8, 0x01, 0x01, 0xa2, 0x02,
-	0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1a, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e,
+	0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x4a, 0x73, 0x6f, 0x6e, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x33, 0x88, 0x01, 0x01, 0x98, 0x01, 0x03, 0x98, 0x01, 0x06,
+	0x98, 0x01, 0x01, 0xa2, 0x01, 0x17, 0x12, 0x12, 0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x5f, 0x42,
+	0x45, 0x53, 0x54, 0x5f, 0x45, 0x46, 0x46, 0x4f, 0x52, 0x54, 0x18, 0xe6, 0x07, 0xa2, 0x01, 0x0a,
+	0x12, 0x05, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x18, 0xe7, 0x07, 0x52, 0x0a, 0x6a, 0x73, 0x6f, 0x6e,
+	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x5c, 0x0a, 0x0d, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x50,
+	0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x49, 0x45, 0x4c, 0x44,
+	0x5f, 0x50, 0x52, 0x45, 0x53, 0x45, 0x4e, 0x43, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
+	0x4e, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x10,
+	0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4d, 0x50, 0x4c, 0x49, 0x43, 0x49, 0x54, 0x10, 0x02, 0x12,
+	0x13, 0x0a, 0x0f, 0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x49, 0x52,
+	0x45, 0x44, 0x10, 0x03, 0x22, 0x37, 0x0a, 0x08, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x15, 0x0a, 0x11, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x50, 0x45, 0x4e, 0x10,
+	0x01, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x44, 0x10, 0x02, 0x22, 0x56, 0x0a,
+	0x15, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e,
+	0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x1f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54,
+	0x45, 0x44, 0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x5f, 0x45, 0x4e, 0x43, 0x4f, 0x44, 0x49, 0x4e,
+	0x47, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x50, 0x41, 0x4e,
+	0x44, 0x45, 0x44, 0x10, 0x02, 0x22, 0x43, 0x0a, 0x0e, 0x55, 0x74, 0x66, 0x38, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x55, 0x54, 0x46, 0x38, 0x5f,
+	0x56, 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f,
+	0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x0a,
+	0x0a, 0x06, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x10, 0x02, 0x22, 0x53, 0x0a, 0x0f, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x0a,
+	0x18, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x45, 0x4e, 0x43, 0x4f, 0x44, 0x49, 0x4e,
+	0x47, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4c,
+	0x45, 0x4e, 0x47, 0x54, 0x48, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x49, 0x58, 0x45, 0x44, 0x10, 0x01,
+	0x12, 0x0d, 0x0a, 0x09, 0x44, 0x45, 0x4c, 0x49, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x02, 0x22,
+	0x48, 0x0a, 0x0a, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x17, 0x0a,
+	0x13, 0x4a, 0x53, 0x4f, 0x4e, 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, 0x55, 0x4e, 0x4b,
+	0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x10,
+	0x01, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x45, 0x47, 0x41, 0x43, 0x59, 0x5f, 0x42, 0x45, 0x53, 0x54,
+	0x5f, 0x45, 0x46, 0x46, 0x4f, 0x52, 0x54, 0x10, 0x02, 0x2a, 0x06, 0x08, 0xe8, 0x07, 0x10, 0xe9,
+	0x07, 0x2a, 0x06, 0x08, 0xe9, 0x07, 0x10, 0xea, 0x07, 0x2a, 0x06, 0x08, 0x8b, 0x4e, 0x10, 0x90,
+	0x4e, 0x4a, 0x06, 0x08, 0xe7, 0x07, 0x10, 0xe8, 0x07, 0x22, 0xfe, 0x02, 0x0a, 0x12, 0x46, 0x65,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73,
+	0x12, 0x58, 0x0a, 0x08, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53,
+	0x65, 0x74, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x52, 0x08, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x41, 0x0a, 0x0f, 0x6d, 0x69,
+	0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x6d,
+	0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a,
+	0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x0e, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x1a, 0x87, 0x01, 0x0a, 0x18, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x45,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x32, 0x0a,
+	0x07, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x37, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74,
+	0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0xa7, 0x02, 0x0a, 0x0e, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x44, 0x0a,
+	0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x28, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x1a, 0xce, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02,
+	0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x70, 0x61, 0x6e,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x73, 0x70, 0x61, 0x6e,
+	0x12, 0x29, 0x0a, 0x10, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x65, 0x61, 0x64,
+	0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x74,
+	0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67,
+	0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x6c, 0x65, 0x61, 0x64,
+	0x69, 0x6e, 0x67, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6c, 0x65, 0x61,
+	0x64, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d,
+	0x65, 0x6e, 0x74, 0x73, 0x22, 0xd0, 0x02, 0x0a, 0x11, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+	0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4d, 0x0a, 0x0a, 0x61, 0x6e,
+	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x61,
+	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xeb, 0x01, 0x0a, 0x0a, 0x41, 0x6e,
+	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68,
+	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x52, 0x0a, 0x08, 0x73, 0x65, 0x6d,
+	0x61, 0x6e, 0x74, 0x69, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65,
+	0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e,
+	0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x6d, 0x61, 0x6e,
+	0x74, 0x69, 0x63, 0x52, 0x08, 0x73, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x22, 0x28, 0x0a,
+	0x08, 0x53, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e,
+	0x45, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x45, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05,
+	0x41, 0x4c, 0x49, 0x41, 0x53, 0x10, 0x02, 0x2a, 0xea, 0x01, 0x0a, 0x07, 0x45, 0x64, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55,
+	0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0e, 0x45, 0x44, 0x49, 0x54,
+	0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x32, 0x10, 0xe6, 0x07, 0x12, 0x13, 0x0a,
+	0x0e, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x33, 0x10,
+	0xe7, 0x07, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x32, 0x30,
+	0x32, 0x33, 0x10, 0xe8, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x31, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x17,
+	0x0a, 0x13, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x32, 0x5f, 0x54, 0x45, 0x53, 0x54,
+	0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x1d, 0x0a, 0x17, 0x45, 0x44, 0x49, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x39, 0x39, 0x39, 0x39, 0x37, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x4f, 0x4e,
+	0x4c, 0x59, 0x10, 0x9d, 0x8d, 0x06, 0x12, 0x1d, 0x0a, 0x17, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f,
+	0x4e, 0x5f, 0x39, 0x39, 0x39, 0x39, 0x38, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x4f, 0x4e, 0x4c,
+	0x59, 0x10, 0x9e, 0x8d, 0x06, 0x12, 0x1d, 0x0a, 0x17, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x39, 0x39, 0x39, 0x39, 0x39, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x4f, 0x4e, 0x4c, 0x59,
+	0x10, 0x9f, 0x8d, 0x06, 0x42, 0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x10, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a,
+	0x2d, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
+	0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x73, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x70, 0x62, 0xf8, 0x01,
+	0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1a, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x6c, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e,
 }
 
 var (
@@ -4123,103 +5091,136 @@ func file_google_protobuf_descriptor_proto_rawDescGZIP() []byte {
 	return file_google_protobuf_descriptor_proto_rawDescData
 }
 
-var file_google_protobuf_descriptor_proto_enumTypes = make([]protoimpl.EnumInfo, 10)
-var file_google_protobuf_descriptor_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
+var file_google_protobuf_descriptor_proto_enumTypes = make([]protoimpl.EnumInfo, 17)
+var file_google_protobuf_descriptor_proto_msgTypes = make([]protoimpl.MessageInfo, 32)
 var file_google_protobuf_descriptor_proto_goTypes = []interface{}{
-	(ExtensionRangeOptions_VerificationState)(0),  // 0: google.protobuf.ExtensionRangeOptions.VerificationState
-	(FieldDescriptorProto_Type)(0),                // 1: google.protobuf.FieldDescriptorProto.Type
-	(FieldDescriptorProto_Label)(0),               // 2: google.protobuf.FieldDescriptorProto.Label
-	(FileOptions_OptimizeMode)(0),                 // 3: google.protobuf.FileOptions.OptimizeMode
-	(FieldOptions_CType)(0),                       // 4: google.protobuf.FieldOptions.CType
-	(FieldOptions_JSType)(0),                      // 5: google.protobuf.FieldOptions.JSType
-	(FieldOptions_OptionRetention)(0),             // 6: google.protobuf.FieldOptions.OptionRetention
-	(FieldOptions_OptionTargetType)(0),            // 7: google.protobuf.FieldOptions.OptionTargetType
-	(MethodOptions_IdempotencyLevel)(0),           // 8: google.protobuf.MethodOptions.IdempotencyLevel
-	(GeneratedCodeInfo_Annotation_Semantic)(0),    // 9: google.protobuf.GeneratedCodeInfo.Annotation.Semantic
-	(*FileDescriptorSet)(nil),                     // 10: google.protobuf.FileDescriptorSet
-	(*FileDescriptorProto)(nil),                   // 11: google.protobuf.FileDescriptorProto
-	(*DescriptorProto)(nil),                       // 12: google.protobuf.DescriptorProto
-	(*ExtensionRangeOptions)(nil),                 // 13: google.protobuf.ExtensionRangeOptions
-	(*FieldDescriptorProto)(nil),                  // 14: google.protobuf.FieldDescriptorProto
-	(*OneofDescriptorProto)(nil),                  // 15: google.protobuf.OneofDescriptorProto
-	(*EnumDescriptorProto)(nil),                   // 16: google.protobuf.EnumDescriptorProto
-	(*EnumValueDescriptorProto)(nil),              // 17: google.protobuf.EnumValueDescriptorProto
-	(*ServiceDescriptorProto)(nil),                // 18: google.protobuf.ServiceDescriptorProto
-	(*MethodDescriptorProto)(nil),                 // 19: google.protobuf.MethodDescriptorProto
-	(*FileOptions)(nil),                           // 20: google.protobuf.FileOptions
-	(*MessageOptions)(nil),                        // 21: google.protobuf.MessageOptions
-	(*FieldOptions)(nil),                          // 22: google.protobuf.FieldOptions
-	(*OneofOptions)(nil),                          // 23: google.protobuf.OneofOptions
-	(*EnumOptions)(nil),                           // 24: google.protobuf.EnumOptions
-	(*EnumValueOptions)(nil),                      // 25: google.protobuf.EnumValueOptions
-	(*ServiceOptions)(nil),                        // 26: google.protobuf.ServiceOptions
-	(*MethodOptions)(nil),                         // 27: google.protobuf.MethodOptions
-	(*UninterpretedOption)(nil),                   // 28: google.protobuf.UninterpretedOption
-	(*SourceCodeInfo)(nil),                        // 29: google.protobuf.SourceCodeInfo
-	(*GeneratedCodeInfo)(nil),                     // 30: google.protobuf.GeneratedCodeInfo
-	(*DescriptorProto_ExtensionRange)(nil),        // 31: google.protobuf.DescriptorProto.ExtensionRange
-	(*DescriptorProto_ReservedRange)(nil),         // 32: google.protobuf.DescriptorProto.ReservedRange
-	(*ExtensionRangeOptions_Declaration)(nil),     // 33: google.protobuf.ExtensionRangeOptions.Declaration
-	(*EnumDescriptorProto_EnumReservedRange)(nil), // 34: google.protobuf.EnumDescriptorProto.EnumReservedRange
-	(*UninterpretedOption_NamePart)(nil),          // 35: google.protobuf.UninterpretedOption.NamePart
-	(*SourceCodeInfo_Location)(nil),               // 36: google.protobuf.SourceCodeInfo.Location
-	(*GeneratedCodeInfo_Annotation)(nil),          // 37: google.protobuf.GeneratedCodeInfo.Annotation
+	(Edition)(0), // 0: google.protobuf.Edition
+	(ExtensionRangeOptions_VerificationState)(0),        // 1: google.protobuf.ExtensionRangeOptions.VerificationState
+	(FieldDescriptorProto_Type)(0),                      // 2: google.protobuf.FieldDescriptorProto.Type
+	(FieldDescriptorProto_Label)(0),                     // 3: google.protobuf.FieldDescriptorProto.Label
+	(FileOptions_OptimizeMode)(0),                       // 4: google.protobuf.FileOptions.OptimizeMode
+	(FieldOptions_CType)(0),                             // 5: google.protobuf.FieldOptions.CType
+	(FieldOptions_JSType)(0),                            // 6: google.protobuf.FieldOptions.JSType
+	(FieldOptions_OptionRetention)(0),                   // 7: google.protobuf.FieldOptions.OptionRetention
+	(FieldOptions_OptionTargetType)(0),                  // 8: google.protobuf.FieldOptions.OptionTargetType
+	(MethodOptions_IdempotencyLevel)(0),                 // 9: google.protobuf.MethodOptions.IdempotencyLevel
+	(FeatureSet_FieldPresence)(0),                       // 10: google.protobuf.FeatureSet.FieldPresence
+	(FeatureSet_EnumType)(0),                            // 11: google.protobuf.FeatureSet.EnumType
+	(FeatureSet_RepeatedFieldEncoding)(0),               // 12: google.protobuf.FeatureSet.RepeatedFieldEncoding
+	(FeatureSet_Utf8Validation)(0),                      // 13: google.protobuf.FeatureSet.Utf8Validation
+	(FeatureSet_MessageEncoding)(0),                     // 14: google.protobuf.FeatureSet.MessageEncoding
+	(FeatureSet_JsonFormat)(0),                          // 15: google.protobuf.FeatureSet.JsonFormat
+	(GeneratedCodeInfo_Annotation_Semantic)(0),          // 16: google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	(*FileDescriptorSet)(nil),                           // 17: google.protobuf.FileDescriptorSet
+	(*FileDescriptorProto)(nil),                         // 18: google.protobuf.FileDescriptorProto
+	(*DescriptorProto)(nil),                             // 19: google.protobuf.DescriptorProto
+	(*ExtensionRangeOptions)(nil),                       // 20: google.protobuf.ExtensionRangeOptions
+	(*FieldDescriptorProto)(nil),                        // 21: google.protobuf.FieldDescriptorProto
+	(*OneofDescriptorProto)(nil),                        // 22: google.protobuf.OneofDescriptorProto
+	(*EnumDescriptorProto)(nil),                         // 23: google.protobuf.EnumDescriptorProto
+	(*EnumValueDescriptorProto)(nil),                    // 24: google.protobuf.EnumValueDescriptorProto
+	(*ServiceDescriptorProto)(nil),                      // 25: google.protobuf.ServiceDescriptorProto
+	(*MethodDescriptorProto)(nil),                       // 26: google.protobuf.MethodDescriptorProto
+	(*FileOptions)(nil),                                 // 27: google.protobuf.FileOptions
+	(*MessageOptions)(nil),                              // 28: google.protobuf.MessageOptions
+	(*FieldOptions)(nil),                                // 29: google.protobuf.FieldOptions
+	(*OneofOptions)(nil),                                // 30: google.protobuf.OneofOptions
+	(*EnumOptions)(nil),                                 // 31: google.protobuf.EnumOptions
+	(*EnumValueOptions)(nil),                            // 32: google.protobuf.EnumValueOptions
+	(*ServiceOptions)(nil),                              // 33: google.protobuf.ServiceOptions
+	(*MethodOptions)(nil),                               // 34: google.protobuf.MethodOptions
+	(*UninterpretedOption)(nil),                         // 35: google.protobuf.UninterpretedOption
+	(*FeatureSet)(nil),                                  // 36: google.protobuf.FeatureSet
+	(*FeatureSetDefaults)(nil),                          // 37: google.protobuf.FeatureSetDefaults
+	(*SourceCodeInfo)(nil),                              // 38: google.protobuf.SourceCodeInfo
+	(*GeneratedCodeInfo)(nil),                           // 39: google.protobuf.GeneratedCodeInfo
+	(*DescriptorProto_ExtensionRange)(nil),              // 40: google.protobuf.DescriptorProto.ExtensionRange
+	(*DescriptorProto_ReservedRange)(nil),               // 41: google.protobuf.DescriptorProto.ReservedRange
+	(*ExtensionRangeOptions_Declaration)(nil),           // 42: google.protobuf.ExtensionRangeOptions.Declaration
+	(*EnumDescriptorProto_EnumReservedRange)(nil),       // 43: google.protobuf.EnumDescriptorProto.EnumReservedRange
+	(*FieldOptions_EditionDefault)(nil),                 // 44: google.protobuf.FieldOptions.EditionDefault
+	(*UninterpretedOption_NamePart)(nil),                // 45: google.protobuf.UninterpretedOption.NamePart
+	(*FeatureSetDefaults_FeatureSetEditionDefault)(nil), // 46: google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault
+	(*SourceCodeInfo_Location)(nil),                     // 47: google.protobuf.SourceCodeInfo.Location
+	(*GeneratedCodeInfo_Annotation)(nil),                // 48: google.protobuf.GeneratedCodeInfo.Annotation
 }
 var file_google_protobuf_descriptor_proto_depIdxs = []int32{
-	11, // 0: google.protobuf.FileDescriptorSet.file:type_name -> google.protobuf.FileDescriptorProto
-	12, // 1: google.protobuf.FileDescriptorProto.message_type:type_name -> google.protobuf.DescriptorProto
-	16, // 2: google.protobuf.FileDescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
-	18, // 3: google.protobuf.FileDescriptorProto.service:type_name -> google.protobuf.ServiceDescriptorProto
-	14, // 4: google.protobuf.FileDescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
-	20, // 5: google.protobuf.FileDescriptorProto.options:type_name -> google.protobuf.FileOptions
-	29, // 6: google.protobuf.FileDescriptorProto.source_code_info:type_name -> google.protobuf.SourceCodeInfo
-	14, // 7: google.protobuf.DescriptorProto.field:type_name -> google.protobuf.FieldDescriptorProto
-	14, // 8: google.protobuf.DescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
-	12, // 9: google.protobuf.DescriptorProto.nested_type:type_name -> google.protobuf.DescriptorProto
-	16, // 10: google.protobuf.DescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
-	31, // 11: google.protobuf.DescriptorProto.extension_range:type_name -> google.protobuf.DescriptorProto.ExtensionRange
-	15, // 12: google.protobuf.DescriptorProto.oneof_decl:type_name -> google.protobuf.OneofDescriptorProto
-	21, // 13: google.protobuf.DescriptorProto.options:type_name -> google.protobuf.MessageOptions
-	32, // 14: google.protobuf.DescriptorProto.reserved_range:type_name -> google.protobuf.DescriptorProto.ReservedRange
-	28, // 15: google.protobuf.ExtensionRangeOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	33, // 16: google.protobuf.ExtensionRangeOptions.declaration:type_name -> google.protobuf.ExtensionRangeOptions.Declaration
-	0,  // 17: google.protobuf.ExtensionRangeOptions.verification:type_name -> google.protobuf.ExtensionRangeOptions.VerificationState
-	2,  // 18: google.protobuf.FieldDescriptorProto.label:type_name -> google.protobuf.FieldDescriptorProto.Label
-	1,  // 19: google.protobuf.FieldDescriptorProto.type:type_name -> google.protobuf.FieldDescriptorProto.Type
-	22, // 20: google.protobuf.FieldDescriptorProto.options:type_name -> google.protobuf.FieldOptions
-	23, // 21: google.protobuf.OneofDescriptorProto.options:type_name -> google.protobuf.OneofOptions
-	17, // 22: google.protobuf.EnumDescriptorProto.value:type_name -> google.protobuf.EnumValueDescriptorProto
-	24, // 23: google.protobuf.EnumDescriptorProto.options:type_name -> google.protobuf.EnumOptions
-	34, // 24: google.protobuf.EnumDescriptorProto.reserved_range:type_name -> google.protobuf.EnumDescriptorProto.EnumReservedRange
-	25, // 25: google.protobuf.EnumValueDescriptorProto.options:type_name -> google.protobuf.EnumValueOptions
-	19, // 26: google.protobuf.ServiceDescriptorProto.method:type_name -> google.protobuf.MethodDescriptorProto
-	26, // 27: google.protobuf.ServiceDescriptorProto.options:type_name -> google.protobuf.ServiceOptions
-	27, // 28: google.protobuf.MethodDescriptorProto.options:type_name -> google.protobuf.MethodOptions
-	3,  // 29: google.protobuf.FileOptions.optimize_for:type_name -> google.protobuf.FileOptions.OptimizeMode
-	28, // 30: google.protobuf.FileOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	28, // 31: google.protobuf.MessageOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	4,  // 32: google.protobuf.FieldOptions.ctype:type_name -> google.protobuf.FieldOptions.CType
-	5,  // 33: google.protobuf.FieldOptions.jstype:type_name -> google.protobuf.FieldOptions.JSType
-	6,  // 34: google.protobuf.FieldOptions.retention:type_name -> google.protobuf.FieldOptions.OptionRetention
-	7,  // 35: google.protobuf.FieldOptions.target:type_name -> google.protobuf.FieldOptions.OptionTargetType
-	7,  // 36: google.protobuf.FieldOptions.targets:type_name -> google.protobuf.FieldOptions.OptionTargetType
-	28, // 37: google.protobuf.FieldOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	28, // 38: google.protobuf.OneofOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	28, // 39: google.protobuf.EnumOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	28, // 40: google.protobuf.EnumValueOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	28, // 41: google.protobuf.ServiceOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	8,  // 42: google.protobuf.MethodOptions.idempotency_level:type_name -> google.protobuf.MethodOptions.IdempotencyLevel
-	28, // 43: google.protobuf.MethodOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	35, // 44: google.protobuf.UninterpretedOption.name:type_name -> google.protobuf.UninterpretedOption.NamePart
-	36, // 45: google.protobuf.SourceCodeInfo.location:type_name -> google.protobuf.SourceCodeInfo.Location
-	37, // 46: google.protobuf.GeneratedCodeInfo.annotation:type_name -> google.protobuf.GeneratedCodeInfo.Annotation
-	13, // 47: google.protobuf.DescriptorProto.ExtensionRange.options:type_name -> google.protobuf.ExtensionRangeOptions
-	9,  // 48: google.protobuf.GeneratedCodeInfo.Annotation.semantic:type_name -> google.protobuf.GeneratedCodeInfo.Annotation.Semantic
-	49, // [49:49] is the sub-list for method output_type
-	49, // [49:49] is the sub-list for method input_type
-	49, // [49:49] is the sub-list for extension type_name
-	49, // [49:49] is the sub-list for extension extendee
-	0,  // [0:49] is the sub-list for field type_name
+	18, // 0: google.protobuf.FileDescriptorSet.file:type_name -> google.protobuf.FileDescriptorProto
+	19, // 1: google.protobuf.FileDescriptorProto.message_type:type_name -> google.protobuf.DescriptorProto
+	23, // 2: google.protobuf.FileDescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	25, // 3: google.protobuf.FileDescriptorProto.service:type_name -> google.protobuf.ServiceDescriptorProto
+	21, // 4: google.protobuf.FileDescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	27, // 5: google.protobuf.FileDescriptorProto.options:type_name -> google.protobuf.FileOptions
+	38, // 6: google.protobuf.FileDescriptorProto.source_code_info:type_name -> google.protobuf.SourceCodeInfo
+	0,  // 7: google.protobuf.FileDescriptorProto.edition:type_name -> google.protobuf.Edition
+	21, // 8: google.protobuf.DescriptorProto.field:type_name -> google.protobuf.FieldDescriptorProto
+	21, // 9: google.protobuf.DescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	19, // 10: google.protobuf.DescriptorProto.nested_type:type_name -> google.protobuf.DescriptorProto
+	23, // 11: google.protobuf.DescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	40, // 12: google.protobuf.DescriptorProto.extension_range:type_name -> google.protobuf.DescriptorProto.ExtensionRange
+	22, // 13: google.protobuf.DescriptorProto.oneof_decl:type_name -> google.protobuf.OneofDescriptorProto
+	28, // 14: google.protobuf.DescriptorProto.options:type_name -> google.protobuf.MessageOptions
+	41, // 15: google.protobuf.DescriptorProto.reserved_range:type_name -> google.protobuf.DescriptorProto.ReservedRange
+	35, // 16: google.protobuf.ExtensionRangeOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	42, // 17: google.protobuf.ExtensionRangeOptions.declaration:type_name -> google.protobuf.ExtensionRangeOptions.Declaration
+	36, // 18: google.protobuf.ExtensionRangeOptions.features:type_name -> google.protobuf.FeatureSet
+	1,  // 19: google.protobuf.ExtensionRangeOptions.verification:type_name -> google.protobuf.ExtensionRangeOptions.VerificationState
+	3,  // 20: google.protobuf.FieldDescriptorProto.label:type_name -> google.protobuf.FieldDescriptorProto.Label
+	2,  // 21: google.protobuf.FieldDescriptorProto.type:type_name -> google.protobuf.FieldDescriptorProto.Type
+	29, // 22: google.protobuf.FieldDescriptorProto.options:type_name -> google.protobuf.FieldOptions
+	30, // 23: google.protobuf.OneofDescriptorProto.options:type_name -> google.protobuf.OneofOptions
+	24, // 24: google.protobuf.EnumDescriptorProto.value:type_name -> google.protobuf.EnumValueDescriptorProto
+	31, // 25: google.protobuf.EnumDescriptorProto.options:type_name -> google.protobuf.EnumOptions
+	43, // 26: google.protobuf.EnumDescriptorProto.reserved_range:type_name -> google.protobuf.EnumDescriptorProto.EnumReservedRange
+	32, // 27: google.protobuf.EnumValueDescriptorProto.options:type_name -> google.protobuf.EnumValueOptions
+	26, // 28: google.protobuf.ServiceDescriptorProto.method:type_name -> google.protobuf.MethodDescriptorProto
+	33, // 29: google.protobuf.ServiceDescriptorProto.options:type_name -> google.protobuf.ServiceOptions
+	34, // 30: google.protobuf.MethodDescriptorProto.options:type_name -> google.protobuf.MethodOptions
+	4,  // 31: google.protobuf.FileOptions.optimize_for:type_name -> google.protobuf.FileOptions.OptimizeMode
+	36, // 32: google.protobuf.FileOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 33: google.protobuf.FileOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	36, // 34: google.protobuf.MessageOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 35: google.protobuf.MessageOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	5,  // 36: google.protobuf.FieldOptions.ctype:type_name -> google.protobuf.FieldOptions.CType
+	6,  // 37: google.protobuf.FieldOptions.jstype:type_name -> google.protobuf.FieldOptions.JSType
+	7,  // 38: google.protobuf.FieldOptions.retention:type_name -> google.protobuf.FieldOptions.OptionRetention
+	8,  // 39: google.protobuf.FieldOptions.targets:type_name -> google.protobuf.FieldOptions.OptionTargetType
+	44, // 40: google.protobuf.FieldOptions.edition_defaults:type_name -> google.protobuf.FieldOptions.EditionDefault
+	36, // 41: google.protobuf.FieldOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 42: google.protobuf.FieldOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	36, // 43: google.protobuf.OneofOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 44: google.protobuf.OneofOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	36, // 45: google.protobuf.EnumOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 46: google.protobuf.EnumOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	36, // 47: google.protobuf.EnumValueOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 48: google.protobuf.EnumValueOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	36, // 49: google.protobuf.ServiceOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 50: google.protobuf.ServiceOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	9,  // 51: google.protobuf.MethodOptions.idempotency_level:type_name -> google.protobuf.MethodOptions.IdempotencyLevel
+	36, // 52: google.protobuf.MethodOptions.features:type_name -> google.protobuf.FeatureSet
+	35, // 53: google.protobuf.MethodOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	45, // 54: google.protobuf.UninterpretedOption.name:type_name -> google.protobuf.UninterpretedOption.NamePart
+	10, // 55: google.protobuf.FeatureSet.field_presence:type_name -> google.protobuf.FeatureSet.FieldPresence
+	11, // 56: google.protobuf.FeatureSet.enum_type:type_name -> google.protobuf.FeatureSet.EnumType
+	12, // 57: google.protobuf.FeatureSet.repeated_field_encoding:type_name -> google.protobuf.FeatureSet.RepeatedFieldEncoding
+	13, // 58: google.protobuf.FeatureSet.utf8_validation:type_name -> google.protobuf.FeatureSet.Utf8Validation
+	14, // 59: google.protobuf.FeatureSet.message_encoding:type_name -> google.protobuf.FeatureSet.MessageEncoding
+	15, // 60: google.protobuf.FeatureSet.json_format:type_name -> google.protobuf.FeatureSet.JsonFormat
+	46, // 61: google.protobuf.FeatureSetDefaults.defaults:type_name -> google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault
+	0,  // 62: google.protobuf.FeatureSetDefaults.minimum_edition:type_name -> google.protobuf.Edition
+	0,  // 63: google.protobuf.FeatureSetDefaults.maximum_edition:type_name -> google.protobuf.Edition
+	47, // 64: google.protobuf.SourceCodeInfo.location:type_name -> google.protobuf.SourceCodeInfo.Location
+	48, // 65: google.protobuf.GeneratedCodeInfo.annotation:type_name -> google.protobuf.GeneratedCodeInfo.Annotation
+	20, // 66: google.protobuf.DescriptorProto.ExtensionRange.options:type_name -> google.protobuf.ExtensionRangeOptions
+	0,  // 67: google.protobuf.FieldOptions.EditionDefault.edition:type_name -> google.protobuf.Edition
+	0,  // 68: google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.edition:type_name -> google.protobuf.Edition
+	36, // 69: google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features:type_name -> google.protobuf.FeatureSet
+	16, // 70: google.protobuf.GeneratedCodeInfo.Annotation.semantic:type_name -> google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	71, // [71:71] is the sub-list for method output_type
+	71, // [71:71] is the sub-list for method input_type
+	71, // [71:71] is the sub-list for extension type_name
+	71, // [71:71] is the sub-list for extension extendee
+	0,  // [0:71] is the sub-list for field type_name
 }
 
 func init() { file_google_protobuf_descriptor_proto_init() }
@@ -4475,19 +5476,21 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SourceCodeInfo); i {
+			switch v := v.(*FeatureSet); i {
 			case 0:
 				return &v.state
 			case 1:
 				return &v.sizeCache
 			case 2:
 				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
 			default:
 				return nil
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GeneratedCodeInfo); i {
+			switch v := v.(*FeatureSetDefaults); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4499,7 +5502,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DescriptorProto_ExtensionRange); i {
+			switch v := v.(*SourceCodeInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4511,7 +5514,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DescriptorProto_ReservedRange); i {
+			switch v := v.(*GeneratedCodeInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4523,7 +5526,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExtensionRangeOptions_Declaration); i {
+			switch v := v.(*DescriptorProto_ExtensionRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4535,7 +5538,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
+			switch v := v.(*DescriptorProto_ReservedRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4547,7 +5550,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UninterpretedOption_NamePart); i {
+			switch v := v.(*ExtensionRangeOptions_Declaration); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4559,7 +5562,7 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SourceCodeInfo_Location); i {
+			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4571,6 +5574,54 @@ func file_google_protobuf_descriptor_proto_init() {
 			}
 		}
 		file_google_protobuf_descriptor_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldOptions_EditionDefault); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UninterpretedOption_NamePart); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FeatureSetDefaults_FeatureSetEditionDefault); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceCodeInfo_Location); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GeneratedCodeInfo_Annotation); i {
 			case 0:
 				return &v.state
@@ -4588,8 +5639,8 @@ func file_google_protobuf_descriptor_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_google_protobuf_descriptor_proto_rawDesc,
-			NumEnums:      10,
-			NumMessages:   28,
+			NumEnums:      17,
+			NumMessages:   32,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/google.golang.org/protobuf/types/descriptorpb/ya.make b/vendor/google.golang.org/protobuf/types/descriptorpb/ya.make
index a3372ee0ac0..a96c8d9d3c9 100644
--- a/vendor/google.golang.org/protobuf/types/descriptorpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/descriptorpb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(descriptor.pb.go)
+SRCS(
+    descriptor.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic.go b/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic.go
index f77ef0de153..54ae1ab87d8 100644
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic.go
+++ b/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic.go
@@ -49,12 +49,13 @@ type extensionType struct {
 
 // A Message is a dynamically constructed protocol buffer message.
 //
-// Message implements the proto.Message interface, and may be used with all
-// standard proto package functions such as Marshal, Unmarshal, and so forth.
+// Message implements the [google.golang.org/protobuf/proto.Message] interface,
+// and may be used with all  standard proto package functions
+// such as Marshal, Unmarshal, and so forth.
 //
-// Message also implements the protoreflect.Message interface. See the protoreflect
-// package documentation for that interface for how to get and set fields and
-// otherwise interact with the contents of a Message.
+// Message also implements the [protoreflect.Message] interface.
+// See the [protoreflect] package documentation for that interface for how to
+// get and set fields and otherwise interact with the contents of a Message.
 //
 // Reflection API functions which construct messages, such as NewField,
 // return new dynamic messages of the appropriate type. Functions which take
@@ -87,7 +88,7 @@ func NewMessage(desc protoreflect.MessageDescriptor) *Message {
 // ProtoMessage implements the legacy message interface.
 func (m *Message) ProtoMessage() {}
 
-// ProtoReflect implements the protoreflect.ProtoMessage interface.
+// ProtoReflect implements the [protoreflect.ProtoMessage] interface.
 func (m *Message) ProtoReflect() protoreflect.Message {
 	return m
 }
@@ -115,25 +116,25 @@ func (m *Message) Type() protoreflect.MessageType {
 }
 
 // New returns a newly allocated empty message with the same descriptor.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) New() protoreflect.Message {
 	return m.Type().New()
 }
 
 // Interface returns the message.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Interface() protoreflect.ProtoMessage {
 	return m
 }
 
-// ProtoMethods is an internal detail of the protoreflect.Message interface.
+// ProtoMethods is an internal detail of the [protoreflect.Message] interface.
 // Users should never call this directly.
 func (m *Message) ProtoMethods() *protoiface.Methods {
 	return nil
 }
 
 // Range visits every populated field in undefined order.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
 	for num, v := range m.known {
 		fd := m.ext[num]
@@ -150,7 +151,7 @@ func (m *Message) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value)
 }
 
 // Has reports whether a field is populated.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Has(fd protoreflect.FieldDescriptor) bool {
 	m.checkField(fd)
 	if fd.IsExtension() && m.ext[fd.Number()] != fd {
@@ -164,7 +165,7 @@ func (m *Message) Has(fd protoreflect.FieldDescriptor) bool {
 }
 
 // Clear clears a field.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Clear(fd protoreflect.FieldDescriptor) {
 	m.checkField(fd)
 	num := fd.Number()
@@ -173,7 +174,7 @@ func (m *Message) Clear(fd protoreflect.FieldDescriptor) {
 }
 
 // Get returns the value of a field.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Get(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	m.checkField(fd)
 	num := fd.Number()
@@ -212,7 +213,7 @@ func (m *Message) Get(fd protoreflect.FieldDescriptor) protoreflect.Value {
 }
 
 // Mutable returns a mutable reference to a repeated, map, or message field.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	m.checkField(fd)
 	if !fd.IsMap() && !fd.IsList() && fd.Message() == nil {
@@ -241,7 +242,7 @@ func (m *Message) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 }
 
 // Set stores a value in a field.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) Set(fd protoreflect.FieldDescriptor, v protoreflect.Value) {
 	m.checkField(fd)
 	if m.known == nil {
@@ -284,7 +285,7 @@ func (m *Message) clearOtherOneofFields(fd protoreflect.FieldDescriptor) {
 }
 
 // NewField returns a new value for assignable to the field of a given descriptor.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	m.checkField(fd)
 	switch {
@@ -305,7 +306,7 @@ func (m *Message) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 }
 
 // WhichOneof reports which field in a oneof is populated, returning nil if none are populated.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) WhichOneof(od protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	for i := 0; i < od.Fields().Len(); i++ {
 		fd := od.Fields().Get(i)
@@ -317,13 +318,13 @@ func (m *Message) WhichOneof(od protoreflect.OneofDescriptor) protoreflect.Field
 }
 
 // GetUnknown returns the raw unknown fields.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) GetUnknown() protoreflect.RawFields {
 	return m.unknown
 }
 
 // SetUnknown sets the raw unknown fields.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) SetUnknown(r protoreflect.RawFields) {
 	if m.known == nil {
 		panic(errors.New("%v: modification of read-only message", m.typ.desc.FullName()))
@@ -332,7 +333,7 @@ func (m *Message) SetUnknown(r protoreflect.RawFields) {
 }
 
 // IsValid reports whether the message is valid.
-// See protoreflect.Message for details.
+// See [protoreflect.Message] for details.
 func (m *Message) IsValid() bool {
 	return m.known != nil
 }
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic_test.go b/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic_test.go
deleted file mode 100644
index 99d77d0a809..00000000000
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/dynamic_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dynamicpb_test
-
-import (
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/testing/prototest"
-	"google.golang.org/protobuf/types/dynamicpb"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	test3pb "google.golang.org/protobuf/internal/testprotos/test3"
-)
-
-func TestConformance(t *testing.T) {
-	for _, message := range []proto.Message{
-		(*testpb.TestAllTypes)(nil),
-		(*test3pb.TestAllTypes)(nil),
-		(*testpb.TestAllExtensions)(nil),
-	} {
-		mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor())
-		prototest.Message{}.Test(t, mt)
-	}
-}
-
-func TestDynamicExtensions(t *testing.T) {
-	for _, message := range []proto.Message{
-		(*testpb.TestAllExtensions)(nil),
-	} {
-		mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor())
-		prototest.Message{
-			Resolver: extResolver{},
-		}.Test(t, mt)
-	}
-}
-
-func TestDynamicEnums(t *testing.T) {
-	for _, enum := range []protoreflect.Enum{
-		testpb.TestAllTypes_FOO,
-		test3pb.TestAllTypes_FOO,
-	} {
-		et := dynamicpb.NewEnumType(enum.Descriptor())
-		prototest.Enum{}.Test(t, et)
-	}
-}
-
-type extResolver struct{}
-
-func (extResolver) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
-	xt, err := protoregistry.GlobalTypes.FindExtensionByName(field)
-	if err != nil {
-		return nil, err
-	}
-	return dynamicpb.NewExtensionType(xt.TypeDescriptor().Descriptor()), nil
-}
-
-func (extResolver) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
-	xt, err := protoregistry.GlobalTypes.FindExtensionByNumber(message, field)
-	if err != nil {
-		return nil, err
-	}
-	return dynamicpb.NewExtensionType(xt.TypeDescriptor().Descriptor()), nil
-}
-
-func (extResolver) RangeExtensionsByMessage(message protoreflect.FullName, f func(protoreflect.ExtensionType) bool) {
-	protoregistry.GlobalTypes.RangeExtensionsByMessage(message, func(xt protoreflect.ExtensionType) bool {
-		return f(dynamicpb.NewExtensionType(xt.TypeDescriptor().Descriptor()))
-	})
-}
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/dynamicpb/gotest/ya.make
deleted file mode 100644
index 3cbbcb0e62b..00000000000
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/dynamicpb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/types.go b/vendor/google.golang.org/protobuf/types/dynamicpb/types.go
index 5a8010f18fa..c432817bb9c 100644
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/types.go
+++ b/vendor/google.golang.org/protobuf/types/dynamicpb/types.go
@@ -23,13 +23,20 @@ type extField struct {
 // A Types is a collection of dynamically constructed descriptors.
 // Its methods are safe for concurrent use.
 //
-// Types implements protoregistry.MessageTypeResolver and protoregistry.ExtensionTypeResolver.
-// A Types may be used as a proto.UnmarshalOptions.Resolver.
+// Types implements [protoregistry.MessageTypeResolver] and [protoregistry.ExtensionTypeResolver].
+// A Types may be used as a [google.golang.org/protobuf/proto.UnmarshalOptions.Resolver].
 type Types struct {
+	// atomicExtFiles is used with sync/atomic and hence must be the first word
+	// of the struct to guarantee 64-bit alignment.
+	//
+	// TODO(stapelberg): once we only support Go 1.19 and newer, switch this
+	// field to be of type atomic.Uint64 to guarantee alignment on
+	// stack-allocated values, too.
+	atomicExtFiles uint64
+	extMu          sync.Mutex
+
 	files *protoregistry.Files
 
-	extMu               sync.Mutex
-	atomicExtFiles      uint64
 	extensionsByMessage map[extField]protoreflect.ExtensionDescriptor
 }
 
@@ -45,7 +52,7 @@ func NewTypes(f *protoregistry.Files) *Types {
 // FindEnumByName looks up an enum by its full name;
 // e.g., "google.protobuf.Field.Kind".
 //
-// This returns (nil, protoregistry.NotFound) if not found.
+// This returns (nil, [protoregistry.NotFound]) if not found.
 func (t *Types) FindEnumByName(name protoreflect.FullName) (protoreflect.EnumType, error) {
 	d, err := t.files.FindDescriptorByName(name)
 	if err != nil {
@@ -63,7 +70,7 @@ func (t *Types) FindEnumByName(name protoreflect.FullName) (protoreflect.EnumTyp
 // where the extension is declared and is unrelated to the full name of the
 // message being extended.
 //
-// This returns (nil, protoregistry.NotFound) if not found.
+// This returns (nil, [protoregistry.NotFound]) if not found.
 func (t *Types) FindExtensionByName(name protoreflect.FullName) (protoreflect.ExtensionType, error) {
 	d, err := t.files.FindDescriptorByName(name)
 	if err != nil {
@@ -79,7 +86,7 @@ func (t *Types) FindExtensionByName(name protoreflect.FullName) (protoreflect.Ex
 // FindExtensionByNumber looks up an extension field by the field number
 // within some parent message, identified by full name.
 //
-// This returns (nil, protoregistry.NotFound) if not found.
+// This returns (nil, [protoregistry.NotFound]) if not found.
 func (t *Types) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
 	// Construct the extension number map lazily, since not every user will need it.
 	// Update the map if new files are added to the registry.
@@ -96,7 +103,7 @@ func (t *Types) FindExtensionByNumber(message protoreflect.FullName, field proto
 // FindMessageByName looks up a message by its full name;
 // e.g. "google.protobuf.Any".
 //
-// This returns (nil, protoregistry.NotFound) if not found.
+// This returns (nil, [protoregistry.NotFound]) if not found.
 func (t *Types) FindMessageByName(name protoreflect.FullName) (protoreflect.MessageType, error) {
 	d, err := t.files.FindDescriptorByName(name)
 	if err != nil {
@@ -112,7 +119,7 @@ func (t *Types) FindMessageByName(name protoreflect.FullName) (protoreflect.Mess
 // FindMessageByURL looks up a message by a URL identifier.
 // See documentation on google.protobuf.Any.type_url for the URL format.
 //
-// This returns (nil, protoregistry.NotFound) if not found.
+// This returns (nil, [protoregistry.NotFound]) if not found.
 func (t *Types) FindMessageByURL(url string) (protoreflect.MessageType, error) {
 	// This function is similar to FindMessageByName but
 	// truncates anything before and including '/' in the URL.
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/types_test.go b/vendor/google.golang.org/protobuf/types/dynamicpb/types_test.go
deleted file mode 100644
index 1878f794437..00000000000
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/types_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2023 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dynamicpb_test
-
-import (
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/types/descriptorpb"
-	"google.golang.org/protobuf/types/dynamicpb"
-
-	registrypb "google.golang.org/protobuf/internal/testprotos/registry"
-)
-
-var _ protoregistry.ExtensionTypeResolver = &dynamicpb.Types{}
-var _ protoregistry.MessageTypeResolver = &dynamicpb.Types{}
-
-func newTestTypes() *dynamicpb.Types {
-	files := &protoregistry.Files{}
-	files.RegisterFile(registrypb.File_internal_testprotos_registry_test_proto)
-	return dynamicpb.NewTypes(files)
-}
-
-func TestDynamicTypesTypeMismatch(t *testing.T) {
-	types := newTestTypes()
-	const messageName = "testprotos.Message1"
-	const enumName = "testprotos.Enum1"
-
-	_, err := types.FindEnumByName(messageName)
-	want := "found wrong type: got message, want enum"
-	if err == nil || !strings.Contains(err.Error(), want) {
-		t.Errorf("types.FindEnumByName(%q) = _, %q, want %q", messageName, err, want)
-	}
-
-	_, err = types.FindMessageByName(enumName)
-	want = "found wrong type: got enum, want message"
-	if err == nil || !strings.Contains(err.Error(), want) {
-		t.Errorf("types.FindMessageByName(%q) = _, %q, want %q", messageName, err, want)
-	}
-
-	_, err = types.FindExtensionByName(enumName)
-	want = "found wrong type: got enum, want extension"
-	if err == nil || !strings.Contains(err.Error(), want) {
-		t.Errorf("types.FindExtensionByName(%q) = _, %q, want %q", messageName, err, want)
-	}
-}
-
-func TestDynamicTypesEnumNotFound(t *testing.T) {
-	types := newTestTypes()
-	for _, name := range []protoreflect.FullName{
-		"Enum1",
-		"testprotos.DoesNotExist",
-	} {
-		_, err := types.FindEnumByName(name)
-		if err != protoregistry.NotFound {
-			t.Errorf("types.FindEnumByName(%q) = _, %v; want protoregistry.NotFound", name, err)
-		}
-	}
-}
-
-func TestDynamicTypesFindEnumByName(t *testing.T) {
-	types := newTestTypes()
-	name := protoreflect.FullName("testprotos.Enum1")
-	et, err := types.FindEnumByName(name)
-	if err != nil {
-		t.Fatalf("types.FindEnumByName(%q) = %v", name, err)
-	}
-	if got, want := et.Descriptor().FullName(), name; got != want {
-		t.Fatalf("types.FindEnumByName(%q).Descriptor().FullName() = %q, want %q", name, got, want)
-	}
-}
-
-func TestDynamicTypesMessageNotFound(t *testing.T) {
-	types := newTestTypes()
-	for _, name := range []protoreflect.FullName{
-		"Message1",
-		"testprotos.DoesNotExist",
-	} {
-		_, err := types.FindMessageByName(name)
-		if err != protoregistry.NotFound {
-			t.Errorf("types.FindMessageByName(%q) = _, %v; want protoregistry.NotFound", name, err)
-		}
-	}
-}
-
-func TestDynamicTypesFindMessageByName(t *testing.T) {
-	types := newTestTypes()
-	name := protoreflect.FullName("testprotos.Message1")
-	mt, err := types.FindMessageByName(name)
-	if err != nil {
-		t.Fatalf("types.FindMessageByName(%q) = %v", name, err)
-	}
-	if got, want := mt.Descriptor().FullName(), name; got != want {
-		t.Fatalf("types.FindMessageByName(%q).Descriptor().FullName() = %q, want %q", name, got, want)
-	}
-}
-
-func TestDynamicTypesExtensionNotFound(t *testing.T) {
-	types := newTestTypes()
-	for _, name := range []protoreflect.FullName{
-		"string_field",
-		"testprotos.DoesNotExist",
-	} {
-		_, err := types.FindExtensionByName(name)
-		if err != protoregistry.NotFound {
-			t.Errorf("types.FindExtensionByName(%q) = _, %v; want protoregistry.NotFound", name, err)
-		}
-	}
-	messageName := protoreflect.FullName("testprotos.Message1")
-	if _, err := types.FindExtensionByNumber(messageName, 100); err != protoregistry.NotFound {
-		t.Errorf("types.FindExtensionByNumber(%q, 100) = _, %v; want protoregistry.NotFound", messageName, 100)
-	}
-}
-
-func TestDynamicTypesFindExtensionByNameOrNumber(t *testing.T) {
-	types := newTestTypes()
-	messageName := protoreflect.FullName("testprotos.Message1")
-	mt, err := types.FindMessageByName(messageName)
-	if err != nil {
-		t.Fatalf("types.FindMessageByName(%q) = %v", messageName, err)
-	}
-	for _, extensionName := range []protoreflect.FullName{
-		"testprotos.string_field",
-		"testprotos.Message4.message_field",
-	} {
-		xt, err := types.FindExtensionByName(extensionName)
-		if err != nil {
-			t.Fatalf("types.FindExtensionByName(%q) = %v", extensionName, err)
-		}
-		if got, want := xt.TypeDescriptor().FullName(), extensionName; got != want {
-			t.Fatalf("types.FindExtensionByName(%q).TypeDescriptor().FullName() = %q, want %q", extensionName, got, want)
-		}
-		if got, want := xt.TypeDescriptor().ContainingMessage(), mt.Descriptor(); got != want {
-			t.Fatalf("xt.TypeDescriptor().ContainingMessage() = %q, want %q", got.FullName(), want.FullName())
-		}
-		number := xt.TypeDescriptor().Number()
-		xt2, err := types.FindExtensionByNumber(messageName, number)
-		if err != nil {
-			t.Fatalf("types.FindExtensionByNumber(%q, %v) = %v", messageName, number, err)
-		}
-		if xt != xt2 {
-			t.Fatalf("FindExtensionByName returned a differet extension than FindExtensionByNumber")
-		}
-	}
-}
-
-func TestDynamicTypesFilesChangeAfterCreation(t *testing.T) {
-	files := &protoregistry.Files{}
-	files.RegisterFile(descriptorpb.File_google_protobuf_descriptor_proto)
-	types := dynamicpb.NewTypes(files)
-
-	// Not found: Files registry does not contain this file.
-	const message = "testprotos.Message1"
-	const number = 11
-	if _, err := types.FindMessageByName(message); err != protoregistry.NotFound {
-		t.Errorf("types.FindMessageByName(%q) = %v, want protoregistry.NotFound", message, err)
-	}
-	if _, err := types.FindExtensionByNumber(message, number); err != protoregistry.NotFound {
-		t.Errorf("types.FindExtensionByNumber(%q, %v) = %v, want protoregistry.NotFound", message, number, err)
-	}
-
-	// Found: Add the file to the registry and recheck.
-	files.RegisterFile(registrypb.File_internal_testprotos_registry_test_proto)
-	if _, err := types.FindMessageByName(message); err != nil {
-		t.Errorf("types.FindMessageByName(%q) = %v, want nil", message, err)
-	}
-	if _, err := types.FindExtensionByNumber(message, number); err != nil {
-		t.Errorf("types.FindExtensionByNumber(%q, %v) = %v, want nil", message, number, err)
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/types/dynamicpb/ya.make b/vendor/google.golang.org/protobuf/types/dynamicpb/ya.make
index b18fd023689..ecab55dc87c 100644
--- a/vendor/google.golang.org/protobuf/types/dynamicpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/dynamicpb/ya.make
@@ -7,11 +7,4 @@ SRCS(
     types.go
 )
 
-GO_XTEST_SRCS(
-    dynamic_test.go
-    types_test.go
-)
-
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/anypb/any.pb.go b/vendor/google.golang.org/protobuf/types/known/anypb/any.pb.go
index 580b232f477..9de51be5403 100644
--- a/vendor/google.golang.org/protobuf/types/known/anypb/any.pb.go
+++ b/vendor/google.golang.org/protobuf/types/known/anypb/any.pb.go
@@ -237,7 +237,8 @@ type Any struct {
 	//
 	// Note: this functionality is not currently available in the official
 	// protobuf release, and it is not used for type URLs beginning with
-	// type.googleapis.com.
+	// type.googleapis.com. As of May 2023, there are no widely used type server
+	// implementations and no plans to implement one.
 	//
 	// Schemes other than `http`, `https` (or the empty scheme) might be
 	// used with implementation specific semantics.
diff --git a/vendor/google.golang.org/protobuf/types/known/anypb/any_test.go b/vendor/google.golang.org/protobuf/types/known/anypb/any_test.go
deleted file mode 100644
index 68e6391cf7e..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/anypb/any_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package anypb_test
-
-import (
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	apb "google.golang.org/protobuf/types/known/anypb"
-	epb "google.golang.org/protobuf/types/known/emptypb"
-	wpb "google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func mustMarshal(m proto.Message) []byte {
-	b, err := proto.MarshalOptions{AllowPartial: true, Deterministic: true}.Marshal(m)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestMessage(t *testing.T) {
-	tests := []struct {
-		inAny    *apb.Any
-		inTarget proto.Message
-		wantIs   bool
-		wantName protoreflect.FullName
-	}{{
-		inAny:    nil,
-		inTarget: nil,
-		wantIs:   false,
-		wantName: "",
-	}, {
-		inAny:    new(apb.Any),
-		inTarget: nil,
-		wantIs:   false,
-		wantName: "",
-	}, {
-		inAny:    new(apb.Any),
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "foo"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "foo",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "foo$"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "/foo"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "foo",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "/bar/foo"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "foo",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "google.golang.org/bar/foo"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "foo",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "goproto.proto.test.TestAllTypes"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   true,
-		wantName: "goproto.proto.test.TestAllTypes",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "goproto.proto.test.TestAllTypes$"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   false,
-		wantName: "",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "/goproto.proto.test.TestAllTypes"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   true,
-		wantName: "goproto.proto.test.TestAllTypes",
-	}, {
-		inAny:    &apb.Any{TypeUrl: "google.golang.org/foo/goproto.proto.test.TestAllTypes"},
-		inTarget: (*testpb.TestAllTypes)(nil),
-		wantIs:   true,
-		wantName: "goproto.proto.test.TestAllTypes",
-	}}
-
-	for _, tt := range tests {
-		gotIs := tt.inAny.MessageIs(tt.inTarget)
-		if gotIs != tt.wantIs {
-			t.Errorf("MessageIs(%v, %v) = %v, want %v", tt.inAny, tt.inTarget, gotIs, tt.wantIs)
-		}
-		gotName := tt.inAny.MessageName()
-		if gotName != tt.wantName {
-			t.Errorf("MessageName(%v) = %v, want %v", tt.inAny, gotName, tt.wantName)
-		}
-	}
-}
-
-func TestRoundtrip(t *testing.T) {
-	tests := []struct {
-		msg proto.Message
-		any *apb.Any
-	}{{
-		msg: &testpb.TestAllTypes{},
-		any: &apb.Any{
-			TypeUrl: "type.googleapis.com/goproto.proto.test.TestAllTypes",
-		},
-	}, {
-		msg: &testpb.TestAllTypes{
-			OptionalString: proto.String("hello, world!"),
-		},
-		any: &apb.Any{
-			TypeUrl: "type.googleapis.com/goproto.proto.test.TestAllTypes",
-			Value: mustMarshal(&testpb.TestAllTypes{
-				OptionalString: proto.String("hello, world!"),
-			}),
-		},
-	}, {
-		msg: &wpb.StringValue{Value: ""},
-		any: &apb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.StringValue",
-		},
-	}, {
-		msg: wpb.String("hello, world"),
-		any: &apb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.StringValue",
-			Value:   mustMarshal(wpb.String("hello, world")),
-		},
-	}, {
-		msg: &apb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.StringValue",
-			Value:   mustMarshal(wpb.String("hello, world")),
-		},
-		any: &apb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.Any",
-			Value: mustMarshal(&apb.Any{
-				TypeUrl: "type.googleapis.com/google.protobuf.StringValue",
-				Value:   mustMarshal(wpb.String("hello, world")),
-			}),
-		},
-	}}
-
-	for _, tt := range tests {
-		// Unmarshal to the wrong message type.
-		var empty epb.Empty
-		if err := tt.any.UnmarshalTo(&empty); err == nil {
-			t.Errorf("UnmarshalTo(empty) = nil, want non-nil")
-		}
-
-		gotAny := new(apb.Any)
-		if err := gotAny.MarshalFrom(tt.msg); err != nil {
-			t.Errorf("MarshalFrom() error: %v", err)
-		}
-		if diff := cmp.Diff(tt.any, gotAny, protocmp.Transform()); diff != "" {
-			t.Errorf("MarshalFrom() output mismatch (-want +got):\n%s", diff)
-		}
-
-		gotPB := tt.msg.ProtoReflect().New().Interface()
-		if err := tt.any.UnmarshalTo(gotPB); err != nil {
-			t.Errorf("UnmarshalTo() error: %v", err)
-		}
-		if diff := cmp.Diff(tt.msg, gotPB, protocmp.Transform()); diff != "" {
-			t.Errorf("UnmarshalTo() output mismatch (-want +got):\n%s", diff)
-		}
-
-		gotPB, err := tt.any.UnmarshalNew()
-		if err != nil {
-			t.Errorf("UnmarshalNew() error: %v", err)
-		}
-		if diff := cmp.Diff(tt.msg, gotPB, protocmp.Transform()); diff != "" {
-			t.Errorf("UnmarshalNew() output mismatch (-want +got):\n%s", diff)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/types/known/anypb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/known/anypb/gotest/ya.make
deleted file mode 100644
index de0d09b9d4e..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/anypb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/known/anypb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/known/anypb/ya.make b/vendor/google.golang.org/protobuf/types/known/anypb/ya.make
index ebf72e63f74..3131b76dff2 100644
--- a/vendor/google.golang.org/protobuf/types/known/anypb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/anypb/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(any.pb.go)
-
-GO_XTEST_SRCS(any_test.go)
+SRCS(
+    any.pb.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/apipb/ya.make b/vendor/google.golang.org/protobuf/types/known/apipb/ya.make
index 65289b517d7..80955cac9e5 100644
--- a/vendor/google.golang.org/protobuf/types/known/apipb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/apipb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(api.pb.go)
+SRCS(
+    api.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/known/durationpb/duration_test.go b/vendor/google.golang.org/protobuf/types/known/durationpb/duration_test.go
deleted file mode 100644
index 0e86eb122ba..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/durationpb/duration_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package durationpb_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	durpb "google.golang.org/protobuf/types/known/durationpb"
-)
-
-func init() {
-	detrand.Disable()
-}
-
-const (
-	minGoSeconds = math.MinInt64 / int64(1e9)
-	maxGoSeconds = math.MaxInt64 / int64(1e9)
-	absSeconds   = 315576000000 // 10000yr * 365.25day/yr * 24hr/day * 60min/hr * 60sec/min
-)
-
-func TestToDuration(t *testing.T) {
-	tests := []struct {
-		in   time.Duration
-		want *durpb.Duration
-	}{
-		{in: time.Duration(0), want: &durpb.Duration{Seconds: 0, Nanos: 0}},
-		{in: -time.Second, want: &durpb.Duration{Seconds: -1, Nanos: 0}},
-		{in: +time.Second, want: &durpb.Duration{Seconds: +1, Nanos: 0}},
-		{in: -time.Second - time.Millisecond, want: &durpb.Duration{Seconds: -1, Nanos: -1e6}},
-		{in: +time.Second + time.Millisecond, want: &durpb.Duration{Seconds: +1, Nanos: +1e6}},
-		{in: time.Duration(math.MinInt64), want: &durpb.Duration{Seconds: minGoSeconds, Nanos: int32(math.MinInt64 - 1e9*minGoSeconds)}},
-		{in: time.Duration(math.MaxInt64), want: &durpb.Duration{Seconds: maxGoSeconds, Nanos: int32(math.MaxInt64 - 1e9*maxGoSeconds)}},
-	}
-
-	for _, tt := range tests {
-		got := durpb.New(tt.in)
-		if diff := cmp.Diff(tt.want, got, protocmp.Transform()); diff != "" {
-			t.Errorf("New(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestFromDuration(t *testing.T) {
-	tests := []struct {
-		in      *durpb.Duration
-		wantDur time.Duration
-		wantErr error
-	}{
-		{in: nil, wantDur: time.Duration(0), wantErr: textError("invalid nil Duration")},
-		{in: new(durpb.Duration), wantDur: time.Duration(0)},
-		{in: &durpb.Duration{Seconds: -1, Nanos: 0}, wantDur: -time.Second},
-		{in: &durpb.Duration{Seconds: +1, Nanos: 0}, wantDur: +time.Second},
-		{in: &durpb.Duration{Seconds: 0, Nanos: -1}, wantDur: -time.Nanosecond},
-		{in: &durpb.Duration{Seconds: 0, Nanos: +1}, wantDur: +time.Nanosecond},
-		{in: &durpb.Duration{Seconds: -100, Nanos: 0}, wantDur: -100 * time.Second},
-		{in: &durpb.Duration{Seconds: +100, Nanos: 0}, wantDur: +100 * time.Second},
-		{in: &durpb.Duration{Seconds: -100, Nanos: -987}, wantDur: -100*time.Second - 987*time.Nanosecond},
-		{in: &durpb.Duration{Seconds: +100, Nanos: +987}, wantDur: +100*time.Second + 987*time.Nanosecond},
-		{in: &durpb.Duration{Seconds: minGoSeconds, Nanos: int32(math.MinInt64 - 1e9*minGoSeconds)}, wantDur: time.Duration(math.MinInt64)},
-		{in: &durpb.Duration{Seconds: maxGoSeconds, Nanos: int32(math.MaxInt64 - 1e9*maxGoSeconds)}, wantDur: time.Duration(math.MaxInt64)},
-		{in: &durpb.Duration{Seconds: minGoSeconds - 1, Nanos: int32(math.MinInt64 - 1e9*minGoSeconds)}, wantDur: time.Duration(math.MinInt64)},
-		{in: &durpb.Duration{Seconds: maxGoSeconds + 1, Nanos: int32(math.MaxInt64 - 1e9*maxGoSeconds)}, wantDur: time.Duration(math.MaxInt64)},
-		{in: &durpb.Duration{Seconds: minGoSeconds, Nanos: int32(math.MinInt64-1e9*minGoSeconds) - 1}, wantDur: time.Duration(math.MinInt64)},
-		{in: &durpb.Duration{Seconds: maxGoSeconds, Nanos: int32(math.MaxInt64-1e9*maxGoSeconds) + 1}, wantDur: time.Duration(math.MaxInt64)},
-		{in: &durpb.Duration{Seconds: -123, Nanos: +456}, wantDur: -123*time.Second + 456*time.Nanosecond, wantErr: textError("duration (seconds:-123 nanos:456) has seconds and nanos with different signs")},
-		{in: &durpb.Duration{Seconds: +123, Nanos: -456}, wantDur: +123*time.Second - 456*time.Nanosecond, wantErr: textError("duration (seconds:123 nanos:-456) has seconds and nanos with different signs")},
-		{in: &durpb.Duration{Seconds: math.MinInt64}, wantDur: time.Duration(math.MinInt64), wantErr: textError("duration (seconds:-9223372036854775808) exceeds -10000 years")},
-		{in: &durpb.Duration{Seconds: math.MaxInt64}, wantDur: time.Duration(math.MaxInt64), wantErr: textError("duration (seconds:9223372036854775807) exceeds +10000 years")},
-		{in: &durpb.Duration{Seconds: -absSeconds, Nanos: -(1e9 - 1)}, wantDur: time.Duration(math.MinInt64)},
-		{in: &durpb.Duration{Seconds: +absSeconds, Nanos: +(1e9 - 1)}, wantDur: time.Duration(math.MaxInt64)},
-		{in: &durpb.Duration{Seconds: -absSeconds - 1, Nanos: 0}, wantDur: time.Duration(math.MinInt64), wantErr: textError("duration (seconds:-315576000001) exceeds -10000 years")},
-		{in: &durpb.Duration{Seconds: +absSeconds + 1, Nanos: 0}, wantDur: time.Duration(math.MaxInt64), wantErr: textError("duration (seconds:315576000001) exceeds +10000 years")},
-	}
-
-	for _, tt := range tests {
-		gotDur := tt.in.AsDuration()
-		if diff := cmp.Diff(tt.wantDur, gotDur); diff != "" {
-			t.Errorf("AsDuration(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		gotErr := tt.in.CheckValid()
-		if diff := cmp.Diff(tt.wantErr, gotErr, cmpopts.EquateErrors()); diff != "" {
-			t.Errorf("CheckValid(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-type textError string
-
-func (e textError) Error() string     { return string(e) }
-func (e textError) Is(err error) bool { return err != nil && strings.Contains(err.Error(), e.Error()) }
diff --git a/vendor/google.golang.org/protobuf/types/known/durationpb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/known/durationpb/gotest/ya.make
deleted file mode 100644
index 43d69e2405b..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/durationpb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/known/durationpb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/known/durationpb/ya.make b/vendor/google.golang.org/protobuf/types/known/durationpb/ya.make
index 7ffe306ca24..daf68e86d17 100644
--- a/vendor/google.golang.org/protobuf/types/known/durationpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/durationpb/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(duration.pb.go)
-
-GO_XTEST_SRCS(duration_test.go)
+SRCS(
+    duration.pb.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/emptypb/ya.make b/vendor/google.golang.org/protobuf/types/known/emptypb/ya.make
index db818008b65..8840533fcab 100644
--- a/vendor/google.golang.org/protobuf/types/known/emptypb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/emptypb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(empty.pb.go)
+SRCS(
+    empty.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/field_mask_test.go b/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/field_mask_test.go
deleted file mode 100644
index 19756c509a8..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/field_mask_test.go
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fieldmaskpb_test
-
-import (
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"google.golang.org/protobuf/proto"
-
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
-	fmpb "google.golang.org/protobuf/types/known/fieldmaskpb"
-)
-
-func TestAppend(t *testing.T) {
-	tests := []struct {
-		inMessage proto.Message
-		inPaths   []string
-		wantPaths []string
-		wantError error
-	}{{
-		inMessage: (*fmpb.FieldMask)(nil),
-		inPaths:   []string{},
-		wantPaths: []string{},
-	}, {
-		inMessage: (*fmpb.FieldMask)(nil),
-		inPaths:   []string{"paths", "paths"},
-		wantPaths: []string{"paths", "paths"},
-	}, {
-		inMessage: (*fmpb.FieldMask)(nil),
-		inPaths:   []string{"paths", "<INVALID>", "paths"},
-		wantPaths: []string{"paths"},
-		wantError: cmpopts.AnyError,
-	}, {
-		inMessage: (*testpb.TestAllTypes)(nil),
-		inPaths:   []string{"optional_int32", "OptionalGroup.optional_nested_message", "map_uint32_uint32", "map_string_nested_message.corecursive", "oneof_bool"},
-		wantPaths: []string{"optional_int32", "OptionalGroup.optional_nested_message", "map_uint32_uint32"},
-		wantError: cmpopts.AnyError,
-	}, {
-		inMessage: (*testpb.TestAllTypes)(nil),
-		inPaths:   []string{"optional_nested_message", "optional_nested_message.corecursive", "optional_nested_message.corecursive.optional_nested_message", "optional_nested_message.corecursive.optional_nested_message.corecursive"},
-		wantPaths: []string{"optional_nested_message", "optional_nested_message.corecursive", "optional_nested_message.corecursive.optional_nested_message", "optional_nested_message.corecursive.optional_nested_message.corecursive"},
-	}, {
-		inMessage: (*testpb.TestAllTypes)(nil),
-		inPaths:   []string{"optional_int32", "optional_nested_message.corecursive.optional_int64", "optional_nested_message.corecursive.<INVALID>", "optional_int64"},
-		wantPaths: []string{"optional_int32", "optional_nested_message.corecursive.optional_int64"},
-		wantError: cmpopts.AnyError,
-	}, {
-		inMessage: (*testpb.TestAllTypes)(nil),
-		inPaths:   []string{"optional_int32", "optional_nested_message.corecursive.oneof_uint32", "optional_nested_message.oneof_field", "optional_int64"},
-		wantPaths: []string{"optional_int32", "optional_nested_message.corecursive.oneof_uint32"},
-		wantError: cmpopts.AnyError,
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			var mask fmpb.FieldMask
-			gotError := mask.Append(tt.inMessage, tt.inPaths...)
-			gotPaths := mask.GetPaths()
-			if diff := cmp.Diff(tt.wantPaths, gotPaths, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Append() paths mismatch (-want +got):\n%s", diff)
-			}
-			if diff := cmp.Diff(tt.wantError, gotError, cmpopts.EquateErrors()); diff != "" {
-				t.Errorf("Append() error mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestCombine(t *testing.T) {
-	tests := []struct {
-		in            [][]string
-		wantUnion     []string
-		wantIntersect []string
-	}{{
-		in: [][]string{
-			{},
-			{},
-		},
-		wantUnion:     []string{},
-		wantIntersect: []string{},
-	}, {
-		in: [][]string{
-			{"a"},
-			{},
-		},
-		wantUnion:     []string{"a"},
-		wantIntersect: []string{},
-	}, {
-		in: [][]string{
-			{"a"},
-			{"a"},
-		},
-		wantUnion:     []string{"a"},
-		wantIntersect: []string{"a"},
-	}, {
-		in: [][]string{
-			{"a"},
-			{"b"},
-			{"c"},
-		},
-		wantUnion:     []string{"a", "b", "c"},
-		wantIntersect: []string{},
-	}, {
-		in: [][]string{
-			{"a", "b"},
-			{"b.b"},
-			{"b"},
-			{"b", "a.A"},
-			{"b", "c", "c.a", "c.b"},
-		},
-		wantUnion:     []string{"a", "b", "c"},
-		wantIntersect: []string{"b.b"},
-	}, {
-		in: [][]string{
-			{"a.b", "a.c.d"},
-			{"a"},
-		},
-		wantUnion:     []string{"a"},
-		wantIntersect: []string{"a.b", "a.c.d"},
-	}, {
-		in: [][]string{
-			{},
-			{"a.b", "a.c", "d"},
-		},
-		wantUnion:     []string{"a.b", "a.c", "d"},
-		wantIntersect: []string{},
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			var masks []*fmpb.FieldMask
-			for _, paths := range tt.in {
-				masks = append(masks, &fmpb.FieldMask{Paths: paths})
-			}
-
-			union := fmpb.Union(masks[0], masks[1], masks[2:]...)
-			gotUnion := union.GetPaths()
-			if diff := cmp.Diff(tt.wantUnion, gotUnion, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Union() mismatch (-want +got):\n%s", diff)
-			}
-
-			intersect := fmpb.Intersect(masks[0], masks[1], masks[2:]...)
-			gotIntersect := intersect.GetPaths()
-			if diff := cmp.Diff(tt.wantIntersect, gotIntersect, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Intersect() mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestNormalize(t *testing.T) {
-	tests := []struct {
-		in   []string
-		want []string
-	}{{
-		in:   []string{},
-		want: []string{},
-	}, {
-		in:   []string{"a"},
-		want: []string{"a"},
-	}, {
-		in:   []string{"foo", "foo.bar", "foo.baz"},
-		want: []string{"foo"},
-	}, {
-		in:   []string{"foo.bar", "foo.baz"},
-		want: []string{"foo.bar", "foo.baz"},
-	}, {
-		in:   []string{"", "a.", ".b", "a.b", ".", "", "a.", ".b", "a.b", "."},
-		want: []string{"", "a.", "a.b"},
-	}, {
-		in:   []string{"e.a", "e.b", "e.c", "e.d", "e.f", "e.g", "e.b.a", "e$c", "e.b.c"},
-		want: []string{"e.a", "e.b", "e.c", "e.d", "e.f", "e.g", "e$c"},
-	}, {
-		in:   []string{"a", "aa", "aaa", "a$", "AAA", "aA.a", "a.a", "a", "aa", "aaa", "a$", "AAA", "aA.a"},
-		want: []string{"AAA", "a", "aA.a", "aa", "aaa", "a$"},
-	}, {
-		in:   []string{"a.b", "aa.bb.cc", ".", "a$b", "aa", "a.", "a", "b.c.d", ".a", "", "a$", "a$", "a.b", "a", "a.bb", ""},
-		want: []string{"", "a", "aa", "a$", "a$b", "b.c.d"},
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			mask := &fmpb.FieldMask{
-				Paths: append([]string(nil), tt.in...),
-			}
-			mask.Normalize()
-			got := mask.GetPaths()
-			if diff := cmp.Diff(tt.want, got, cmpopts.EquateEmpty()); diff != "" {
-				t.Errorf("Normalize() mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestIsValid(t *testing.T) {
-	tests := []struct {
-		message proto.Message
-		paths   []string
-		want    bool
-	}{{
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{"no_such_field"},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{""},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths: []string{
-			"optional_int32",
-			"optional_int32",
-			"optional_int64",
-			"optional_uint32",
-			"optional_uint64",
-			"optional_sint32",
-			"optional_sint64",
-			"optional_fixed32",
-			"optional_fixed64",
-			"optional_sfixed32",
-			"optional_sfixed64",
-			"optional_float",
-			"optional_double",
-			"optional_bool",
-			"optional_string",
-			"optional_bytes",
-			"OptionalGroup",
-			"optional_nested_message",
-			"optional_foreign_message",
-			"optional_import_message",
-			"optional_nested_enum",
-			"optional_foreign_enum",
-			"optional_import_enum",
-			"repeated_int32",
-			"repeated_int64",
-			"repeated_uint32",
-			"repeated_uint64",
-			"repeated_sint32",
-			"repeated_sint64",
-			"repeated_fixed32",
-			"repeated_fixed64",
-			"repeated_sfixed32",
-			"repeated_sfixed64",
-			"repeated_float",
-			"repeated_double",
-			"repeated_bool",
-			"repeated_string",
-			"repeated_bytes",
-			"RepeatedGroup",
-			"repeated_nested_message",
-			"repeated_foreign_message",
-			"repeated_importmessage",
-			"repeated_nested_enum",
-			"repeated_foreign_enum",
-			"repeated_importenum",
-			"map_int32_int32",
-			"map_int64_int64",
-			"map_uint32_uint32",
-			"map_uint64_uint64",
-			"map_sint32_sint32",
-			"map_sint64_sint64",
-			"map_fixed32_fixed32",
-			"map_fixed64_fixed64",
-			"map_sfixed32_sfixed32",
-			"map_sfixed64_sfixed64",
-			"map_int32_float",
-			"map_int32_double",
-			"map_bool_bool",
-			"map_string_string",
-			"map_string_bytes",
-			"map_string_nested_message",
-			"map_string_nested_enum",
-			"oneof_uint32",
-			"oneof_nested_message",
-			"oneof_string",
-			"oneof_bytes",
-			"oneof_bool",
-			"oneof_uint64",
-			"oneof_float",
-			"oneof_double",
-			"oneof_enum",
-			"OneofGroup",
-		},
-		want: true,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths: []string{
-			"optional_nested_message.a",
-			"optional_nested_message.corecursive",
-			"optional_nested_message.corecursive.optional_int32",
-			"optional_nested_message.corecursive.optional_nested_message.corecursive.optional_nested_message.a",
-			"OptionalGroup.a",
-			"OptionalGroup.optional_nested_message",
-			"OptionalGroup.optional_nested_message.corecursive",
-			"oneof_nested_message.a",
-			"oneof_nested_message.corecursive",
-		},
-		want: true,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{"repeated_nested_message.a"},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{"repeated_nested_message[0]"},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{"repeated_nested_message[0].a"},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{"map_string_nested_message.a"},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllTypes)(nil),
-		paths:   []string{`map_string_nested_message["key"]`},
-		want:    false,
-	}, {
-		message: (*testpb.TestAllExtensions)(nil),
-		paths:   []string{"nested_string_extension"},
-		want:    false,
-	}}
-
-	for _, tt := range tests {
-		t.Run("", func(t *testing.T) {
-			mask := &fmpb.FieldMask{Paths: tt.paths}
-			got := mask.IsValid(tt.message)
-			if got != tt.want {
-				t.Errorf("IsValid() returns %v want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/gotest/ya.make
deleted file mode 100644
index ce2fea2f3bb..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/known/fieldmaskpb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/ya.make b/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/ya.make
index 757c73d505e..70645c75313 100644
--- a/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(field_mask.pb.go)
-
-GO_XTEST_SRCS(field_mask_test.go)
+SRCS(
+    field_mask.pb.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/sourcecontextpb/ya.make b/vendor/google.golang.org/protobuf/types/known/sourcecontextpb/ya.make
index 30efab6845c..dd030d80791 100644
--- a/vendor/google.golang.org/protobuf/types/known/sourcecontextpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/sourcecontextpb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(source_context.pb.go)
+SRCS(
+    source_context.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/known/structpb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/known/structpb/gotest/ya.make
deleted file mode 100644
index 9e8f6b5f175..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/structpb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/known/structpb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/known/structpb/struct_test.go b/vendor/google.golang.org/protobuf/types/known/structpb/struct_test.go
deleted file mode 100644
index 643f740229e..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/structpb/struct_test.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package structpb_test
-
-import (
-	"encoding/json"
-	"math"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	spb "google.golang.org/protobuf/types/known/structpb"
-)
-
-var equateJSON = cmpopts.AcyclicTransformer("UnmarshalJSON", func(in []byte) (out interface{}) {
-	if err := json.Unmarshal(in, &out); err != nil {
-		return in
-	}
-	return out
-})
-
-func TestToStruct(t *testing.T) {
-	tests := []struct {
-		in      map[string]interface{}
-		wantPB  *spb.Struct
-		wantErr error
-	}{{
-		in:     nil,
-		wantPB: new(spb.Struct),
-	}, {
-		in:     make(map[string]interface{}),
-		wantPB: new(spb.Struct),
-	}, {
-		in: map[string]interface{}{
-			"nil":     nil,
-			"bool":    bool(false),
-			"int":     int(-123),
-			"int32":   int32(math.MinInt32),
-			"int64":   int64(math.MinInt64),
-			"uint":    uint(123),
-			"uint32":  uint32(math.MaxInt32),
-			"uint64":  uint64(math.MaxInt64),
-			"float32": float32(123.456),
-			"float64": float64(123.456),
-			"string":  string("hello, world!"),
-			"bytes":   []byte("\xde\xad\xbe\xef"),
-			"map":     map[string]interface{}{"k1": "v1", "k2": "v2"},
-			"slice":   []interface{}{"one", "two", "three"},
-		},
-		wantPB: &spb.Struct{Fields: map[string]*spb.Value{
-			"nil":     spb.NewNullValue(),
-			"bool":    spb.NewBoolValue(false),
-			"int":     spb.NewNumberValue(float64(-123)),
-			"int32":   spb.NewNumberValue(float64(math.MinInt32)),
-			"int64":   spb.NewNumberValue(float64(math.MinInt64)),
-			"uint":    spb.NewNumberValue(float64(123)),
-			"uint32":  spb.NewNumberValue(float64(math.MaxInt32)),
-			"uint64":  spb.NewNumberValue(float64(math.MaxInt64)),
-			"float32": spb.NewNumberValue(float64(float32(123.456))),
-			"float64": spb.NewNumberValue(float64(float64(123.456))),
-			"string":  spb.NewStringValue("hello, world!"),
-			"bytes":   spb.NewStringValue("3q2+7w=="),
-			"map": spb.NewStructValue(&spb.Struct{Fields: map[string]*spb.Value{
-				"k1": spb.NewStringValue("v1"),
-				"k2": spb.NewStringValue("v2"),
-			}}),
-			"slice": spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-				spb.NewStringValue("one"),
-				spb.NewStringValue("two"),
-				spb.NewStringValue("three"),
-			}}),
-		}},
-	}, {
-		in:      map[string]interface{}{"\xde\xad\xbe\xef": "<invalid UTF-8>"},
-		wantErr: cmpopts.AnyError,
-	}, {
-		in:      map[string]interface{}{"<invalid UTF-8>": "\xde\xad\xbe\xef"},
-		wantErr: cmpopts.AnyError,
-	}, {
-		in:      map[string]interface{}{"key": protoreflect.Name("named string")},
-		wantErr: cmpopts.AnyError,
-	}}
-
-	for _, tt := range tests {
-		gotPB, gotErr := spb.NewStruct(tt.in)
-		if diff := cmp.Diff(tt.wantPB, gotPB, protocmp.Transform()); diff != "" {
-			t.Errorf("NewStruct(%v) output mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		if diff := cmp.Diff(tt.wantErr, gotErr, cmpopts.EquateErrors()); diff != "" {
-			t.Errorf("NewStruct(%v) error mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestFromStruct(t *testing.T) {
-	tests := []struct {
-		in   *spb.Struct
-		want map[string]interface{}
-	}{{
-		in:   nil,
-		want: make(map[string]interface{}),
-	}, {
-		in:   new(spb.Struct),
-		want: make(map[string]interface{}),
-	}, {
-		in:   &spb.Struct{Fields: make(map[string]*spb.Value)},
-		want: make(map[string]interface{}),
-	}, {
-		in: &spb.Struct{Fields: map[string]*spb.Value{
-			"nil":     spb.NewNullValue(),
-			"bool":    spb.NewBoolValue(false),
-			"int":     spb.NewNumberValue(float64(-123)),
-			"int32":   spb.NewNumberValue(float64(math.MinInt32)),
-			"int64":   spb.NewNumberValue(float64(math.MinInt64)),
-			"uint":    spb.NewNumberValue(float64(123)),
-			"uint32":  spb.NewNumberValue(float64(math.MaxInt32)),
-			"uint64":  spb.NewNumberValue(float64(math.MaxInt64)),
-			"float32": spb.NewNumberValue(float64(float32(123.456))),
-			"float64": spb.NewNumberValue(float64(float64(123.456))),
-			"string":  spb.NewStringValue("hello, world!"),
-			"bytes":   spb.NewStringValue("3q2+7w=="),
-			"map": spb.NewStructValue(&spb.Struct{Fields: map[string]*spb.Value{
-				"k1": spb.NewStringValue("v1"),
-				"k2": spb.NewStringValue("v2"),
-			}}),
-			"slice": spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-				spb.NewStringValue("one"),
-				spb.NewStringValue("two"),
-				spb.NewStringValue("three"),
-			}}),
-		}},
-		want: map[string]interface{}{
-			"nil":     nil,
-			"bool":    bool(false),
-			"int":     float64(-123),
-			"int32":   float64(math.MinInt32),
-			"int64":   float64(math.MinInt64),
-			"uint":    float64(123),
-			"uint32":  float64(math.MaxInt32),
-			"uint64":  float64(math.MaxInt64),
-			"float32": float64(float32(123.456)),
-			"float64": float64(float64(123.456)),
-			"string":  string("hello, world!"),
-			"bytes":   string("3q2+7w=="),
-			"map":     map[string]interface{}{"k1": "v1", "k2": "v2"},
-			"slice":   []interface{}{"one", "two", "three"},
-		},
-	}}
-
-	for _, tt := range tests {
-		got := tt.in.AsMap()
-		if diff := cmp.Diff(tt.want, got); diff != "" {
-			t.Errorf("AsMap(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		gotJSON, err := json.Marshal(got)
-		if err != nil {
-			t.Errorf("Marshal error: %v", err)
-		}
-		wantJSON, err := tt.in.MarshalJSON()
-		if err != nil {
-			t.Errorf("Marshal error: %v", err)
-		}
-		if diff := cmp.Diff(wantJSON, gotJSON, equateJSON); diff != "" {
-			t.Errorf("MarshalJSON(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestToListValue(t *testing.T) {
-	tests := []struct {
-		in      []interface{}
-		wantPB  *spb.ListValue
-		wantErr error
-	}{{
-		in:     nil,
-		wantPB: new(spb.ListValue),
-	}, {
-		in:     make([]interface{}, 0),
-		wantPB: new(spb.ListValue),
-	}, {
-		in: []interface{}{
-			nil,
-			bool(false),
-			int(-123),
-			int32(math.MinInt32),
-			int64(math.MinInt64),
-			uint(123),
-			uint32(math.MaxInt32),
-			uint64(math.MaxInt64),
-			float32(123.456),
-			float64(123.456),
-			string("hello, world!"),
-			[]byte("\xde\xad\xbe\xef"),
-			map[string]interface{}{"k1": "v1", "k2": "v2"},
-			[]interface{}{"one", "two", "three"},
-		},
-		wantPB: &spb.ListValue{Values: []*spb.Value{
-			spb.NewNullValue(),
-			spb.NewBoolValue(false),
-			spb.NewNumberValue(float64(-123)),
-			spb.NewNumberValue(float64(math.MinInt32)),
-			spb.NewNumberValue(float64(math.MinInt64)),
-			spb.NewNumberValue(float64(123)),
-			spb.NewNumberValue(float64(math.MaxInt32)),
-			spb.NewNumberValue(float64(math.MaxInt64)),
-			spb.NewNumberValue(float64(float32(123.456))),
-			spb.NewNumberValue(float64(float64(123.456))),
-			spb.NewStringValue("hello, world!"),
-			spb.NewStringValue("3q2+7w=="),
-			spb.NewStructValue(&spb.Struct{Fields: map[string]*spb.Value{
-				"k1": spb.NewStringValue("v1"),
-				"k2": spb.NewStringValue("v2"),
-			}}),
-			spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-				spb.NewStringValue("one"),
-				spb.NewStringValue("two"),
-				spb.NewStringValue("three"),
-			}}),
-		}},
-	}, {
-		in:      []interface{}{"\xde\xad\xbe\xef"},
-		wantErr: cmpopts.AnyError,
-	}, {
-		in:      []interface{}{protoreflect.Name("named string")},
-		wantErr: cmpopts.AnyError,
-	}}
-
-	for _, tt := range tests {
-		gotPB, gotErr := spb.NewList(tt.in)
-		if diff := cmp.Diff(tt.wantPB, gotPB, protocmp.Transform()); diff != "" {
-			t.Errorf("NewListValue(%v) output mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		if diff := cmp.Diff(tt.wantErr, gotErr, cmpopts.EquateErrors()); diff != "" {
-			t.Errorf("NewListValue(%v) error mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestFromListValue(t *testing.T) {
-	tests := []struct {
-		in   *spb.ListValue
-		want []interface{}
-	}{{
-		in:   nil,
-		want: make([]interface{}, 0),
-	}, {
-		in:   new(spb.ListValue),
-		want: make([]interface{}, 0),
-	}, {
-		in:   &spb.ListValue{Values: make([]*spb.Value, 0)},
-		want: make([]interface{}, 0),
-	}, {
-		in: &spb.ListValue{Values: []*spb.Value{
-			spb.NewNullValue(),
-			spb.NewBoolValue(false),
-			spb.NewNumberValue(float64(-123)),
-			spb.NewNumberValue(float64(math.MinInt32)),
-			spb.NewNumberValue(float64(math.MinInt64)),
-			spb.NewNumberValue(float64(123)),
-			spb.NewNumberValue(float64(math.MaxInt32)),
-			spb.NewNumberValue(float64(math.MaxInt64)),
-			spb.NewNumberValue(float64(float32(123.456))),
-			spb.NewNumberValue(float64(float64(123.456))),
-			spb.NewStringValue("hello, world!"),
-			spb.NewStringValue("3q2+7w=="),
-			spb.NewStructValue(&spb.Struct{Fields: map[string]*spb.Value{
-				"k1": spb.NewStringValue("v1"),
-				"k2": spb.NewStringValue("v2"),
-			}}),
-			spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-				spb.NewStringValue("one"),
-				spb.NewStringValue("two"),
-				spb.NewStringValue("three"),
-			}}),
-		}},
-		want: []interface{}{
-			nil,
-			bool(false),
-			float64(-123),
-			float64(math.MinInt32),
-			float64(math.MinInt64),
-			float64(123),
-			float64(math.MaxInt32),
-			float64(math.MaxInt64),
-			float64(float32(123.456)),
-			float64(float64(123.456)),
-			string("hello, world!"),
-			string("3q2+7w=="),
-			map[string]interface{}{"k1": "v1", "k2": "v2"},
-			[]interface{}{"one", "two", "three"},
-		},
-	}}
-
-	for _, tt := range tests {
-		got := tt.in.AsSlice()
-		if diff := cmp.Diff(tt.want, got); diff != "" {
-			t.Errorf("AsSlice(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		gotJSON, err := json.Marshal(got)
-		if err != nil {
-			t.Errorf("Marshal error: %v", err)
-		}
-		wantJSON, err := tt.in.MarshalJSON()
-		if err != nil {
-			t.Errorf("Marshal error: %v", err)
-		}
-		if diff := cmp.Diff(wantJSON, gotJSON, equateJSON); diff != "" {
-			t.Errorf("MarshalJSON(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestToValue(t *testing.T) {
-	tests := []struct {
-		in      interface{}
-		wantPB  *spb.Value
-		wantErr error
-	}{{
-		in:     nil,
-		wantPB: spb.NewNullValue(),
-	}, {
-		in:     bool(false),
-		wantPB: spb.NewBoolValue(false),
-	}, {
-		in:     int(-123),
-		wantPB: spb.NewNumberValue(float64(-123)),
-	}, {
-		in:     int32(math.MinInt32),
-		wantPB: spb.NewNumberValue(float64(math.MinInt32)),
-	}, {
-		in:     int64(math.MinInt64),
-		wantPB: spb.NewNumberValue(float64(math.MinInt64)),
-	}, {
-		in:     uint(123),
-		wantPB: spb.NewNumberValue(float64(123)),
-	}, {
-		in:     uint32(math.MaxInt32),
-		wantPB: spb.NewNumberValue(float64(math.MaxInt32)),
-	}, {
-		in:     uint64(math.MaxInt64),
-		wantPB: spb.NewNumberValue(float64(math.MaxInt64)),
-	}, {
-		in:     float32(123.456),
-		wantPB: spb.NewNumberValue(float64(float32(123.456))),
-	}, {
-		in:     float64(123.456),
-		wantPB: spb.NewNumberValue(float64(float64(123.456))),
-	}, {
-		in:     string("hello, world!"),
-		wantPB: spb.NewStringValue("hello, world!"),
-	}, {
-		in:     []byte("\xde\xad\xbe\xef"),
-		wantPB: spb.NewStringValue("3q2+7w=="),
-	}, {
-		in:     map[string]interface{}(nil),
-		wantPB: spb.NewStructValue(nil),
-	}, {
-		in:     make(map[string]interface{}),
-		wantPB: spb.NewStructValue(nil),
-	}, {
-		in: map[string]interface{}{"k1": "v1", "k2": "v2"},
-		wantPB: spb.NewStructValue(&spb.Struct{Fields: map[string]*spb.Value{
-			"k1": spb.NewStringValue("v1"),
-			"k2": spb.NewStringValue("v2"),
-		}}),
-	}, {
-		in:     []interface{}(nil),
-		wantPB: spb.NewListValue(nil),
-	}, {
-		in:     make([]interface{}, 0),
-		wantPB: spb.NewListValue(nil),
-	}, {
-		in: []interface{}{"one", "two", "three"},
-		wantPB: spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-			spb.NewStringValue("one"),
-			spb.NewStringValue("two"),
-			spb.NewStringValue("three"),
-		}}),
-	}, {
-		in:      "\xde\xad\xbe\xef",
-		wantErr: cmpopts.AnyError,
-	}, {
-		in:      protoreflect.Name("named string"),
-		wantErr: cmpopts.AnyError,
-	}}
-
-	for _, tt := range tests {
-		gotPB, gotErr := spb.NewValue(tt.in)
-		if diff := cmp.Diff(tt.wantPB, gotPB, protocmp.Transform()); diff != "" {
-			t.Errorf("NewValue(%v) output mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		if diff := cmp.Diff(tt.wantErr, gotErr, cmpopts.EquateErrors()); diff != "" {
-			t.Errorf("NewValue(%v) error mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestFromValue(t *testing.T) {
-	tests := []struct {
-		in   *spb.Value
-		want interface{}
-	}{{
-		in:   nil,
-		want: nil,
-	}, {
-		in:   new(spb.Value),
-		want: nil,
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_NullValue)(nil)},
-		want: nil,
-	}, {
-		in:   spb.NewNullValue(),
-		want: nil,
-	}, {
-		in:   &spb.Value{Kind: &spb.Value_NullValue{NullValue: math.MinInt32}},
-		want: nil,
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_BoolValue)(nil)},
-		want: nil,
-	}, {
-		in:   spb.NewBoolValue(false),
-		want: bool(false),
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_NumberValue)(nil)},
-		want: nil,
-	}, {
-		in:   spb.NewNumberValue(float64(math.MinInt32)),
-		want: float64(math.MinInt32),
-	}, {
-		in:   spb.NewNumberValue(float64(math.MinInt64)),
-		want: float64(math.MinInt64),
-	}, {
-		in:   spb.NewNumberValue(float64(123)),
-		want: float64(123),
-	}, {
-		in:   spb.NewNumberValue(float64(math.MaxInt32)),
-		want: float64(math.MaxInt32),
-	}, {
-		in:   spb.NewNumberValue(float64(math.MaxInt64)),
-		want: float64(math.MaxInt64),
-	}, {
-		in:   spb.NewNumberValue(float64(float32(123.456))),
-		want: float64(float32(123.456)),
-	}, {
-		in:   spb.NewNumberValue(float64(float64(123.456))),
-		want: float64(float64(123.456)),
-	}, {
-		in:   spb.NewNumberValue(math.NaN()),
-		want: string("NaN"),
-	}, {
-		in:   spb.NewNumberValue(math.Inf(-1)),
-		want: string("-Infinity"),
-	}, {
-		in:   spb.NewNumberValue(math.Inf(+1)),
-		want: string("Infinity"),
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_StringValue)(nil)},
-		want: nil,
-	}, {
-		in:   spb.NewStringValue("hello, world!"),
-		want: string("hello, world!"),
-	}, {
-		in:   spb.NewStringValue("3q2+7w=="),
-		want: string("3q2+7w=="),
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_StructValue)(nil)},
-		want: nil,
-	}, {
-		in:   &spb.Value{Kind: &spb.Value_StructValue{}},
-		want: make(map[string]interface{}),
-	}, {
-		in: spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-			spb.NewStringValue("one"),
-			spb.NewStringValue("two"),
-			spb.NewStringValue("three"),
-		}}),
-		want: []interface{}{"one", "two", "three"},
-	}, {
-		in:   &spb.Value{Kind: (*spb.Value_ListValue)(nil)},
-		want: nil,
-	}, {
-		in:   &spb.Value{Kind: &spb.Value_ListValue{}},
-		want: make([]interface{}, 0),
-	}, {
-		in: spb.NewListValue(&spb.ListValue{Values: []*spb.Value{
-			spb.NewStringValue("one"),
-			spb.NewStringValue("two"),
-			spb.NewStringValue("three"),
-		}}),
-		want: []interface{}{"one", "two", "three"},
-	}}
-
-	for _, tt := range tests {
-		got := tt.in.AsInterface()
-		if diff := cmp.Diff(tt.want, got); diff != "" {
-			t.Errorf("AsInterface(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		gotJSON, gotErr := json.Marshal(got)
-		if gotErr != nil {
-			t.Errorf("Marshal error: %v", gotErr)
-		}
-		wantJSON, wantErr := tt.in.MarshalJSON()
-		if diff := cmp.Diff(wantJSON, gotJSON, equateJSON); diff != "" && wantErr == nil {
-			t.Errorf("MarshalJSON(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/protobuf/types/known/structpb/ya.make b/vendor/google.golang.org/protobuf/types/known/structpb/ya.make
index 9349972753b..3051fe39002 100644
--- a/vendor/google.golang.org/protobuf/types/known/structpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/structpb/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(struct.pb.go)
-
-GO_XTEST_SRCS(struct_test.go)
+SRCS(
+    struct.pb.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/timestamppb/gotest/ya.make b/vendor/google.golang.org/protobuf/types/known/timestamppb/gotest/ya.make
deleted file mode 100644
index e18fcbe75e8..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/timestamppb/gotest/ya.make
+++ /dev/null
@@ -1,5 +0,0 @@
-GO_TEST_FOR(vendor/google.golang.org/protobuf/types/known/timestamppb)
-
-LICENSE(BSD-3-Clause)
-
-END()
diff --git a/vendor/google.golang.org/protobuf/types/known/timestamppb/timestamp_test.go b/vendor/google.golang.org/protobuf/types/known/timestamppb/timestamp_test.go
deleted file mode 100644
index dfd666dee3f..00000000000
--- a/vendor/google.golang.org/protobuf/types/known/timestamppb/timestamp_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package timestamppb_test
-
-import (
-	"math"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"google.golang.org/protobuf/internal/detrand"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	tspb "google.golang.org/protobuf/types/known/timestamppb"
-)
-
-func init() {
-	detrand.Disable()
-}
-
-const (
-	minTimestamp = -62135596800  // Seconds between 1970-01-01T00:00:00Z and 0001-01-01T00:00:00Z, inclusive
-	maxTimestamp = +253402300799 // Seconds between 1970-01-01T00:00:00Z and 9999-12-31T23:59:59Z, inclusive
-)
-
-func TestToTimestamp(t *testing.T) {
-	tests := []struct {
-		in   time.Time
-		want *tspb.Timestamp
-	}{
-		{in: time.Time{}, want: &tspb.Timestamp{Seconds: -62135596800, Nanos: 0}},
-		{in: time.Unix(0, 0), want: &tspb.Timestamp{Seconds: 0, Nanos: 0}},
-		{in: time.Unix(math.MinInt64, 0), want: &tspb.Timestamp{Seconds: math.MinInt64, Nanos: 0}},
-		{in: time.Unix(math.MaxInt64, 1e9-1), want: &tspb.Timestamp{Seconds: math.MaxInt64, Nanos: 1e9 - 1}},
-		{in: time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC), want: &tspb.Timestamp{Seconds: minTimestamp, Nanos: 0}},
-		{in: time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC).Add(-time.Nanosecond), want: &tspb.Timestamp{Seconds: minTimestamp - 1, Nanos: 1e9 - 1}},
-		{in: time.Date(9999, 12, 31, 23, 59, 59, 1e9-1, time.UTC), want: &tspb.Timestamp{Seconds: maxTimestamp, Nanos: 1e9 - 1}},
-		{in: time.Date(9999, 12, 31, 23, 59, 59, 1e9-1, time.UTC).Add(+time.Nanosecond), want: &tspb.Timestamp{Seconds: maxTimestamp + 1}},
-		{in: time.Date(1961, 1, 26, 0, 0, 0, 0, time.UTC), want: &tspb.Timestamp{Seconds: -281836800, Nanos: 0}},
-		{in: time.Date(2011, 1, 26, 0, 0, 0, 0, time.UTC), want: &tspb.Timestamp{Seconds: 1296000000, Nanos: 0}},
-		{in: time.Date(2011, 1, 26, 3, 25, 45, 940483, time.UTC), want: &tspb.Timestamp{Seconds: 1296012345, Nanos: 940483}},
-	}
-
-	for _, tt := range tests {
-		got := tspb.New(tt.in)
-		if diff := cmp.Diff(tt.want, got, protocmp.Transform()); diff != "" {
-			t.Errorf("New(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-func TestFromTimestamp(t *testing.T) {
-	tests := []struct {
-		in       *tspb.Timestamp
-		wantTime time.Time
-		wantErr  error
-	}{
-		{in: nil, wantTime: time.Unix(0, 0), wantErr: textError("invalid nil Timestamp")},
-		{in: new(tspb.Timestamp), wantTime: time.Unix(0, 0)},
-		{in: &tspb.Timestamp{Seconds: -62135596800, Nanos: 0}, wantTime: time.Time{}},
-		{in: &tspb.Timestamp{Seconds: -1, Nanos: -1}, wantTime: time.Unix(-1, -1), wantErr: textError("timestamp (seconds:-1 nanos:-1) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: -1, Nanos: 0}, wantTime: time.Unix(-1, 0)},
-		{in: &tspb.Timestamp{Seconds: -1, Nanos: +1}, wantTime: time.Unix(-1, +1)},
-		{in: &tspb.Timestamp{Seconds: 0, Nanos: -1}, wantTime: time.Unix(0, -1), wantErr: textError("timestamp (nanos:-1) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: 0, Nanos: 0}, wantTime: time.Unix(0, 0)},
-		{in: &tspb.Timestamp{Seconds: 0, Nanos: +1}, wantTime: time.Unix(0, +1)},
-		{in: &tspb.Timestamp{Seconds: +1, Nanos: -1}, wantTime: time.Unix(+1, -1), wantErr: textError("timestamp (seconds:1 nanos:-1) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: +1, Nanos: 0}, wantTime: time.Unix(+1, 0)},
-		{in: &tspb.Timestamp{Seconds: +1, Nanos: +1}, wantTime: time.Unix(+1, +1)},
-		{in: &tspb.Timestamp{Seconds: -9876543210, Nanos: -1098765432}, wantTime: time.Unix(-9876543210, -1098765432), wantErr: textError("timestamp (seconds:-9876543210 nanos:-1098765432) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: +9876543210, Nanos: -1098765432}, wantTime: time.Unix(+9876543210, -1098765432), wantErr: textError("timestamp (seconds:9876543210 nanos:-1098765432) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: -9876543210, Nanos: +1098765432}, wantTime: time.Unix(-9876543210, +1098765432), wantErr: textError("timestamp (seconds:-9876543210 nanos:1098765432) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: +9876543210, Nanos: +1098765432}, wantTime: time.Unix(+9876543210, +1098765432), wantErr: textError("timestamp (seconds:9876543210 nanos:1098765432) has out-of-range nanos")},
-		{in: &tspb.Timestamp{Seconds: math.MinInt64, Nanos: 0}, wantTime: time.Unix(math.MinInt64, 0), wantErr: textError("timestamp (seconds:-9223372036854775808) before 0001-01-01")},
-		{in: &tspb.Timestamp{Seconds: math.MaxInt64, Nanos: 1e9 - 1}, wantTime: time.Unix(math.MaxInt64, 1e9-1), wantErr: textError("timestamp (seconds:9223372036854775807 nanos:999999999) after 9999-12-31")},
-		{in: &tspb.Timestamp{Seconds: minTimestamp, Nanos: 0}, wantTime: time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC)},
-		{in: &tspb.Timestamp{Seconds: minTimestamp - 1, Nanos: 1e9 - 1}, wantTime: time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC).Add(-time.Nanosecond), wantErr: textError("timestamp (seconds:-62135596801 nanos:999999999) before 0001-01-01")},
-		{in: &tspb.Timestamp{Seconds: maxTimestamp, Nanos: 1e9 - 1}, wantTime: time.Date(9999, 12, 31, 23, 59, 59, 1e9-1, time.UTC)},
-		{in: &tspb.Timestamp{Seconds: maxTimestamp + 1}, wantTime: time.Date(9999, 12, 31, 23, 59, 59, 1e9-1, time.UTC).Add(+time.Nanosecond), wantErr: textError("timestamp (seconds:253402300800) after 9999-12-31")},
-		{in: &tspb.Timestamp{Seconds: -281836800, Nanos: 0}, wantTime: time.Date(1961, 1, 26, 0, 0, 0, 0, time.UTC)},
-		{in: &tspb.Timestamp{Seconds: 1296000000, Nanos: 0}, wantTime: time.Date(2011, 1, 26, 0, 0, 0, 0, time.UTC)},
-		{in: &tspb.Timestamp{Seconds: 1296012345, Nanos: 940483}, wantTime: time.Date(2011, 1, 26, 3, 25, 45, 940483, time.UTC)},
-	}
-
-	for _, tt := range tests {
-		gotTime := tt.in.AsTime()
-		if diff := cmp.Diff(tt.wantTime, gotTime); diff != "" {
-			t.Errorf("AsTime(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-		gotErr := tt.in.CheckValid()
-		if diff := cmp.Diff(tt.wantErr, gotErr, cmpopts.EquateErrors()); diff != "" {
-			t.Errorf("CheckValid(%v) mismatch (-want +got):\n%s", tt.in, diff)
-		}
-	}
-}
-
-type textError string
-
-func (e textError) Error() string     { return string(e) }
-func (e textError) Is(err error) bool { return err != nil && strings.Contains(err.Error(), e.Error()) }
diff --git a/vendor/google.golang.org/protobuf/types/known/timestamppb/ya.make b/vendor/google.golang.org/protobuf/types/known/timestamppb/ya.make
index 6b2c7952680..6fe94ace5be 100644
--- a/vendor/google.golang.org/protobuf/types/known/timestamppb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/timestamppb/ya.make
@@ -2,10 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(timestamp.pb.go)
-
-GO_XTEST_SRCS(timestamp_test.go)
+SRCS(
+    timestamp.pb.go
+)
 
 END()
-
-RECURSE(gotest)
diff --git a/vendor/google.golang.org/protobuf/types/known/typepb/ya.make b/vendor/google.golang.org/protobuf/types/known/typepb/ya.make
index 17db33ddd4b..c5f0eb05c3f 100644
--- a/vendor/google.golang.org/protobuf/types/known/typepb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/typepb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(type.pb.go)
+SRCS(
+    type.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/known/wrapperspb/ya.make b/vendor/google.golang.org/protobuf/types/known/wrapperspb/ya.make
index 3233e5f8776..2728112ab86 100644
--- a/vendor/google.golang.org/protobuf/types/known/wrapperspb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/known/wrapperspb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(wrappers.pb.go)
+SRCS(
+    wrappers.pb.go
+)
 
 END()
diff --git a/vendor/google.golang.org/protobuf/types/pluginpb/plugin.pb.go b/vendor/google.golang.org/protobuf/types/pluginpb/plugin.pb.go
index d0bb96a9d21..69892f41bd1 100644
--- a/vendor/google.golang.org/protobuf/types/pluginpb/plugin.pb.go
+++ b/vendor/google.golang.org/protobuf/types/pluginpb/plugin.pb.go
@@ -1,32 +1,9 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Author: [email protected] (Kenton Varda)
 //
@@ -58,8 +35,9 @@ import (
 type CodeGeneratorResponse_Feature int32
 
 const (
-	CodeGeneratorResponse_FEATURE_NONE            CodeGeneratorResponse_Feature = 0
-	CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL CodeGeneratorResponse_Feature = 1
+	CodeGeneratorResponse_FEATURE_NONE              CodeGeneratorResponse_Feature = 0
+	CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL   CodeGeneratorResponse_Feature = 1
+	CodeGeneratorResponse_FEATURE_SUPPORTS_EDITIONS CodeGeneratorResponse_Feature = 2
 )
 
 // Enum value maps for CodeGeneratorResponse_Feature.
@@ -67,10 +45,12 @@ var (
 	CodeGeneratorResponse_Feature_name = map[int32]string{
 		0: "FEATURE_NONE",
 		1: "FEATURE_PROTO3_OPTIONAL",
+		2: "FEATURE_SUPPORTS_EDITIONS",
 	}
 	CodeGeneratorResponse_Feature_value = map[string]int32{
-		"FEATURE_NONE":            0,
-		"FEATURE_PROTO3_OPTIONAL": 1,
+		"FEATURE_NONE":              0,
+		"FEATURE_PROTO3_OPTIONAL":   1,
+		"FEATURE_SUPPORTS_EDITIONS": 2,
 	}
 )
 
@@ -201,6 +181,11 @@ type CodeGeneratorRequest struct {
 	// they import.  The files will appear in topological order, so each file
 	// appears before any file that imports it.
 	//
+	// Note: the files listed in files_to_generate will include runtime-retention
+	// options only, but all other files will include source-retention options.
+	// The source_file_descriptors field below is available in case you need
+	// source-retention options for files_to_generate.
+	//
 	// protoc guarantees that all proto_files will be written after
 	// the fields above, even though this is not technically guaranteed by the
 	// protobuf wire format.  This theoretically could allow a plugin to stream
@@ -212,6 +197,10 @@ type CodeGeneratorRequest struct {
 	// Type names of fields and extensions in the FileDescriptorProto are always
 	// fully qualified.
 	ProtoFile []*descriptorpb.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
+	// File descriptors with all options, including source-retention options.
+	// These descriptors are only provided for the files listed in
+	// files_to_generate.
+	SourceFileDescriptors []*descriptorpb.FileDescriptorProto `protobuf:"bytes,17,rep,name=source_file_descriptors,json=sourceFileDescriptors" json:"source_file_descriptors,omitempty"`
 	// The version number of protocol compiler.
 	CompilerVersion *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
 }
@@ -269,6 +258,13 @@ func (x *CodeGeneratorRequest) GetProtoFile() []*descriptorpb.FileDescriptorProt
 	return nil
 }
 
+func (x *CodeGeneratorRequest) GetSourceFileDescriptors() []*descriptorpb.FileDescriptorProto {
+	if x != nil {
+		return x.SourceFileDescriptors
+	}
+	return nil
+}
+
 func (x *CodeGeneratorRequest) GetCompilerVersion() *Version {
 	if x != nil {
 		return x.CompilerVersion
@@ -493,7 +489,7 @@ var file_google_protobuf_compiler_plugin_proto_rawDesc = []byte{
 	0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61,
 	0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68,
 	0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x22, 0xf1, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x64,
+	0x52, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x22, 0xcf, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x64,
 	0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x28, 0x0a, 0x10, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x67, 0x65, 0x6e,
 	0x65, 0x72, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x69, 0x6c,
@@ -503,45 +499,53 @@ var file_google_protobuf_compiler_plugin_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
 	0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x4c,
-	0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x69,
-	0x6c, 0x65, 0x72, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x6f, 0x6d,
-	0x70, 0x69, 0x6c, 0x65, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x94, 0x03, 0x0a,
-	0x15, 0x43, 0x6f, 0x64, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2d, 0x0a, 0x12,
-	0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x04, 0x66,
-	0x69, 0x6c, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70,
-	0x69, 0x6c, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x64, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52,
-	0x04, 0x66, 0x69, 0x6c, 0x65, 0x1a, 0xb1, 0x01, 0x0a, 0x04, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x73,
-	0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x52, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f,
-	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x07, 0x46, 0x65, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f,
-	0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52,
-	0x45, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x33, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41,
-	0x4c, 0x10, 0x01, 0x42, 0x72, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x69,
-	0x6c, 0x65, 0x72, 0x42, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x5a, 0x29, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79,
-	0x70, 0x65, 0x73, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x70, 0x62, 0xaa, 0x02, 0x18, 0x47,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43,
-	0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72,
+	0x6f, 0x74, 0x6f, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x5c,
+	0x0a, 0x17, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x15, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c,
+	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x4c, 0x0a, 0x10,
+	0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65,
+	0x72, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x6f, 0x6d, 0x70, 0x69,
+	0x6c, 0x65, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xb3, 0x03, 0x0a, 0x15, 0x43,
+	0x6f, 0x64, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2d, 0x0a, 0x12, 0x73, 0x75,
+	0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65,
+	0x64, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x04, 0x66, 0x69, 0x6c,
+	0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c,
+	0x65, 0x72, 0x2e, 0x43, 0x6f, 0x64, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x04, 0x66,
+	0x69, 0x6c, 0x65, 0x1a, 0xb1, 0x01, 0x0a, 0x04, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x27, 0x0a, 0x0f, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x73, 0x65, 0x72,
+	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x12, 0x52, 0x0a, 0x13, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64,
+	0x5f, 0x63, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x22, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x11, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43,
+	0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x57, 0x0a, 0x07, 0x46, 0x65, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x4e, 0x4f,
+	0x4e, 0x45, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f,
+	0x50, 0x52, 0x4f, 0x54, 0x4f, 0x33, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10,
+	0x01, 0x12, 0x1d, 0x0a, 0x19, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x53, 0x55, 0x50,
+	0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x45, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02,
+	0x42, 0x72, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72,
+	0x42, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x5a, 0x29,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72,
+	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73,
+	0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x70, 0x62, 0xaa, 0x02, 0x18, 0x47, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x43, 0x6f, 0x6d, 0x70,
+	0x69, 0x6c, 0x65, 0x72,
 }
 
 var (
@@ -569,14 +573,15 @@ var file_google_protobuf_compiler_plugin_proto_goTypes = []interface{}{
 }
 var file_google_protobuf_compiler_plugin_proto_depIdxs = []int32{
 	5, // 0: google.protobuf.compiler.CodeGeneratorRequest.proto_file:type_name -> google.protobuf.FileDescriptorProto
-	1, // 1: google.protobuf.compiler.CodeGeneratorRequest.compiler_version:type_name -> google.protobuf.compiler.Version
-	4, // 2: google.protobuf.compiler.CodeGeneratorResponse.file:type_name -> google.protobuf.compiler.CodeGeneratorResponse.File
-	6, // 3: google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info:type_name -> google.protobuf.GeneratedCodeInfo
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
+	5, // 1: google.protobuf.compiler.CodeGeneratorRequest.source_file_descriptors:type_name -> google.protobuf.FileDescriptorProto
+	1, // 2: google.protobuf.compiler.CodeGeneratorRequest.compiler_version:type_name -> google.protobuf.compiler.Version
+	4, // 3: google.protobuf.compiler.CodeGeneratorResponse.file:type_name -> google.protobuf.compiler.CodeGeneratorResponse.File
+	6, // 4: google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info:type_name -> google.protobuf.GeneratedCodeInfo
+	5, // [5:5] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_google_protobuf_compiler_plugin_proto_init() }
diff --git a/vendor/google.golang.org/protobuf/types/pluginpb/ya.make b/vendor/google.golang.org/protobuf/types/pluginpb/ya.make
index 040213ac06a..7b8a798f382 100644
--- a/vendor/google.golang.org/protobuf/types/pluginpb/ya.make
+++ b/vendor/google.golang.org/protobuf/types/pluginpb/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(plugin.pb.go)
+SRCS(
+    plugin.pb.go
+)
 
 END()
diff --git a/ydb/ci/rightlib/increment.sh b/ydb/ci/rightlib/increment.sh
index a6655ced95a..46f7e2c86ca 100755
--- a/ydb/ci/rightlib/increment.sh
+++ b/ydb/ci/rightlib/increment.sh
@@ -30,11 +30,5 @@ for sha in $list;do
   echo "---"
 done
 
-exit
-
-rsync -r $LIB_ROOT/ya $LIB_ROOT/build $LIB_ROOT/certs $LIB_ROOT/cmake $LIB_ROOT/contrib $LIB_ROOT/library $LIB_ROOT/tools $LIB_ROOT/util $LIB_ROOT/vendor $LIB_ROOT/yt $MAIN_ROOT \
-  --filter '- **/a.yaml' --filter '- **/.arcignore' --filter '- **/.yandex_meta/' --filter '- contrib/ydb/' --filter '- build/internal/' --filter '- build/ext_mapping.conf.json' \
-  --filter '- **/CMakeLists*.txt' --delete
-
 echo ${newsha} > ${shapath}
 
diff --git a/yt/cpp/mapreduce/http/context.cpp b/yt/cpp/mapreduce/http/context.cpp
index d158a551957..18d564fe09c 100644
--- a/yt/cpp/mapreduce/http/context.cpp
+++ b/yt/cpp/mapreduce/http/context.cpp
@@ -16,11 +16,6 @@ bool operator==(const TClientContext& lhs, const TClientContext& rhs)
            lhs.ProxyAddress == rhs.ProxyAddress;
 }
 
-bool operator!=(const TClientContext& lhs, const TClientContext& rhs)
-{
-    return !(rhs == lhs);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT
diff --git a/yt/cpp/mapreduce/http/context.h b/yt/cpp/mapreduce/http/context.h
index 9c730f1c3a9..3bae208279b 100644
--- a/yt/cpp/mapreduce/http/context.h
+++ b/yt/cpp/mapreduce/http/context.h
@@ -25,7 +25,6 @@ struct TClientContext
 };
 
 bool operator==(const TClientContext& lhs, const TClientContext& rhs);
-bool operator!=(const TClientContext& lhs, const TClientContext& rhs);
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/yt/cpp/mapreduce/interface/io.h b/yt/cpp/mapreduce/interface/io.h
index 9a2f2bf3449..8497c8aae29 100644
--- a/yt/cpp/mapreduce/interface/io.h
+++ b/yt/cpp/mapreduce/interface/io.h
@@ -300,12 +300,6 @@ public:
         return Reader_ == it.Reader_;
     }
 
-    /// Inequality operator.
-    bool operator!=(const TTableReaderIterator& it) const
-    {
-        return Reader_ != it.Reader_;
-    }
-
     /// Dereference operator.
     TTableReader<T>& operator*()
     {
diff --git a/yt/yt/build/ya.make b/yt/yt/build/ya.make
index 4a94814f00b..81c093deff3 100644
--- a/yt/yt/build/ya.make
+++ b/yt/yt/build/ya.make
@@ -2,8 +2,8 @@ LIBRARY()
 
 INCLUDE(${ARCADIA_ROOT}/yt/ya_cpp.make.inc)
 
-SET(YT_VERSION_MAJOR 23)
-SET(YT_VERSION_MINOR 3)
+SET(YT_VERSION_MAJOR 24)
+SET(YT_VERSION_MINOR 1)
 
 DEFAULT(YT_VERSION_PATCH 0)
 DEFAULT(YT_VERSION_BRANCH "local")
diff --git a/yt/yt/client/api/client_common.h b/yt/yt/client/api/client_common.h
index 3cc8fe461fb..23802ac1fff 100644
--- a/yt/yt/client/api/client_common.h
+++ b/yt/yt/client/api/client_common.h
@@ -155,6 +155,8 @@ struct TSelectRowsOptionsBase
     bool UseCanonicalNullRelations = false;
     //! Merge versioned rows from different stores when reading.
     bool MergeVersionedRows = true;
+    //! Query language syntax version.
+    int SyntaxVersion = 1;
 };
 
 struct TSelectRowsOptions
diff --git a/yt/yt/client/api/public.h b/yt/yt/client/api/public.h
index 55a72dd3c52..5f3db2e19a3 100644
--- a/yt/yt/client/api/public.h
+++ b/yt/yt/client/api/public.h
@@ -14,7 +14,7 @@
 
 #include <yt/yt/core/rpc/public.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NApi {
 
diff --git a/yt/yt/client/api/rpc_proxy/client_base.cpp b/yt/yt/client/api/rpc_proxy/client_base.cpp
index 6f0961d58b2..e3c12835421 100644
--- a/yt/yt/client/api/rpc_proxy/client_base.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_base.cpp
@@ -950,6 +950,7 @@ void FillRequestBySelectRowsOptionsBase(
     } else if (defaultUdfRegistryPath) {
         request->set_udf_registry_path(*defaultUdfRegistryPath);
     }
+    request->set_syntax_version(options.SyntaxVersion);
 }
 
 TFuture<TSelectRowsResult> TClientBase::SelectRows(
diff --git a/yt/yt/client/chunk_client/chunk_replica-inl.h b/yt/yt/client/chunk_client/chunk_replica-inl.h
index 27b745feaf0..fec61f2711a 100644
--- a/yt/yt/client/chunk_client/chunk_replica-inl.h
+++ b/yt/yt/client/chunk_client/chunk_replica-inl.h
@@ -157,16 +157,6 @@ Y_FORCE_INLINE TChunkIdWithIndex::TChunkIdWithIndex(TChunkId id, int replicaInde
     , ReplicaIndex(replicaIndex)
 { }
 
-Y_FORCE_INLINE bool operator==(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs)
-{
-    return lhs.Id == rhs.Id && lhs.ReplicaIndex == rhs.ReplicaIndex;
-}
-
-Y_FORCE_INLINE bool operator!=(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs)
-{
-    return !(lhs == rhs);
-}
-
 Y_FORCE_INLINE bool operator<(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs)
 {
     if (lhs.Id == rhs.Id) {
@@ -192,17 +182,6 @@ Y_FORCE_INLINE TChunkIdWithIndexes::TChunkIdWithIndexes(TChunkId id, int replica
     , MediumIndex(mediumIndex)
 { }
 
-Y_FORCE_INLINE bool operator==(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs)
-{
-    return static_cast<const TChunkIdWithIndex&>(lhs) == static_cast<const TChunkIdWithIndex&>(rhs) &&
-        lhs.MediumIndex == rhs.MediumIndex;
-}
-
-Y_FORCE_INLINE bool operator!=(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs)
-{
-    return !(lhs == rhs);
-}
-
 Y_FORCE_INLINE bool operator<(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs)
 {
     const auto& lhs_ = static_cast<const TChunkIdWithIndex&>(lhs);
diff --git a/yt/yt/client/chunk_client/chunk_replica.h b/yt/yt/client/chunk_client/chunk_replica.h
index 081bf1f8f88..11ff43d52c9 100644
--- a/yt/yt/client/chunk_client/chunk_replica.h
+++ b/yt/yt/client/chunk_client/chunk_replica.h
@@ -127,6 +127,8 @@ struct TChunkIdWithIndex
     TChunkId Id;
     int ReplicaIndex;
 
+    bool operator==(const TChunkIdWithIndex& other) const = default;
+
     void Save(TStreamSaveContext& context) const;
     void Load(TStreamLoadContext& context);
 };
@@ -142,24 +144,26 @@ struct TChunkIdWithIndexes
 
     int MediumIndex;
 
+    bool operator==(const TChunkIdWithIndexes& other) const = default;
+
     void Save(TStreamSaveContext& context) const;
     void Load(TStreamLoadContext& context);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool operator==(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs);
-bool operator!=(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs);
 bool operator<(const TChunkIdWithIndex& lhs, const TChunkIdWithIndex& rhs);
 
 TString ToString(const TChunkIdWithIndex& id);
 
-bool operator==(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs);
-bool operator!=(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs);
+////////////////////////////////////////////////////////////////////////////////
+
 bool operator<(const TChunkIdWithIndexes& lhs, const TChunkIdWithIndexes& rhs);
 
 TString ToString(const TChunkIdWithIndexes& id);
 
+////////////////////////////////////////////////////////////////////////////////
+
 //! Returns |true| iff this is an artifact chunk.
 bool IsArtifactChunkId(TChunkId id);
 
diff --git a/yt/yt/client/chunk_client/data_statistics.cpp b/yt/yt/client/chunk_client/data_statistics.cpp
index 5fdcf5dfa90..1dbc2ad5201 100644
--- a/yt/yt/client/chunk_client/data_statistics.cpp
+++ b/yt/yt/client/chunk_client/data_statistics.cpp
@@ -68,7 +68,7 @@ TDataStatistics& operator += (TDataStatistics& lhs, const TDataStatistics& rhs)
     return lhs;
 }
 
-TDataStatistics  operator +  (const TDataStatistics& lhs, const TDataStatistics& rhs)
+TDataStatistics operator +  (const TDataStatistics& lhs, const TDataStatistics& rhs)
 {
     auto result = lhs;
     result += rhs;
@@ -95,11 +95,6 @@ bool operator == (const TDataStatistics& lhs, const TDataStatistics& rhs)
             lhs.unmerged_data_weight() == rhs.unmerged_data_weight());
 }
 
-bool operator != (const TDataStatistics& lhs, const TDataStatistics& rhs)
-{
-    return !(lhs == rhs);
-}
-
 void Serialize(const TDataStatistics& statistics, NYson::IYsonConsumer* consumer)
 {
     // TODO(max42): replace all Item with OptionalItem in order to expose only meaningful
diff --git a/yt/yt/client/chunk_client/data_statistics.h b/yt/yt/client/chunk_client/data_statistics.h
index 4fc0b210c84..880a510c598 100644
--- a/yt/yt/client/chunk_client/data_statistics.h
+++ b/yt/yt/client/chunk_client/data_statistics.h
@@ -24,7 +24,6 @@ TDataStatistics& operator += (TDataStatistics& lhs, const TDataStatistics& rhs);
 TDataStatistics  operator +  (const TDataStatistics& lhs, const TDataStatistics& rhs);
 
 bool operator == (const TDataStatistics& lhs, const TDataStatistics& rhs);
-bool operator != (const TDataStatistics& lhs, const TDataStatistics& rhs);
 
 void Serialize(const TDataStatistics& statistics, NYson::IYsonConsumer* consumer);
 
diff --git a/yt/yt/client/chunk_client/public.h b/yt/yt/client/chunk_client/public.h
index 1482ff2a58f..b6c7b0080ba 100644
--- a/yt/yt/client/chunk_client/public.h
+++ b/yt/yt/client/chunk_client/public.h
@@ -80,6 +80,10 @@ YT_DEFINE_ERROR_ENUM(
     ((LocationDiskWaitingReplacement)        (751))
     ((ChunkMetaCacheFetchFailed)             (752))
     ((LocationMediumIsMisconfigured)         (753))
+    ((DiskIdsMismatched)                     (754))
+    ((LocationDisabled)                      (755))
+    ((DiskFailed)                            (756))
+    ((DiskWaitingReplacement)                (757))
 );
 
 using TChunkId = NObjectClient::TObjectId;
diff --git a/yt/yt/client/driver/command-inl.h b/yt/yt/client/driver/command-inl.h
index d30876cacf8..2b63b335f4f 100644
--- a/yt/yt/client/driver/command-inl.h
+++ b/yt/yt/client/driver/command-inl.h
@@ -426,6 +426,13 @@ void TSelectRowsCommandBase<
             return command->Options.MergeVersionedRows;
         })
         .Optional(/*init*/ false);
+
+    registrar.template ParameterWithUniversalAccessor<int>(
+        "syntax_version",
+        [] (TThis* command) -> auto& {
+            return command->Options.SyntaxVersion;
+        })
+        .Optional(/*init*/ false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/driver/proxy_discovery_cache.cpp b/yt/yt/client/driver/proxy_discovery_cache.cpp
index 1a58eeaa5d8..ef32e71b0ff 100644
--- a/yt/yt/client/driver/proxy_discovery_cache.cpp
+++ b/yt/yt/client/driver/proxy_discovery_cache.cpp
@@ -23,21 +23,6 @@ using namespace NApi::NRpcProxy;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool TProxyDiscoveryRequest::operator==(const TProxyDiscoveryRequest& other) const
-{
-    return
-        Type == other.Type &&
-        Role == other.Role &&
-        AddressType == other.AddressType &&
-        NetworkName == other.NetworkName &&
-        IgnoreBalancers == other.IgnoreBalancers;
-}
-
-bool TProxyDiscoveryRequest::operator!=(const TProxyDiscoveryRequest& other) const
-{
-    return !(*this == other);
-}
-
 TProxyDiscoveryRequest::operator size_t() const
 {
     return MultiHash(
diff --git a/yt/yt/client/driver/proxy_discovery_cache.h b/yt/yt/client/driver/proxy_discovery_cache.h
index f99b75cefa2..6dfb29c0538 100644
--- a/yt/yt/client/driver/proxy_discovery_cache.h
+++ b/yt/yt/client/driver/proxy_discovery_cache.h
@@ -20,8 +20,7 @@ struct TProxyDiscoveryRequest
     TString NetworkName = NApi::NRpcProxy::DefaultNetworkName;
     bool IgnoreBalancers = false;
 
-    bool operator==(const TProxyDiscoveryRequest& other) const;
-    bool operator!=(const TProxyDiscoveryRequest& other) const;
+    bool operator==(const TProxyDiscoveryRequest& other) const = default;
 
     operator size_t() const;
 };
diff --git a/yt/yt/client/hedging/penalty_provider.h b/yt/yt/client/hedging/penalty_provider.h
index 04b1cea826c..b7cf72aee2f 100644
--- a/yt/yt/client/hedging/penalty_provider.h
+++ b/yt/yt/client/hedging/penalty_provider.h
@@ -1,22 +1,20 @@
 #pragma once
 
+#include "public.h"
+
 #include <yt/yt/client/api/client.h>
 
 #include <yt/yt/core/profiling/public.h>
 
-
 // @brief    IPenaltyProvider interface is used in HedgingClient to provide external penalties for different clusters.
 //           Current implementations are DummyPenaltyProvider and ReplicationLagPenaltyProvider.
 namespace NYT::NClient::NHedging::NRpc {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-DECLARE_REFCOUNTED_CLASS(IPenaltyProvider)
-
-class IPenaltyProvider
+struct IPenaltyProvider
     : public TRefCounted
 {
-public:
     virtual NProfiling::TCpuDuration Get(const TString& cluster) = 0;
 };
 
diff --git a/yt/yt/client/hedging/public.h b/yt/yt/client/hedging/public.h
index a1e3250d1bd..1e976eb3927 100644
--- a/yt/yt/client/hedging/public.h
+++ b/yt/yt/client/hedging/public.h
@@ -5,16 +5,18 @@
 
 namespace NYT::NClient::NHedging::NRpc {
 
+////////////////////////////////////////////////////////////////////////////////
+
 using NCache::IClientsCache;
 using NCache::IClientsCachePtr;
 
-////////////////////////////////////////////////////////////////////////////////
-
 DECLARE_REFCOUNTED_STRUCT(TCounter)
 DECLARE_REFCOUNTED_STRUCT(TLagPenaltyProviderCounters)
 
 DECLARE_REFCOUNTED_STRUCT(TClientConfig)
 
+DECLARE_REFCOUNTED_STRUCT(IPenaltyProvider)
+
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT::NClient::NHedging::NRpc
diff --git a/yt/yt/client/node_tracker_client/node_directory.cpp b/yt/yt/client/node_tracker_client/node_directory.cpp
index ab6992b4186..8388b6a302d 100644
--- a/yt/yt/client/node_tracker_client/node_directory.cpp
+++ b/yt/yt/client/node_tracker_client/node_directory.cpp
@@ -371,11 +371,6 @@ bool operator == (const TNodeDescriptor& lhs, const TNodeDescriptor& rhs)
         GetSortedTags(lhs.GetTags()) == GetSortedTags(rhs.GetTags());
 }
 
-bool operator != (const TNodeDescriptor& lhs, const TNodeDescriptor& rhs)
-{
-    return !(lhs == rhs);
-}
-
 bool operator == (const TNodeDescriptor& lhs, const NProto::TNodeDescriptor& rhs)
 {
     if (std::ssize(lhs.Addresses()) != rhs.addresses().entries_size()) {
@@ -421,11 +416,6 @@ bool operator == (const TNodeDescriptor& lhs, const NProto::TNodeDescriptor& rhs
     return true;
 }
 
-bool operator != (const TNodeDescriptor& lhs, const NProto::TNodeDescriptor& rhs)
-{
-    return !(lhs == rhs);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 void TNodeDirectory::MergeFrom(const NProto::TNodeDirectory& source)
diff --git a/yt/yt/client/node_tracker_client/node_directory.h b/yt/yt/client/node_tracker_client/node_directory.h
index a76245fd8b0..8e92564179e 100644
--- a/yt/yt/client/node_tracker_client/node_directory.h
+++ b/yt/yt/client/node_tracker_client/node_directory.h
@@ -85,10 +85,7 @@ const TNodeDescriptor& NullNodeDescriptor();
 ////////////////////////////////////////////////////////////////////////////////
 
 bool operator == (const TNodeDescriptor& lhs, const TNodeDescriptor& rhs);
-bool operator != (const TNodeDescriptor& lhs, const TNodeDescriptor& rhs);
-
 bool operator == (const TNodeDescriptor& lhs, const NProto::TNodeDescriptor& rhs);
-bool operator != (const TNodeDescriptor& lhs, const NProto::TNodeDescriptor& rhs);
 
 void FormatValue(TStringBuilderBase* builder, const TNodeDescriptor& descriptor, TStringBuf spec);
 TString ToString(const TNodeDescriptor& descriptor);
diff --git a/yt/yt/client/object_client/public.cpp b/yt/yt/client/object_client/public.cpp
index 1a780352e5b..11eb2f1a6be 100644
--- a/yt/yt/client/object_client/public.cpp
+++ b/yt/yt/client/object_client/public.cpp
@@ -52,11 +52,6 @@ bool operator == (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs)
     return memcmp(&lhs, &rhs, sizeof (TVersionedObjectId)) == 0;
 }
 
-bool operator != (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs)
-{
-    return !(lhs == rhs);
-}
-
 bool operator < (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs)
 {
     return memcmp(&lhs, &rhs, sizeof (TVersionedObjectId)) < 0;
diff --git a/yt/yt/client/object_client/public.h b/yt/yt/client/object_client/public.h
index cfc7d60105c..b8a8d1ae7b9 100644
--- a/yt/yt/client/object_client/public.h
+++ b/yt/yt/client/object_client/public.h
@@ -391,9 +391,6 @@ TString ToString(const TVersionedObjectId& id);
 //! Compares TVersionedNodeId s for equality.
 bool operator == (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs);
 
-//! Compares TVersionedNodeId s for inequality.
-bool operator != (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs);
-
 //! Compares TVersionedNodeId s for "less than".
 bool operator <  (const TVersionedObjectId& lhs, const TVersionedObjectId& rhs);
 
diff --git a/yt/yt/client/query_client/query_builder.cpp b/yt/yt/client/query_client/query_builder.cpp
index b6658e1076d..1608cd32c00 100644
--- a/yt/yt/client/query_client/query_builder.cpp
+++ b/yt/yt/client/query_client/query_builder.cpp
@@ -61,6 +61,11 @@ void TQueryBuilder::AddGroupByExpression(TString expression, TString alias)
     });
 }
 
+void TQueryBuilder::AddHavingConjunct(TString expression)
+{
+    HavingConjuncts_.push_back(std::move(expression));
+}
+
 void TQueryBuilder::AddOrderByExpression(TString expression)
 {
     OrderByEntries_.push_back(TOrderByEntry{
@@ -112,16 +117,24 @@ TString TQueryBuilder::Build()
         parts.push_back(JoinSeq(" AND ", Parenthesize(WhereConjuncts_)));
     }
 
-    if (!OrderByEntries_.empty()) {
-        parts.push_back("ORDER BY");
-        parts.push_back(JoinSeq(", ", OrderByEntries_));
-    }
-
     if (!GroupByEntries_.empty()) {
         parts.push_back("GROUP BY");
         parts.push_back(JoinSeq(", ", GroupByEntries_));
     }
 
+    if (!HavingConjuncts_.empty()) {
+        if (GroupByEntries_.empty()) {
+            THROW_ERROR_EXCEPTION("Having without group by is not valid");
+        }
+        parts.push_back("HAVING");
+        parts.push_back(JoinSeq(" AND ", Parenthesize(HavingConjuncts_)));
+    }
+
+    if (!OrderByEntries_.empty()) {
+        parts.push_back("ORDER BY");
+        parts.push_back(JoinSeq(", ", OrderByEntries_));
+    }
+
     if (Limit_) {
         parts.push_back(Format("LIMIT %v", *Limit_));
     }
diff --git a/yt/yt/client/query_client/query_builder.h b/yt/yt/client/query_client/query_builder.h
index 1548e749a25..c9653375767 100644
--- a/yt/yt/client/query_client/query_builder.h
+++ b/yt/yt/client/query_client/query_builder.h
@@ -28,6 +28,8 @@ public:
     void AddGroupByExpression(TString expression);
     void AddGroupByExpression(TString expression, TString alias);
 
+    void AddHavingConjunct(TString expression);
+
     void AddOrderByExpression(TString expression);
     void AddOrderByExpression(TString expression, std::optional<EOrderByDirection> direction);
 
@@ -57,6 +59,7 @@ private:
     std::vector<TString> WhereConjuncts_;
     std::vector<TOrderByEntry> OrderByEntries_;
     std::vector<TEntryWithAlias> GroupByEntries_;
+    std::vector<TString> HavingConjuncts_;
     std::optional<i64> Limit_;
 
 private:
diff --git a/yt/yt/client/scheduler/public.h b/yt/yt/client/scheduler/public.h
index 97e408f8355..4fa09f81e74 100644
--- a/yt/yt/client/scheduler/public.h
+++ b/yt/yt/client/scheduler/public.h
@@ -132,7 +132,7 @@ DEFINE_ENUM(EAbortReason,
     ((JobSettlementTimedOut)           ( 50))
     ((NonexistentPoolTree)             ( 51))
     ((WrongSchedulingSegmentModule)    ( 52))
-    ((NodeUnresolved)                  ( 53))
+    ((UnresolvedNodeId)                ( 53))
     ((SchedulingFirst)                 (100))
     ((SchedulingTimeout)               (101))
     ((SchedulingResourceOvercommit)    (102))
diff --git a/yt/yt/client/security_client/acl.cpp b/yt/yt/client/security_client/acl.cpp
index ee06bafcd03..5169d3bf5f5 100644
--- a/yt/yt/client/security_client/acl.cpp
+++ b/yt/yt/client/security_client/acl.cpp
@@ -25,22 +25,6 @@ TSerializableAccessControlEntry::TSerializableAccessControlEntry(
     , InheritanceMode(inheritanceMode)
 { }
 
-bool operator == (const TSerializableAccessControlEntry& lhs, const TSerializableAccessControlEntry& rhs)
-{
-    return
-        lhs.Action == rhs.Action &&
-        lhs.Subjects == rhs.Subjects &&
-        lhs.Permissions == rhs.Permissions &&
-        lhs.InheritanceMode == rhs.InheritanceMode &&
-        lhs.Columns == rhs.Columns &&
-        lhs.Vital == rhs.Vital;
-}
-
-bool operator != (const TSerializableAccessControlEntry& lhs, const TSerializableAccessControlEntry& rhs)
-{
-    return !(lhs == rhs);
-}
-
 // NB(levysotsky): We don't use TYsonStruct here
 // because we want to mirror the TAccessControlList structure,
 // and a vector of TYsonStruct-s cannot be declared (as it has no move constructor).
@@ -187,11 +171,6 @@ bool operator == (const TSerializableAccessControlList& lhs, const TSerializable
     return lhs.Entries == rhs.Entries;
 }
 
-bool operator != (const TSerializableAccessControlList& lhs, const TSerializableAccessControlList& rhs)
-{
-    return !(lhs == rhs);
-}
-
 void Serialize(const TSerializableAccessControlList& acl, NYson::IYsonConsumer* consumer)
 {
     NYTree::Serialize(acl.Entries, consumer);
diff --git a/yt/yt/client/security_client/acl.h b/yt/yt/client/security_client/acl.h
index 5615dff7fac..cbc1d6cb3dc 100644
--- a/yt/yt/client/security_client/acl.h
+++ b/yt/yt/client/security_client/acl.h
@@ -35,10 +35,9 @@ struct TSerializableAccessControlEntry
 
     // Used only for persistence in operation controller. Does not work with Columns and Vital fields.
     void Persist(const TStreamPersistenceContext& context);
-};
 
-bool operator == (const TSerializableAccessControlEntry& lhs, const TSerializableAccessControlEntry& rhs);
-bool operator != (const TSerializableAccessControlEntry& lhs, const TSerializableAccessControlEntry& rhs);
+    bool operator==(const TSerializableAccessControlEntry& other) const = default;
+};
 
 void Serialize(const TSerializableAccessControlEntry& ace, NYson::IYsonConsumer* consumer);
 void Deserialize(TSerializableAccessControlEntry& ace, NYTree::INodePtr node);
@@ -52,7 +51,6 @@ struct TSerializableAccessControlList
 };
 
 bool operator == (const TSerializableAccessControlList& lhs, const TSerializableAccessControlList& rhs);
-bool operator != (const TSerializableAccessControlList& lhs, const TSerializableAccessControlList& rhs);
 
 void Serialize(const TSerializableAccessControlList& acl, NYson::IYsonConsumer* consumer);
 void Deserialize(TSerializableAccessControlList& acl, NYTree::INodePtr node);
diff --git a/yt/yt/client/table_client/column_sort_schema.cpp b/yt/yt/client/table_client/column_sort_schema.cpp
index af14339f889..f2263b2a560 100644
--- a/yt/yt/client/table_client/column_sort_schema.cpp
+++ b/yt/yt/client/table_client/column_sort_schema.cpp
@@ -56,16 +56,6 @@ void Deserialize(TColumnSortSchema& schema, TYsonPullParserCursor* cursor)
     Deserialize(schema, ExtractTo<INodePtr>(cursor));
 }
 
-bool operator == (const TColumnSortSchema& lhs, const TColumnSortSchema& rhs)
-{
-    return lhs.Name == rhs.Name && lhs.SortOrder == rhs.SortOrder;
-}
-
-bool operator != (const TColumnSortSchema& lhs, const TColumnSortSchema& rhs)
-{
-    return !(lhs == rhs);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 void ValidateSortColumns(const std::vector<TColumnSortSchema>& columns)
diff --git a/yt/yt/client/table_client/column_sort_schema.h b/yt/yt/client/table_client/column_sort_schema.h
index cb9e7fc1145..ed7830d779e 100644
--- a/yt/yt/client/table_client/column_sort_schema.h
+++ b/yt/yt/client/table_client/column_sort_schema.h
@@ -12,6 +12,8 @@ struct TColumnSortSchema
     TString Name;
     ESortOrder SortOrder;
 
+    bool operator==(const TColumnSortSchema& other) const = default;
+
     void Persist(const TStreamPersistenceContext& context);
 };
 
@@ -19,9 +21,6 @@ void Serialize(const TColumnSortSchema& schema, NYson::IYsonConsumer* consumer);
 void Deserialize(TColumnSortSchema& schema, NYTree::INodePtr node);
 void Deserialize(TColumnSortSchema& schema, NYson::TYsonPullParserCursor* cursor);
 
-bool operator == (const TColumnSortSchema& lhs, const TColumnSortSchema& rhs);
-bool operator != (const TColumnSortSchema& lhs, const TColumnSortSchema& rhs);
-
 ////////////////////////////////////////////////////////////////////////////////
 
 void ValidateSortColumns(const std::vector<TColumnSortSchema>& columns);
diff --git a/yt/yt/client/table_client/key.cpp b/yt/yt/client/table_client/key.cpp
index 6710dd1e818..895ec5d5ac7 100644
--- a/yt/yt/client/table_client/key.cpp
+++ b/yt/yt/client/table_client/key.cpp
@@ -125,11 +125,6 @@ bool operator==(const TKey& lhs, const TKey& rhs)
     return CompareValueRanges(lhs.Elements(), rhs.Elements()) == 0;
 }
 
-bool operator!=(const TKey& lhs, const TKey& rhs)
-{
-    return !(lhs == rhs);
-}
-
 void FormatValue(TStringBuilderBase* builder, const TKey& key, TStringBuf /*format*/)
 {
     if (key) {
diff --git a/yt/yt/client/table_client/key.h b/yt/yt/client/table_client/key.h
index 58f6bfd6e0f..9fbca56154e 100644
--- a/yt/yt/client/table_client/key.h
+++ b/yt/yt/client/table_client/key.h
@@ -49,7 +49,6 @@ private:
 ////////////////////////////////////////////////////////////////////////////////
 
 bool operator==(const TKey& lhs, const TKey& rhs);
-bool operator!=(const TKey& lhs, const TKey& rhs);
 
 void FormatValue(TStringBuilderBase* builder, const TKey& key, TStringBuf format);
 TString ToString(const TKey& key);
diff --git a/yt/yt/client/table_client/logical_type.cpp b/yt/yt/client/table_client/logical_type.cpp
index 937d3365e84..ea1faec57d3 100644
--- a/yt/yt/client/table_client/logical_type.cpp
+++ b/yt/yt/client/table_client/logical_type.cpp
@@ -971,11 +971,6 @@ TLogicalTypePtr DenullifyLogicalType(const TLogicalTypePtr& type)
     return detagged;
 }
 
-bool operator != (const TLogicalType& lhs, const TLogicalType& rhs)
-{
-    return !(lhs == rhs);
-}
-
 bool operator == (const std::vector<TLogicalTypePtr>& lhs, const std::vector<TLogicalTypePtr>& rhs)
 {
     if (lhs.size() != rhs.size()) {
diff --git a/yt/yt/client/table_client/logical_type.h b/yt/yt/client/table_client/logical_type.h
index 686d449dc01..63750956f2c 100644
--- a/yt/yt/client/table_client/logical_type.h
+++ b/yt/yt/client/table_client/logical_type.h
@@ -111,9 +111,7 @@ void PrintTo(const TLogicalType& type, std::ostream* os);
 void PrintTo(const TLogicalTypePtr& type, std::ostream* os);
 
 bool operator == (const TLogicalType& lhs, const TLogicalType& rhs);
-bool operator != (const TLogicalType& lhs, const TLogicalType& rhs);
 bool operator == (const TLogicalTypePtr& lhs, const TLogicalTypePtr& rhs) = delete;
-bool operator != (const TLogicalTypePtr& lhs, const TLogicalTypePtr& rhs) = delete;
 
 void ValidateLogicalType(const TComplexTypeFieldDescriptor& descriptor, std::optional<int> depthLimit = std::nullopt);
 
diff --git a/yt/yt/client/table_client/public.h b/yt/yt/client/table_client/public.h
index 8ecb077fbac..eeb18fd5067 100644
--- a/yt/yt/client/table_client/public.h
+++ b/yt/yt/client/table_client/public.h
@@ -93,7 +93,7 @@ constexpr i64 MaxAnyValueLength = 16_MB;
 constexpr i64 MaxCompositeValueLength = 16_MB;
 constexpr i64 MaxServerVersionedRowDataWeight = 512_MB;
 constexpr i64 MaxClientVersionedRowDataWeight = 128_MB;
-constexpr int MaxKeyColumnCountInDynamicTable = 32;
+constexpr int MaxKeyColumnCountInDynamicTable = 64;
 constexpr int MaxTimestampCountPerRow = std::numeric_limits<ui16>::max();
 
 static_assert(
@@ -420,6 +420,10 @@ DEFINE_ENUM(ESchemaCompatibility,
 
 static constexpr TMasterTableSchemaId NullTableSchemaId = TMasterTableSchemaId();
 
+using TDynamicTableKeyMask = ui64;
+
+static_assert(sizeof(TDynamicTableKeyMask) * 8 == MaxKeyColumnCountInDynamicTable);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT::NTableClient
diff --git a/yt/yt/client/table_client/schema.cpp b/yt/yt/client/table_client/schema.cpp
index 013b698a26c..733d997ffc9 100644
--- a/yt/yt/client/table_client/schema.cpp
+++ b/yt/yt/client/table_client/schema.cpp
@@ -1513,7 +1513,8 @@ void ValidateColumnSchema(
         "max",
         "first",
         "xdelta",
-        "_yt_replica_set",
+        "_yt_stored_replica_set",
+        "_yt_last_seen_replica_set",
     };
 
     const auto& stableName = columnSchema.StableName();
diff --git a/yt/yt/client/table_client/unversioned_row.cpp b/yt/yt/client/table_client/unversioned_row.cpp
index 296f9c73559..4b380ec5710 100644
--- a/yt/yt/client/table_client/unversioned_row.cpp
+++ b/yt/yt/client/table_client/unversioned_row.cpp
@@ -439,11 +439,6 @@ bool operator == (const TUnversionedValue& lhs, const TUnversionedValue& rhs)
     return CompareRowValues(lhs, rhs) == 0;
 }
 
-bool operator != (const TUnversionedValue& lhs, const TUnversionedValue& rhs)
-{
-    return CompareRowValues(lhs, rhs) != 0;
-}
-
 bool operator <= (const TUnversionedValue& lhs, const TUnversionedValue& rhs)
 {
     return CompareRowValues(lhs, rhs) <= 0;
@@ -503,11 +498,6 @@ bool operator == (TUnversionedRow lhs, TUnversionedRow rhs)
     return CompareRows(lhs, rhs) == 0;
 }
 
-bool operator != (TUnversionedRow lhs, TUnversionedRow rhs)
-{
-    return CompareRows(lhs, rhs) != 0;
-}
-
 bool operator <= (TUnversionedRow lhs, TUnversionedRow rhs)
 {
     return CompareRows(lhs, rhs) <= 0;
@@ -535,11 +525,6 @@ bool operator == (TUnversionedRow lhs, const TUnversionedOwningRow& rhs)
     return CompareRows(lhs, rhs) == 0;
 }
 
-bool operator != (TUnversionedRow lhs, const TUnversionedOwningRow& rhs)
-{
-    return CompareRows(lhs, rhs) != 0;
-}
-
 bool operator <= (TUnversionedRow lhs, const TUnversionedOwningRow& rhs)
 {
     return CompareRows(lhs, rhs) <= 0;
diff --git a/yt/yt/client/table_client/unversioned_row.h b/yt/yt/client/table_client/unversioned_row.h
index 0fc64203965..ccfa9e691d7 100644
--- a/yt/yt/client/table_client/unversioned_row.h
+++ b/yt/yt/client/table_client/unversioned_row.h
@@ -235,7 +235,6 @@ int CompareRowValues(const TUnversionedValue& lhs, const TUnversionedValue& rhs)
 //! Derived comparison operators.
 //! Note that these ignore flags.
 bool operator == (const TUnversionedValue& lhs, const TUnversionedValue& rhs);
-bool operator != (const TUnversionedValue& lhs, const TUnversionedValue& rhs);
 bool operator <= (const TUnversionedValue& lhs, const TUnversionedValue& rhs);
 bool operator <  (const TUnversionedValue& lhs, const TUnversionedValue& rhs);
 bool operator >= (const TUnversionedValue& lhs, const TUnversionedValue& rhs);
@@ -260,7 +259,6 @@ int CompareRows(
 //! Derived comparison operators.
 //! Note that these ignore aggregate flags.
 bool operator == (TUnversionedRow lhs, TUnversionedRow rhs);
-bool operator != (TUnversionedRow lhs, TUnversionedRow rhs);
 bool operator <= (TUnversionedRow lhs, TUnversionedRow rhs);
 bool operator <  (TUnversionedRow lhs, TUnversionedRow rhs);
 bool operator >= (TUnversionedRow lhs, TUnversionedRow rhs);
diff --git a/yt/yt/client/unittests/query_builder_ut.cpp b/yt/yt/client/unittests/query_builder_ut.cpp
index 30b8045b5c3..e47027b23fc 100644
--- a/yt/yt/client/unittests/query_builder_ut.cpp
+++ b/yt/yt/client/unittests/query_builder_ut.cpp
@@ -27,6 +27,9 @@ TEST(TQueryBuilderTest, Simple)
     b.AddGroupByExpression("x + y * z", "group_expr");
     b.AddGroupByExpression("x - 1");
 
+    b.AddHavingConjunct("group_expr > 42");
+    b.AddHavingConjunct("group_expr < 420");
+
     b.SetLimit(43);
 
     EXPECT_EQ(xIndex, 0);
@@ -37,8 +40,9 @@ TEST(TQueryBuilderTest, Simple)
         "(x), (y) AS y_alias, (z) "
         "FROM [//t] "
         "WHERE (x > y_alias) AND (y = 177 OR y % 2 = 0) "
-        "ORDER BY (z) ASC, (x) DESC, (x + y) DESC, (z - y_alias) "
         "GROUP BY (x + y * z) AS group_expr, (x - 1) "
+        "HAVING (group_expr > 42) AND (group_expr < 420) "
+        "ORDER BY (z) ASC, (x) DESC, (x + y) DESC, (z - y_alias) "
         "LIMIT 43");
 }
 
diff --git a/yt/yt/core/actions/callback_internal.h b/yt/yt/core/actions/callback_internal.h
index 7eab2be430f..735e350885f 100644
--- a/yt/yt/core/actions/callback_internal.h
+++ b/yt/yt/core/actions/callback_internal.h
@@ -65,7 +65,7 @@ public:
     //! Returns |true| iff this callback is not equal to the other (which may be null).
     bool operator != (const TCallbackBase& other) const;
 #else
-    bool operator== (const TCallbackBase&) const = default;
+    bool operator== (const TCallbackBase& other) const = default;
 #endif
 
 protected:
diff --git a/yt/yt/core/actions/future-inl.h b/yt/yt/core/actions/future-inl.h
index 5073d404ba2..51289611b0b 100644
--- a/yt/yt/core/actions/future-inl.h
+++ b/yt/yt/core/actions/future-inl.h
@@ -939,11 +939,6 @@ inline bool operator==(const TCancelable& lhs, const TCancelable& rhs)
     return lhs.Impl_ == rhs.Impl_;
 }
 
-inline bool operator!=(const TCancelable& lhs, const TCancelable& rhs)
-{
-    return !(lhs == rhs);
-}
-
 inline void swap(TCancelable& lhs, TCancelable& rhs)
 {
     using std::swap;
@@ -957,12 +952,6 @@ bool operator==(const TFuture<T>& lhs, const TFuture<T>& rhs)
 }
 
 template <class T>
-bool operator!=(const TFuture<T>& lhs, const TFuture<T>& rhs)
-{
-    return !(lhs == rhs);
-}
-
-template <class T>
 void swap(TFuture<T>& lhs, TFuture<T>& rhs)
 {
     using std::swap;
@@ -976,12 +965,6 @@ bool operator==(const TPromise<T>& lhs, const TPromise<T>& rhs)
 }
 
 template <class T>
-bool operator!=(const TPromise<T>& lhs, const TPromise<T>& rhs)
-{
-    return *(lhs == rhs);
-}
-
-template <class T>
 void swap(TPromise<T>& lhs, TPromise<T>& rhs)
 {
     using std::swap;
diff --git a/yt/yt/core/actions/future.h b/yt/yt/core/actions/future.h
index aa31d8e690d..6656dd47e94 100644
--- a/yt/yt/core/actions/future.h
+++ b/yt/yt/core/actions/future.h
@@ -97,15 +97,11 @@ template <class T>
 template <class T>
 bool operator==(const TFuture<T>& lhs, const TFuture<T>& rhs);
 template <class T>
-bool operator!=(const TFuture<T>& lhs, const TFuture<T>& rhs);
-template <class T>
 void swap(TFuture<T>& lhs, TFuture<T>& rhs);
 
 template <class T>
 bool operator==(const TPromise<T>& lhs, const TPromise<T>& rhs);
 template <class T>
-bool operator!=(const TPromise<T>& lhs, const TPromise<T>& rhs);
-template <class T>
 void swap(TPromise<T>& lhs, TPromise<T>& rhs);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -153,7 +149,6 @@ private:
     TIntrusivePtr<NYT::NDetail::TCancelableStateBase> Impl_;
 
     friend bool operator==(const TCancelable& lhs, const TCancelable& rhs);
-    friend bool operator!=(const TCancelable& lhs, const TCancelable& rhs);
     friend void swap(TCancelable& lhs, TCancelable& rhs);
     template <class U>
     friend struct ::THash;
@@ -322,8 +317,6 @@ protected:
     template <class U>
     friend bool operator==(const TFuture<U>& lhs, const TFuture<U>& rhs);
     template <class U>
-    friend bool operator!=(const TFuture<U>& lhs, const TFuture<U>& rhs);
-    template <class U>
     friend void swap(TFuture<U>& lhs, TFuture<U>& rhs);
     template <class U>
     friend struct ::THash;
@@ -486,8 +479,6 @@ protected:
     template <class U>
     friend bool operator==(const TPromise<U>& lhs, const TPromise<U>& rhs);
     template <class U>
-    friend bool operator!=(const TPromise<U>& lhs, const TPromise<U>& rhs);
-    template <class U>
     friend void swap(TPromise<U>& lhs, TPromise<U>& rhs);
     template <class U>
     friend struct ::hash;
diff --git a/yt/yt/core/actions/invoker_pool-inl.h b/yt/yt/core/actions/invoker_pool-inl.h
index fe467b85be9..f26d98df9c7 100644
--- a/yt/yt/core/actions/invoker_pool-inl.h
+++ b/yt/yt/core/actions/invoker_pool-inl.h
@@ -19,7 +19,7 @@ struct TDummyInvokerHolder
 // TInvokerPoolWrapper with TDummyInvokerHolder is used in tests.
 template <class TInvoker, class TInvokerHolder = TDummyInvokerHolder>
 class TInvokerPoolWrapper
-    : public IGenericInvokerPool<TInvoker>
+    : public TGenericInvokerPool<TInvoker>
 {
 private:
     using TInvokerPtr = TIntrusivePtr<TInvoker>;
@@ -51,9 +51,34 @@ private:
 
 } // namespace NDetail
 
+template <class TInvoker>
+const TIntrusivePtr<TInvoker>& TGenericInvokerPool<TInvoker>::GetInvoker(int index) const
+{
+    return DoGetInvoker(index);
+}
+
+template <class TInvoker>
+template <class E>
+    requires TEnumTraits<E>::IsEnum
+const TIntrusivePtr<TInvoker>& TGenericInvokerPool<TInvoker>::GetInvoker(E index) const
+{
+    return DoGetInvoker(ToUnderlying(index));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+template <class E>
+    requires TEnumTraits<E>::IsEnum
+TDiagnosableInvokerPool::TInvokerStatistics TDiagnosableInvokerPool::GetInvokerStatistics(E index) const
+{
+    return DoGetInvokerStatistics(ToUnderlying(index));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 template <class TInvokerFunctor, class TInputInvoker, class TOutputInvoker>
-TIntrusivePtr<IGenericInvokerPool<TOutputInvoker>> TransformInvokerPool(
-    TIntrusivePtr<IGenericInvokerPool<TInputInvoker>> inputInvokerPool,
+TIntrusivePtr<TGenericInvokerPool<TOutputInvoker>> TransformInvokerPool(
+    TIntrusivePtr<TGenericInvokerPool<TInputInvoker>> inputInvokerPool,
     TInvokerFunctor&& functor)
 {
     const auto invokerCount = inputInvokerPool->GetSize();
@@ -64,7 +89,7 @@ TIntrusivePtr<IGenericInvokerPool<TOutputInvoker>> TransformInvokerPool(
         invokers.push_back(functor(inputInvokerPool->GetInvoker(invokerIndex)));
     }
 
-    return New<NYT::NDetail::TInvokerPoolWrapper<TOutputInvoker, TIntrusivePtr<IGenericInvokerPool<TInputInvoker>>>>(
+    return New<NYT::NDetail::TInvokerPoolWrapper<TOutputInvoker, TIntrusivePtr<TGenericInvokerPool<TInputInvoker>>>>(
         std::move(invokers),
         std::move(inputInvokerPool));
 }
diff --git a/yt/yt/core/actions/invoker_pool.cpp b/yt/yt/core/actions/invoker_pool.cpp
index 60e6153f88f..a493f9abe23 100644
--- a/yt/yt/core/actions/invoker_pool.cpp
+++ b/yt/yt/core/actions/invoker_pool.cpp
@@ -7,6 +7,13 @@ namespace NYT {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+TDiagnosableInvokerPool::TInvokerStatistics TDiagnosableInvokerPool::GetInvokerStatistics(int index) const
+{
+    return DoGetInvokerStatistics(index);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 TFuture<void> SuspendInvokerPool(const ISuspendableInvokerPoolPtr& invokerPool)
 {
     const auto size = invokerPool->GetSize();
diff --git a/yt/yt/core/actions/invoker_pool.h b/yt/yt/core/actions/invoker_pool.h
index 68441ce8d8f..535f926ea96 100644
--- a/yt/yt/core/actions/invoker_pool.h
+++ b/yt/yt/core/actions/invoker_pool.h
@@ -17,7 +17,7 @@ namespace NYT {
  *  invoker types: see below IInvokerPool, IPrioritizedInvokerPool, ISuspendableInvokerPool, etc.
 */
 template <class TInvoker>
-class IGenericInvokerPool
+class TGenericInvokerPool
     : public virtual TRefCounted
 {
 public:
@@ -26,19 +26,13 @@ public:
 
     //! Returns reference to the invoker from the underlying storage by the integer #index.
     //! Parameter #index is supposed to take values in the [0, implementation-defined limit) range.
-    const TIntrusivePtr<TInvoker>& GetInvoker(int index) const
-    {
-        return DoGetInvoker(index);
-    }
+    const TIntrusivePtr<TInvoker>& GetInvoker(int index) const;
 
     //! Returns reference to the invoker from the underlying storage by the enum #index.
     //! Parameter #index is supposed to take values in the [0, implementation-defined limit) range.
     template <class E>
         requires TEnumTraits<E>::IsEnum
-    const TIntrusivePtr<TInvoker>& GetInvoker(E index) const
-    {
-        return DoGetInvoker(ToUnderlying(index));
-    }
+    const TIntrusivePtr<TInvoker>& GetInvoker(E index) const;
 
 protected:
     //! Returns reference to the invoker from the underlying storage by the integer #index.
@@ -61,7 +55,7 @@ void ResumeInvokerPool(const ISuspendableInvokerPoolPtr& suspendableInvokerPool)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-class IDiagnosableInvokerPool
+class TDiagnosableInvokerPool
     : public IInvokerPool
 {
 public:
@@ -75,19 +69,13 @@ public:
 
     //! Returns statistics of the invoker by the integer #index.
     //! Parameter #index is supposed to take values in the [0, implementation-defined limit) range.
-    TInvokerStatistics GetInvokerStatistics(int index) const
-    {
-        return DoGetInvokerStatistics(index);
-    }
+    TInvokerStatistics GetInvokerStatistics(int index) const;
 
     //! Returns statistics of the invoker by the integer #index.
     //! Parameter #index is supposed to take values in the [0, implementation-defined limit) range.
     template <class E>
         requires TEnumTraits<E>::IsEnum
-    TInvokerStatistics GetInvokerStatistics(E index) const
-    {
-        return DoGetInvokerStatistics(ToUnderlying(index));
-    }
+    TInvokerStatistics GetInvokerStatistics(E index) const;
 
     virtual void UpdateActionTimeAggregatorParameters(THistoricUsageAggregationParameters newParameters) = 0;
 
@@ -95,7 +83,7 @@ protected:
     virtual TInvokerStatistics DoGetInvokerStatistics(int index) const = 0;
 };
 
-DEFINE_REFCOUNTED_TYPE(IDiagnosableInvokerPool)
+DEFINE_REFCOUNTED_TYPE(TDiagnosableInvokerPool)
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -121,8 +109,8 @@ template <
     class TInvokerFunctor,
     class TInputInvoker,
     class TOutputInvoker = typename NDetail::TTransformInvokerPoolHelper<TInvokerFunctor, TInputInvoker>::TOutputInvoker>
-TIntrusivePtr<IGenericInvokerPool<TOutputInvoker>> TransformInvokerPool(
-    TIntrusivePtr<IGenericInvokerPool<TInputInvoker>> inputInvokerPool,
+TIntrusivePtr<TGenericInvokerPool<TOutputInvoker>> TransformInvokerPool(
+    TIntrusivePtr<TGenericInvokerPool<TInputInvoker>> inputInvokerPool,
     TInvokerFunctor&& functor);
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/actions/public.h b/yt/yt/core/actions/public.h
index 803946a85b9..3f157b8572d 100644
--- a/yt/yt/core/actions/public.h
+++ b/yt/yt/core/actions/public.h
@@ -34,16 +34,16 @@ DECLARE_REFCOUNTED_STRUCT(IPrioritizedInvoker)
 DECLARE_REFCOUNTED_STRUCT(ISuspendableInvoker)
 
 template <class TInvoker>
-class IGenericInvokerPool;
+class TGenericInvokerPool;
 
-using IInvokerPool = IGenericInvokerPool<IInvoker>;
-using IPrioritizedInvokerPool = IGenericInvokerPool<IPrioritizedInvoker>;
-using ISuspendableInvokerPool = IGenericInvokerPool<ISuspendableInvoker>;
+using IInvokerPool = TGenericInvokerPool<IInvoker>;
+using IPrioritizedInvokerPool = TGenericInvokerPool<IPrioritizedInvoker>;
+using ISuspendableInvokerPool = TGenericInvokerPool<ISuspendableInvoker>;
 
 DECLARE_REFCOUNTED_TYPE(IInvokerPool)
 DECLARE_REFCOUNTED_TYPE(IPrioritizedInvokerPool)
 DECLARE_REFCOUNTED_TYPE(ISuspendableInvokerPool)
-DECLARE_REFCOUNTED_CLASS(IDiagnosableInvokerPool)
+DECLARE_REFCOUNTED_CLASS(TDiagnosableInvokerPool)
 
 DECLARE_REFCOUNTED_CLASS(TCancelableContext)
 
diff --git a/yt/yt/core/bus/tcp/connection.cpp b/yt/yt/core/bus/tcp/connection.cpp
index 02c82096518..c602964133b 100644
--- a/yt/yt/core/bus/tcp/connection.cpp
+++ b/yt/yt/core/bus/tcp/connection.cpp
@@ -793,6 +793,12 @@ void TTcpConnection::UnsubscribeTerminated(const TCallback<void(const TError&)>&
 
 void TTcpConnection::OnEvent(EPollControl control)
 {
+    auto multiplexingBand = MultiplexingBand_.load();
+    if (multiplexingBand != ActualMultiplexingBand_) {
+        Poller_->SetExecutionPool(this, FormatEnum(multiplexingBand));
+        ActualMultiplexingBand_ = multiplexingBand;
+    }
+
     EPollControl action;
     {
         auto rawPendingControl = PendingControl_.load(std::memory_order::acquire);
diff --git a/yt/yt/core/bus/tcp/connection.h b/yt/yt/core/bus/tcp/connection.h
index 722f3308db7..39c5dea4d23 100644
--- a/yt/yt/core/bus/tcp/connection.h
+++ b/yt/yt/core/bus/tcp/connection.h
@@ -224,6 +224,8 @@ private:
 
     std::atomic<EMultiplexingBand> MultiplexingBand_ = EMultiplexingBand::Default;
 
+    EMultiplexingBand ActualMultiplexingBand_ = EMultiplexingBand::Default;
+
     TAtomicObject<TError> Error_;
 
     NNet::IAsyncDialerSessionPtr DialerSession_;
diff --git a/yt/yt/core/bus/tcp/dispatcher.h b/yt/yt/core/bus/tcp/dispatcher.h
index 8a64a6af1dc..6cc5f9f7f02 100644
--- a/yt/yt/core/bus/tcp/dispatcher.h
+++ b/yt/yt/core/bus/tcp/dispatcher.h
@@ -12,7 +12,7 @@
 
 #include <yt/yt/core/ytree/public.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NBus {
 
diff --git a/yt/yt/core/concurrency/fair_share_invoker_pool.cpp b/yt/yt/core/concurrency/fair_share_invoker_pool.cpp
index 14ff41ab5d2..68e80cdff07 100644
--- a/yt/yt/core/concurrency/fair_share_invoker_pool.cpp
+++ b/yt/yt/core/concurrency/fair_share_invoker_pool.cpp
@@ -122,7 +122,7 @@ IFairShareCallbackQueuePtr CreateFairShareCallbackQueue(int bucketCount)
 ////////////////////////////////////////////////////////////////////////////////
 
 class TFairShareInvokerPool
-    : public IDiagnosableInvokerPool
+    : public TDiagnosableInvokerPool
 {
 public:
     TFairShareInvokerPool(
@@ -383,7 +383,7 @@ private:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-IDiagnosableInvokerPoolPtr CreateFairShareInvokerPool(
+TDiagnosableInvokerPoolPtr CreateFairShareInvokerPool(
     IInvokerPtr underlyingInvoker,
     int invokerCount,
     TFairShareCallbackQueueFactory callbackQueueFactory,
diff --git a/yt/yt/core/concurrency/fair_share_invoker_pool.h b/yt/yt/core/concurrency/fair_share_invoker_pool.h
index 966a8457788..db96389ca84 100644
--- a/yt/yt/core/concurrency/fair_share_invoker_pool.h
+++ b/yt/yt/core/concurrency/fair_share_invoker_pool.h
@@ -48,7 +48,7 @@ using TFairShareCallbackQueueFactory = std::function<IFairShareCallbackQueuePtr(
 //! so use with care in case of multiple workers in the underlying invoker.
 //! Factory #callbackQueueFactory is used by the invoker pool for creation of the storage for callbacks.
 //! Ability to specify #callbackQueueFactory is provided for testing purposes.
-IDiagnosableInvokerPoolPtr CreateFairShareInvokerPool(
+TDiagnosableInvokerPoolPtr CreateFairShareInvokerPool(
     IInvokerPtr underlyingInvoker,
     int invokerCount,
     TFairShareCallbackQueueFactory callbackQueueFactory = CreateFairShareCallbackQueue,
diff --git a/yt/yt/core/concurrency/poller.h b/yt/yt/core/concurrency/poller.h
index d9c25295bb5..30340eea855 100644
--- a/yt/yt/core/concurrency/poller.h
+++ b/yt/yt/core/concurrency/poller.h
@@ -82,7 +82,10 @@ struct IPoller
 
     //! Tries to register a pollable entity but does not arm the poller yet.
     //! Returns |false| if the poller is already shutting down.
-    virtual bool TryRegister(const IPollablePtr& pollable) = 0;
+    virtual bool TryRegister(const IPollablePtr& pollable, TString poolName = "default") = 0;
+
+    //! Method must be called inside OnEvent.
+    virtual void SetExecutionPool(const IPollablePtr& pollable, TString poolName) = 0;
 
     //! Unregisters the previously registered entity.
     /*!
diff --git a/yt/yt/core/concurrency/retrying_periodic_executor.cpp b/yt/yt/core/concurrency/retrying_periodic_executor.cpp
index 3be49c6001d..697a7939fb0 100644
--- a/yt/yt/core/concurrency/retrying_periodic_executor.cpp
+++ b/yt/yt/core/concurrency/retrying_periodic_executor.cpp
@@ -23,7 +23,11 @@ TRetryingInvocationTimePolicy::TRetryingInvocationTimePolicy(
     const TOptions& options)
     : TDefaultInvocationTimePolicy(options)
     , Backoff_(options)
-{ }
+{
+    CachedBackoffDuration_.store(options.MinBackoff, std::memory_order::relaxed);
+    CachedBackoffMultiplier_.store(options.BackoffJitter, std::memory_order::relaxed);
+    CachedBackoffJitter_.store(options.BackoffJitter,std::memory_order::relaxed);
+}
 
 void TRetryingInvocationTimePolicy::ProcessResult(TError result)
 {
@@ -66,14 +70,21 @@ void TRetryingInvocationTimePolicy::SetOptions(
     }
 
     if (backoffOptions) {
+        Backoff_.UpdateOptions(*backoffOptions);
+
+        if (!IsInBackoffMode()) {
+            Backoff_.Restart();
+        }
+
+        CachedBackoffDuration_.store(
+            Backoff_.GetBackoff(),
+            std::memory_order::relaxed);
         CachedBackoffMultiplier_.store(
             backoffOptions->BackoffMultiplier,
             std::memory_order::relaxed);
         CachedBackoffJitter_.store(
             backoffOptions->BackoffJitter,
             std::memory_order::relaxed);
-
-        Backoff_.UpdateOptions(*backoffOptions);
     }
 }
 
diff --git a/yt/yt/core/concurrency/thread_pool_poller.cpp b/yt/yt/core/concurrency/thread_pool_poller.cpp
index f93d507673a..4aa261a5486 100644
--- a/yt/yt/core/concurrency/thread_pool_poller.cpp
+++ b/yt/yt/core/concurrency/thread_pool_poller.cpp
@@ -1,9 +1,6 @@
-#include "thread_pool.h"
 #include "poller.h"
 #include "thread_pool_poller.h"
 #include "private.h"
-#include "profiling_helpers.h"
-#include "scheduler_thread.h"
 #include "two_level_fair_share_thread_pool.h"
 #include "new_fair_share_thread_pool.h"
 
@@ -13,6 +10,8 @@
 
 #include <yt/yt/core/profiling/tscp.h>
 
+#include <yt/yt/core/threading/thread.h>
+
 #include <library/cpp/yt/threading/notification_handle.h>
 
 #include <library/cpp/yt/memory/ref_tracked.h>
@@ -40,10 +39,16 @@ class TThreadPoolPoller;
 
 namespace {
 
+DEFINE_ENUM(EFinishResult,
+    (None)
+    (Repeat)
+    (Shutdown)
+);
+
 class TCookieState
 {
 public:
-    // AquireControl is called from poller thread.
+    // AquireControl is called from poller thread and from Retry.
     bool AquireControl(ui32 control)
     {
         auto currentState = State_.load();
@@ -55,19 +60,17 @@ public:
             if ((static_cast<ui32>(currentState) & control) == control) {
                 return false;
             }
-        } while (!State_.compare_exchange_weak(currentState, (currentState | static_cast<ui64>(control)) + RefValue));
+        } while (!State_.compare_exchange_weak(currentState, currentState | static_cast<ui64>(control) | RunningFlag));
 
-        return true;
+        return !(currentState & RunningFlag);
     }
 
-    void ResetControl(ui32 control)
+    // Resets control and returns previous value.
+    ui32 ResetControl()
     {
         auto currentState = State_.load();
-        do {
-            if (!(static_cast<ui32>(currentState) & control)) {
-                break;
-            }
-        } while (!State_.compare_exchange_weak(currentState, currentState & ~static_cast<ui64>(control)));
+        while (!State_.compare_exchange_weak(currentState, currentState & (UnregisterFlag | RunningFlag)));
+        return static_cast<ui32>(currentState);
     }
 
     // Returns destroy flag.
@@ -81,29 +84,36 @@ public:
             }
         } while (!State_.compare_exchange_weak(currentState, currentState | UnregisterFlag));
 
-        // No refs.
-        return currentState == 0;
+        return !(currentState & RunningFlag);
     }
 
-    // Returns destroy flag.
-    bool ReleaseRef()
+    EFinishResult Finish()
     {
-        auto prevState = State_.fetch_sub(RefValue);
+        auto currentState = State_.load();
 
-        YT_VERIFY(prevState >= RefValue);
-        auto currentState = prevState - RefValue;
-        if ((currentState >> ControlShift) == 1) {
-            // Verify that control flags are empty when there are no refs and unregister flag is set.
-            YT_VERIFY(static_cast<ui32>(currentState) == 0);
-        }
+        YT_VERIFY(currentState & RunningFlag);
+
+        do {
+            if (currentState & UnregisterFlag) {
+                // Run destroy.
+                return EFinishResult::Shutdown;
+            }
+
+            if (currentState & ~(UnregisterFlag | RunningFlag)) {
+                // Has state. Retry.
+                return EFinishResult::Repeat;
+            }
+
+        } while (!State_.compare_exchange_weak(currentState, currentState & ~RunningFlag));
 
-        return prevState == (RefValue | UnregisterFlag);
+        return EFinishResult::None;
     }
 
 private:
     static constexpr auto ControlShift = sizeof(ui32) * 8;
     static constexpr ui64 UnregisterFlag = 1ULL << ControlShift;
-    static constexpr ui64 RefValue = UnregisterFlag * 2;
+    static constexpr ui64 RunningFlag = 1ULL << (ControlShift + 1);
+
     // No contention expected when accessing this atomic variable.
     // So we can safely (regarding to performance) use CAS.
     std::atomic<ui64> State_ = 0;
@@ -139,6 +149,7 @@ EContPoll ToImplControl(EPollControl control)
 {
     int implControl = CONT_POLL_ONE_SHOT;
     if (Any(control & EPollControl::EdgeTriggered)) {
+        // N.B. Edge-triggered mode disables one shot mode.
         implControl = CONT_POLL_EDGE_TRIGGERED;
     }
     if (Any(control & EPollControl::BacklogEmpty)) {
@@ -204,7 +215,7 @@ public:
         FairShareThreadPool_->Configure(threadCount);
     }
 
-    bool TryRegister(const IPollablePtr& pollable) override
+    bool TryRegister(const IPollablePtr& pollable, TString poolName) override
     {
         // FIXME(lukyan): Enqueueing in register queue may happen after stopping.
         // Create cookie when dequeueing from register queue?
@@ -214,7 +225,9 @@ public:
         }
 
         auto cookie = New<TPollableCookie>(this);
-        cookie->Invoker = FairShareThreadPool_->GetInvoker("main", Format("%v", pollable.Get()));
+        cookie->Invoker = FairShareThreadPool_->GetInvoker(
+            poolName,
+            Format("%v", pollable.Get()));
         pollable->SetCookie(std::move(cookie));
         RegisterQueue_.Enqueue(pollable);
 
@@ -224,6 +237,14 @@ public:
         return true;
     }
 
+    void SetExecutionPool(const IPollablePtr& pollable, TString poolName) override
+    {
+        auto* cookie = TPollableCookie::FromPollable(pollable.Get());
+        cookie->Invoker = FairShareThreadPool_->GetInvoker(
+            poolName,
+            Format("%v", pollable.Get()));
+    }
+
     // TODO(lukyan): Method OnShutdown in the interface and returned future are redundant.
     // Shutdown can be done by subscribing returned future or some promise can be set inside OnShutdown.
     TFuture<void> Unregister(const IPollablePtr& pollable) override
@@ -257,10 +278,7 @@ public:
 
     void Retry(const IPollablePtr& pollable) override
     {
-        if (auto guard = TryAcquireRunEventGuard(pollable.Get(), EPollControl::Retry)) {
-            auto* cookie = TPollableCookie::FromPollable(pollable.Get());
-            cookie->Invoker->Invoke(BIND(std::move(guard)));
-        }
+        ScheduleEvent(pollable, EPollControl::Retry);
     }
 
     IInvokerPtr GetInvoker() const override
@@ -274,34 +292,17 @@ public:
     }
 
 private:
-    static void DoShutdownPollable(TPollableCookie* cookie, IPollable* pollable)
-    {
-        // Poller guarantees that OnShutdown is never executed concurrently with OnEvent().
-        // Otherwise it will be removed in TRunEventGuard.
-        RunNoExcept([&] {
-            pollable->OnShutdown();
-        });
-
-        cookie->UnregisterPromise.Set();
-        cookie->Invoker.Reset();
-        auto pollerThread = std::move(cookie->PollerThread);
-        pollerThread->UnregisterQueue_.Enqueue(pollable);
-        pollerThread->WakeupHandle_.Raise();
-    }
-
     class TRunEventGuard
     {
     public:
         TRunEventGuard() = default;
 
-        TRunEventGuard(IPollable* pollable, EPollControl control)
+        explicit TRunEventGuard(IPollable* pollable)
             : Pollable_(pollable)
-            , Control_(control)
         { }
 
         explicit TRunEventGuard(TRunEventGuard&& other)
             : Pollable_(std::move(other.Pollable_))
-            , Control_(std::move(other.Control_))
         {
             other.Pollable_ = nullptr;
         }
@@ -318,34 +319,38 @@ private:
             }
 
             auto* cookie = TPollableCookie::FromPollable(Pollable_);
-            cookie->ResetControl(ToUnderlying(Control_));
+            cookie->ResetControl();
             Destroy(Pollable_);
         }
 
-        explicit operator bool() const
-        {
-            return static_cast<bool>(Pollable_);
-        }
-
         void operator()()
         {
             auto* cookie = TPollableCookie::FromPollable(Pollable_);
-            cookie->ResetControl(ToUnderlying(Control_));
-
-            Pollable_->OnEvent(Control_);
+            auto control = EPollControl(cookie->ResetControl());
+            RunNoExcept([&] {
+                Pollable_->OnEvent(control);
+            });
             Destroy(Pollable_);
             Pollable_ = nullptr;
         }
 
     private:
         IPollable* Pollable_ = nullptr;
-        EPollControl Control_ = EPollControl::None;
 
         static void Destroy(IPollable* pollable)
         {
             auto* cookie = TPollableCookie::FromPollable(pollable);
-            if (cookie->ReleaseRef()) {
-                DoShutdownPollable(cookie, pollable);
+
+            auto result = cookie->Finish();
+            switch (result) {
+                case EFinishResult::Shutdown:
+                    DoShutdownPollable(cookie, pollable);
+                    break;
+                case EFinishResult::Repeat:
+                    cookie->Invoker->Invoke(BIND(TRunEventGuard(pollable)));
+                    break;
+                case EFinishResult::None:
+                    break;
             }
         }
     };
@@ -371,16 +376,29 @@ private:
 
     std::array<TPollerImpl::TEvent, MaxEventsPerPoll> PooledImplEvents_;
 
-    static TRunEventGuard TryAcquireRunEventGuard(IPollable* pollable, EPollControl control)
+    // TODO(lukyan): Move static functions in Cookie?
+    static void ScheduleEvent(const IPollablePtr& pollable, EPollControl control)
     {
-        auto* cookie = TPollableCookie::FromPollable(pollable);
-        YT_VERIFY(cookie->GetRefCount() > 0);
-
+        // Can safely dereference pollable because even unregistered pollables are hold in Pollables_.
+        auto* cookie = TPollableCookie::FromPollable(pollable.Get());
         if (cookie->AquireControl(ToUnderlying(control))) {
-            return {pollable, control};
+            cookie->Invoker->Invoke(BIND(TRunEventGuard(pollable.Get())));
         }
+    }
 
-        return {};
+    static void DoShutdownPollable(TPollableCookie* cookie, IPollable* pollable)
+    {
+        // Poller guarantees that OnShutdown is never executed concurrently with OnEvent().
+        // Otherwise it will be removed in TRunEventGuard.
+        RunNoExcept([&] {
+            pollable->OnShutdown();
+        });
+
+        cookie->UnregisterPromise.Set();
+        cookie->Invoker.Reset();
+        auto pollerThread = std::move(cookie->PollerThread);
+        pollerThread->UnregisterQueue_.Enqueue(pollable);
+        pollerThread->WakeupHandle_.Raise();
     }
 
     void DoUnregister(const IPollablePtr& pollable)
@@ -415,11 +433,7 @@ private:
 
             YT_VERIFY(pollable->GetRefCount() > 0);
 
-            // Can safely dereference pollable because even unregistered pollables are hold in Pollables_.
-            if (auto guard = TryAcquireRunEventGuard(pollable, control)) {
-                auto* cookie = TPollableCookie::FromPollable(pollable);
-                cookie->Invoker->Invoke(BIND(std::move(guard)));
-            }
+            ScheduleEvent(pollable, control);
         }
     }
 
diff --git a/yt/yt/core/concurrency/unittests/fair_share_invoker_pool_ut.cpp b/yt/yt/core/concurrency/unittests/fair_share_invoker_pool_ut.cpp
index b1effefb292..74ae3386852 100644
--- a/yt/yt/core/concurrency/unittests/fair_share_invoker_pool_ut.cpp
+++ b/yt/yt/core/concurrency/unittests/fair_share_invoker_pool_ut.cpp
@@ -139,7 +139,7 @@ protected:
         return InvocationOrder_.InvokerIndexes_;
     }
 
-    IDiagnosableInvokerPoolPtr CreateInvokerPool(IInvokerPtr underlyingInvoker, int invokerCount)
+    TDiagnosableInvokerPoolPtr CreateInvokerPool(IInvokerPtr underlyingInvoker, int invokerCount)
     {
         auto result = CreateFairShareInvokerPool(
             std::move(underlyingInvoker),
diff --git a/yt/yt/core/concurrency/unittests/invoker_pool_ut.cpp b/yt/yt/core/concurrency/unittests/invoker_pool_ut.cpp
index 8f346ed1638..793d5bd673a 100644
--- a/yt/yt/core/concurrency/unittests/invoker_pool_ut.cpp
+++ b/yt/yt/core/concurrency/unittests/invoker_pool_ut.cpp
@@ -43,7 +43,7 @@ IInvokerPtr CreateIdenticalInvokerByConstReference(const IInvokerPtr& invoker)
 ////////////////////////////////////////////////////////////////////////////////
 
 class TMockInvoker;
-using IMockInvokerPool = IGenericInvokerPool<TMockInvoker>;
+using IMockInvokerPool = TGenericInvokerPool<TMockInvoker>;
 using IMockInvokerPoolPtr = TIntrusivePtr<IMockInvokerPool>;
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/misc/arithmetic_formula.cpp b/yt/yt/core/misc/arithmetic_formula.cpp
index 2134f4970a6..283befb37aa 100644
--- a/yt/yt/core/misc/arithmetic_formula.cpp
+++ b/yt/yt/core/misc/arithmetic_formula.cpp
@@ -891,11 +891,6 @@ bool TBooleanFormulaTags::operator==(const TBooleanFormulaTags& other) const
     return Tags_ == other.Tags_;
 }
 
-bool TBooleanFormulaTags::operator!=(const TBooleanFormulaTags& other) const
-{
-    return !operator==(other);
-}
-
 void Serialize(const TBooleanFormulaTags& tags, NYson::IYsonConsumer* consumer)
 {
     BuildYsonFluently(consumer)
diff --git a/yt/yt/core/misc/arithmetic_formula.h b/yt/yt/core/misc/arithmetic_formula.h
index 09f99767aba..c2eb3cd2e0b 100644
--- a/yt/yt/core/misc/arithmetic_formula.h
+++ b/yt/yt/core/misc/arithmetic_formula.h
@@ -86,7 +86,6 @@ public:
     void Load(TStreamLoadContext& context);
 
     bool operator==(const TBooleanFormulaTags& other) const;
-    bool operator!=(const TBooleanFormulaTags& other) const;
 
 private:
     THashSet<TString> Tags_;
diff --git a/yt/yt/core/misc/error.cpp b/yt/yt/core/misc/error.cpp
index 2740ae34c96..2c3b79db5c1 100644
--- a/yt/yt/core/misc/error.cpp
+++ b/yt/yt/core/misc/error.cpp
@@ -1022,11 +1022,6 @@ bool operator == (const TError& lhs, const TError& rhs)
         lhs.InnerErrors() == rhs.InnerErrors();
 }
 
-bool operator != (const TError& lhs, const TError& rhs)
-{
-    return !(lhs == rhs);
-}
-
 void FormatValue(TStringBuilderBase* builder, const TError& error, TStringBuf /*spec*/)
 {
     AppendError(builder, error, 0);
diff --git a/yt/yt/core/misc/error.h b/yt/yt/core/misc/error.h
index fe1b9284767..0d2b4bd456a 100644
--- a/yt/yt/core/misc/error.h
+++ b/yt/yt/core/misc/error.h
@@ -235,7 +235,6 @@ private:
     void MakeMutable();
 
     friend bool operator == (const TError& lhs, const TError& rhs);
-    friend bool operator != (const TError& lhs, const TError& rhs);
 
     friend void ToProto(NProto::TError* protoError, const TError& error);
     friend void FromProto(TError* error, const NProto::TError& protoError);
@@ -250,7 +249,6 @@ private:
 };
 
 bool operator == (const TError& lhs, const TError& rhs);
-bool operator != (const TError& lhs, const TError& rhs);
 
 void ToProto(NProto::TError* protoError, const TError& error);
 void FromProto(TError* error, const NProto::TError& protoError);
diff --git a/yt/yt/core/misc/hazard_ptr-inl.h b/yt/yt/core/misc/hazard_ptr-inl.h
index 4fe703389e0..ab9ab05a580 100644
--- a/yt/yt/core/misc/hazard_ptr-inl.h
+++ b/yt/yt/core/misc/hazard_ptr-inl.h
@@ -179,18 +179,12 @@ THazardPtr<T>::THazardPtr(T* ptr, std::atomic<void*>* hazardPtr)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class U>
-bool operator==(const THazardPtr<U>& lhs, const U* rhs)
+template <class T>
+bool operator==(const THazardPtr<T>& lhs, const T* rhs)
 {
     return lhs.Get() == rhs;
 }
 
-template <class U>
-bool operator!=(const THazardPtr<U>& lhs, const U* rhs)
-{
-    return lhs.Get() != rhs;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT
diff --git a/yt/yt/core/misc/hazard_ptr.h b/yt/yt/core/misc/hazard_ptr.h
index 431d09c208e..df31004c035 100644
--- a/yt/yt/core/misc/hazard_ptr.h
+++ b/yt/yt/core/misc/hazard_ptr.h
@@ -85,6 +85,11 @@ private:
 
 ////////////////////////////////////////////////////////////////////////////////
 
+template <class T>
+bool operator==(const THazardPtr<T>& lhs, const T* rhs);
+
+////////////////////////////////////////////////////////////////////////////////
+
 } // namespace NYT
 
 #define HAZARD_PTR_INL_H_
diff --git a/yt/yt/core/misc/persistent_queue-inl.h b/yt/yt/core/misc/persistent_queue-inl.h
index f122be2d949..d94ee4948c5 100644
--- a/yt/yt/core/misc/persistent_queue-inl.h
+++ b/yt/yt/core/misc/persistent_queue-inl.h
@@ -44,18 +44,6 @@ const T& TPersistentQueueIterator<T, ChunkSize>::operator*() const
 }
 
 template <class T, size_t ChunkSize>
-bool TPersistentQueueIterator<T, ChunkSize>::operator==(const TPersistentQueueIterator& other) const
-{
-    return CurrentChunk_ == other.CurrentChunk_ && CurrentIndex_ == other.CurrentIndex_;
-}
-
-template <class T, size_t ChunkSize>
-bool TPersistentQueueIterator<T, ChunkSize>::operator!=(const TPersistentQueueIterator& other) const
-{
-    return !(*this == other);
-}
-
-template <class T, size_t ChunkSize>
 TPersistentQueueIterator<T, ChunkSize>::TPersistentQueueIterator(
     TChunkPtr chunk,
     size_t index)
diff --git a/yt/yt/core/misc/persistent_queue.h b/yt/yt/core/misc/persistent_queue.h
index 32329cecf0d..fb78fc37b51 100644
--- a/yt/yt/core/misc/persistent_queue.h
+++ b/yt/yt/core/misc/persistent_queue.h
@@ -41,8 +41,7 @@ public:
 
     const T& operator * () const;
 
-    bool operator == (const TPersistentQueueIterator& other) const;
-    bool operator != (const TPersistentQueueIterator& other) const;
+    bool operator==(const TPersistentQueueIterator& other) const = default;
 
 private:
     using TChunk = TPersistentQueueChunk<T, ChunkSize>;
@@ -55,7 +54,6 @@ private:
 
     TChunkPtr CurrentChunk_;
     size_t CurrentIndex_ = 0;
-
 };
 
 template <class T, size_t ChunkSize>
diff --git a/yt/yt/core/misc/ring_queue.h b/yt/yt/core/misc/ring_queue.h
index e0463e2f45c..471871603ec 100644
--- a/yt/yt/core/misc/ring_queue.h
+++ b/yt/yt/core/misc/ring_queue.h
@@ -59,11 +59,6 @@ public:
             return Ptr_ == other.Ptr_;
         }
 
-        bool operator != (TIterator other) const
-        {
-            return Ptr_ != other.Ptr_;
-        }
-
         TIterator& operator = (TIterator other)
         {
             Ptr_ = other.Ptr_;
diff --git a/yt/yt/core/misc/serialize-inl.h b/yt/yt/core/misc/serialize-inl.h
index 6a0948e0518..cb1eb526bf9 100644
--- a/yt/yt/core/misc/serialize-inl.h
+++ b/yt/yt/core/misc/serialize-inl.h
@@ -10,7 +10,7 @@
 #include <library/cpp/yt/small_containers/compact_flat_map.h>
 #include <library/cpp/yt/small_containers/compact_set.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <optional>
 #include <variant>
@@ -309,16 +309,6 @@ inline constexpr TEntitySerializationKey::TEntitySerializationKey(int index)
     : Index(index)
 { }
 
-inline constexpr bool TEntitySerializationKey::operator == (TEntitySerializationKey rhs) const
-{
-    return Index == rhs.Index;
-}
-
-inline constexpr bool TEntitySerializationKey::operator != (TEntitySerializationKey rhs) const
-{
-    return !(*this == rhs);
-}
-
 inline constexpr TEntitySerializationKey::operator bool() const
 {
     return Index != -1;
@@ -1027,15 +1017,9 @@ public:
             return Index_ == other.Index_;
         }
 
-        bool operator != (const TIteratorWrapper& other) const
-        {
-            return Index_ != other.Index_;
-        }
-
     private:
         const TIterators* const Iterators_;
         size_t Index_;
-
     };
 
     explicit TCollectionSorter(const T& set)
diff --git a/yt/yt/core/misc/serialize.h b/yt/yt/core/misc/serialize.h
index 751b5fcac34..539f980a91a 100644
--- a/yt/yt/core/misc/serialize.h
+++ b/yt/yt/core/misc/serialize.h
@@ -217,8 +217,7 @@ struct TEntitySerializationKey
     constexpr TEntitySerializationKey();
     constexpr explicit TEntitySerializationKey(int index);
 
-    constexpr bool operator == (TEntitySerializationKey rhs) const;
-    constexpr bool operator != (TEntitySerializationKey rhs) const;
+    constexpr bool operator==(const TEntitySerializationKey& other) const = default;
 
     constexpr explicit operator bool() const;
 
diff --git a/yt/yt/core/net/address.cpp b/yt/yt/core/net/address.cpp
index 7dc06ae06e9..756be2a889a 100644
--- a/yt/yt/core/net/address.cpp
+++ b/yt/yt/core/net/address.cpp
@@ -474,11 +474,6 @@ bool operator == (const TNetworkAddress& lhs, const TNetworkAddress& rhs)
     return rawLhs == rawRhs;
 }
 
-bool operator != (const TNetworkAddress& lhs, const TNetworkAddress& rhs)
-{
-    return !(lhs == rhs);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace {
@@ -760,11 +755,6 @@ bool operator == (const TIP6Address& lhs, const TIP6Address& rhs)
     return ::memcmp(lhs.GetRawBytes(), rhs.GetRawBytes(), TIP6Address::ByteSize) == 0;
 }
 
-bool operator != (const TIP6Address& lhs, const TIP6Address& rhs)
-{
-    return !(lhs == rhs);
-}
-
 TIP6Address operator|(const TIP6Address& lhs, const TIP6Address& rhs)
 {
     auto result = lhs;
diff --git a/yt/yt/core/net/address.h b/yt/yt/core/net/address.h
index 6d28a01efdc..b9352f8c3f8 100644
--- a/yt/yt/core/net/address.h
+++ b/yt/yt/core/net/address.h
@@ -96,7 +96,6 @@ struct TNetworkAddressFormatOptions
 TString ToString(const TNetworkAddress& address, const TNetworkAddressFormatOptions& options = {});
 
 bool operator == (const TNetworkAddress& lhs, const TNetworkAddress& rhs);
-bool operator != (const TNetworkAddress& lhs, const TNetworkAddress& rhs);
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -131,7 +130,6 @@ void FormatValue(TStringBuilderBase* builder, const TIP6Address& address, TStrin
 TString ToString(const TIP6Address& address);
 
 bool operator == (const TIP6Address& lhs, const TIP6Address& rhs);
-bool operator != (const TIP6Address& lhs, const TIP6Address& rhs);
 
 TIP6Address operator & (const TIP6Address& lhs, const TIP6Address& rhs);
 TIP6Address operator | (const TIP6Address& lhs, const TIP6Address& rhs);
diff --git a/yt/yt/core/rpc/protocol_version.cpp b/yt/yt/core/rpc/protocol_version.cpp
index 80ef5345474..66610f26870 100644
--- a/yt/yt/core/rpc/protocol_version.cpp
+++ b/yt/yt/core/rpc/protocol_version.cpp
@@ -34,16 +34,6 @@ TProtocolVersion TProtocolVersion::FromString(TStringBuf protocolVersionString)
     return result;
 }
 
-bool operator == (const TProtocolVersion& lhs, const TProtocolVersion& rhs)
-{
-    return (lhs.Major == rhs.Major) && (lhs.Minor == rhs.Minor);
-}
-
-bool operator != (const TProtocolVersion& lhs, const TProtocolVersion& rhs)
-{
-    return !(lhs == rhs);
-}
-
 void FormatValue(TStringBuilderBase* builder, TProtocolVersion version, TStringBuf /*spec*/)
 {
     builder->AppendFormat("%v.%v", version.Major, version.Minor);
diff --git a/yt/yt/core/rpc/protocol_version.h b/yt/yt/core/rpc/protocol_version.h
index 160d17047fb..7d87d49597e 100644
--- a/yt/yt/core/rpc/protocol_version.h
+++ b/yt/yt/core/rpc/protocol_version.h
@@ -13,12 +13,11 @@ struct TProtocolVersion
     int Major;
     int Minor;
 
+    bool operator==(const TProtocolVersion& other) const = default;
+
     static TProtocolVersion FromString(TStringBuf protocolVersionString);
 };
 
-bool operator == (const TProtocolVersion& lhs, const TProtocolVersion& rhs);
-bool operator != (const TProtocolVersion& lhs, const TProtocolVersion& rhs);
-
 void FormatValue(TStringBuilderBase* builder, TProtocolVersion version, TStringBuf spec);
 TString ToString(TProtocolVersion protocolVersion);
 
diff --git a/yt/yt/core/rpc/service.cpp b/yt/yt/core/rpc/service.cpp
index 95749e42d2d..23e76917aa4 100644
--- a/yt/yt/core/rpc/service.cpp
+++ b/yt/yt/core/rpc/service.cpp
@@ -77,16 +77,6 @@ TServiceId::TServiceId(std::string serviceName, TRealmId realmId)
     , RealmId(realmId)
 { }
 
-bool operator == (const TServiceId& lhs, const TServiceId& rhs)
-{
-    return lhs.ServiceName == rhs.ServiceName && lhs.RealmId == rhs.RealmId;
-}
-
-bool operator != (const TServiceId& lhs, const TServiceId& rhs)
-{
-    return !(lhs == rhs);
-}
-
 TString ToString(const TServiceId& serviceId)
 {
     auto result = TString(serviceId.ServiceName);
diff --git a/yt/yt/core/rpc/service.h b/yt/yt/core/rpc/service.h
index 8f5e3164a35..1c2e721730d 100644
--- a/yt/yt/core/rpc/service.h
+++ b/yt/yt/core/rpc/service.h
@@ -277,13 +277,12 @@ struct TServiceId
     TServiceId() = default;
     TServiceId(std::string serviceName, TRealmId realmId = NullRealmId);
 
+    bool operator==(const TServiceId& other) const = default;
+
     std::string ServiceName;
     TRealmId RealmId;
 };
 
-bool operator == (const TServiceId& lhs, const TServiceId& rhs);
-bool operator != (const TServiceId& lhs, const TServiceId& rhs);
-
 TString ToString(const TServiceId& serviceId);
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/rpc/unittests/lib/test_service.h b/yt/yt/core/rpc/unittests/lib/test_service.h
index f03be1a1153..da18cf132d9 100644
--- a/yt/yt/core/rpc/unittests/lib/test_service.h
+++ b/yt/yt/core/rpc/unittests/lib/test_service.h
@@ -52,12 +52,11 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-DECLARE_REFCOUNTED_CLASS(ITestService)
+DECLARE_REFCOUNTED_STRUCT(ITestService)
 
-class ITestService
+struct ITestService
     : public virtual IService
 {
-public:
     virtual TFuture<void> GetSlowCallCanceled() const = 0;
     virtual TFuture<void> GetServerStreamsAborted() const = 0;
 };
diff --git a/yt/yt/core/yson/building_consumer.h b/yt/yt/core/yson/building_consumer.h
index af18416ed4b..f221a43eba3 100644
--- a/yt/yt/core/yson/building_consumer.h
+++ b/yt/yt/core/yson/building_consumer.h
@@ -8,13 +8,11 @@ namespace NYT::NYson {
 
 //! An interface for building an object by parsing a YSON stream.
 template <class T>
-class IBuildingYsonConsumer
+struct IBuildingYsonConsumer
     : public virtual IYsonConsumer
 {
-public:
     //! Finalizes the parsing process and returns the object built by the processed YSON stream.
     virtual T Finish() = 0;
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/yson/pull_parser_deserialize.h b/yt/yt/core/yson/pull_parser_deserialize.h
index 20cd57b68a1..93af8deb784 100644
--- a/yt/yt/core/yson/pull_parser_deserialize.h
+++ b/yt/yt/core/yson/pull_parser_deserialize.h
@@ -4,7 +4,7 @@
 
 #include "pull_parser.h"
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 namespace NYT::NYson {
 
diff --git a/yt/yt/core/ytree/helpers.cpp b/yt/yt/core/ytree/helpers.cpp
index c8c794a22e2..de0d6d21cd5 100644
--- a/yt/yt/core/ytree/helpers.cpp
+++ b/yt/yt/core/ytree/helpers.cpp
@@ -44,11 +44,6 @@ bool operator == (const IAttributeDictionary& lhs, const IAttributeDictionary& r
     return true;
 }
 
-bool operator != (const IAttributeDictionary& lhs, const IAttributeDictionary& rhs)
-{
-    return !(lhs == rhs);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 class TEphemeralAttributeDictionary
diff --git a/yt/yt/core/ytree/helpers.h b/yt/yt/core/ytree/helpers.h
index 3320456f782..cc7c736c514 100644
--- a/yt/yt/core/ytree/helpers.h
+++ b/yt/yt/core/ytree/helpers.h
@@ -16,7 +16,6 @@ namespace NYT::NYTree {
 
 // NB: Pretty slow.
 bool operator == (const IAttributeDictionary& lhs, const IAttributeDictionary& rhs);
-bool operator != (const IAttributeDictionary& lhs, const IAttributeDictionary& rhs);
 
 //! Creates attributes dictionary in memory.
 IAttributeDictionaryPtr CreateEphemeralAttributes(std::optional<int> ysonNestingLevelLimit = std::nullopt);
diff --git a/yt/yt/core/ytree/serialize.h b/yt/yt/core/ytree/serialize.h
index ed58a6f934a..8b73fe812f7 100644
--- a/yt/yt/core/ytree/serialize.h
+++ b/yt/yt/core/ytree/serialize.h
@@ -12,7 +12,7 @@
 
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
-#include <library/cpp/yt/misc/enum_indexed_array.h>
+#include <library/cpp/yt/containers/enum_indexed_array.h>
 
 #include <optional>
 
diff --git a/yt/yt/core/ytree/ypath_resolver.cpp b/yt/yt/core/ytree/ypath_resolver.cpp
index 2ec09b80b2b..de14db04ce1 100644
--- a/yt/yt/core/ytree/ypath_resolver.cpp
+++ b/yt/yt/core/ytree/ypath_resolver.cpp
@@ -34,41 +34,6 @@ DEFINE_ENUM(EExpectedItem,
 
 using TResult = std::variant<bool, i64, ui64, double, TString>;
 
-bool ParseListUntilIndex(TYsonPullParserCursor* cursor, int targetIndex)
-{
-    YT_VERIFY((*cursor)->GetType() == EYsonItemType::BeginList);
-    cursor->Next();
-    int index = 0;
-    while ((*cursor)->GetType() != EYsonItemType::EndList) {
-        if (index == targetIndex) {
-            return true;
-        }
-        ++index;
-        cursor->SkipComplexValue();
-    }
-    return false;
-}
-
-bool ParseMapOrAttributesUntilKey(TYsonPullParserCursor* cursor, TStringBuf key)
-{
-    auto endType = EYsonItemType::EndMap;
-    if ((*cursor)->GetType() != EYsonItemType::BeginMap) {
-        YT_VERIFY((*cursor)->GetType() == EYsonItemType::BeginAttributes);
-        endType = EYsonItemType::EndAttributes;
-    }
-    cursor->Next();
-    while ((*cursor)->GetType() != endType) {
-        YT_VERIFY((*cursor)->GetType() == EYsonItemType::StringValue);
-        if ((*cursor)->UncheckedAsString() == key) {
-            cursor->Next();
-            return true;
-        }
-        cursor->Next();
-        cursor->SkipComplexValue();
-    }
-    return false;
-}
-
 std::optional<TResult> TryParseValue(TYsonPullParserCursor* cursor)
 {
     switch ((*cursor)->GetType()) {
@@ -94,17 +59,6 @@ TResult ParseValue(TYsonPullParserCursor* cursor)
     return std::move(*result);
 }
 
-TString ParseAnyValue(TYsonPullParserCursor* cursor)
-{
-    TStringStream stream;
-    {
-        NYson::TCheckedInDebugYsonTokenWriter writer(&stream);
-        cursor->TransferComplexValue(&writer);
-        writer.Flush();
-    }
-    return std::move(stream.Str());
-}
-
 [[noreturn]] void ThrowUnexpectedToken(const TTokenizer& tokenizer)
 {
     THROW_ERROR_EXCEPTION(
@@ -367,4 +321,52 @@ template std::optional<TString> TryParseValue<TString>(TYsonPullParserCursor* cu
 
 ////////////////////////////////////////////////////////////////////////////////
 
+bool ParseListUntilIndex(TYsonPullParserCursor* cursor, int targetIndex)
+{
+    YT_VERIFY((*cursor)->GetType() == EYsonItemType::BeginList);
+    cursor->Next();
+    int index = 0;
+    while ((*cursor)->GetType() != EYsonItemType::EndList) {
+        if (index == targetIndex) {
+            return true;
+        }
+        ++index;
+        cursor->SkipComplexValue();
+    }
+    return false;
+}
+
+bool ParseMapOrAttributesUntilKey(TYsonPullParserCursor* cursor, TStringBuf key)
+{
+    auto endType = EYsonItemType::EndMap;
+    if ((*cursor)->GetType() != EYsonItemType::BeginMap) {
+        YT_VERIFY((*cursor)->GetType() == EYsonItemType::BeginAttributes);
+        endType = EYsonItemType::EndAttributes;
+    }
+    cursor->Next();
+    while ((*cursor)->GetType() != endType) {
+        YT_VERIFY((*cursor)->GetType() == EYsonItemType::StringValue);
+        if ((*cursor)->UncheckedAsString() == key) {
+            cursor->Next();
+            return true;
+        }
+        cursor->Next();
+        cursor->SkipComplexValue();
+    }
+    return false;
+}
+
+TString ParseAnyValue(TYsonPullParserCursor* cursor)
+{
+    TStringStream stream;
+    {
+        NYson::TCheckedInDebugYsonTokenWriter writer(&stream);
+        cursor->TransferComplexValue(&writer);
+        writer.Flush();
+    }
+    return std::move(stream.Str());
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 } // namespace NYT::NYTree
diff --git a/yt/yt/core/ytree/ypath_resolver.h b/yt/yt/core/ytree/ypath_resolver.h
index 1ad7de315c9..0cf3167c6b6 100644
--- a/yt/yt/core/ytree/ypath_resolver.h
+++ b/yt/yt/core/ytree/ypath_resolver.h
@@ -24,4 +24,10 @@ std::optional<T> TryParseValue(NYson::TYsonPullParserCursor* cursor);
 
 ////////////////////////////////////////////////////////////////////////////////
 
+bool ParseListUntilIndex(NYson::TYsonPullParserCursor* cursor, int targetIndex);
+bool ParseMapOrAttributesUntilKey(NYson::TYsonPullParserCursor* cursor, TStringBuf key);
+TString ParseAnyValue(NYson::TYsonPullParserCursor* cursor);
+
+////////////////////////////////////////////////////////////////////////////////
+
 } // namespace NYT::NYTree
diff --git a/yt/yt/library/named_value/named_value.cpp b/yt/yt/library/named_value/named_value.cpp
index 912d9069e0c..a283e28849c 100644
--- a/yt/yt/library/named_value/named_value.cpp
+++ b/yt/yt/library/named_value/named_value.cpp
@@ -106,21 +106,11 @@ bool operator ==(const TNamedValue::TAny& lhs, const TNamedValue::TAny& rhs)
     return lhs.Value == rhs.Value;
 }
 
-bool operator !=(const TNamedValue::TAny& lhs, const TNamedValue::TAny& rhs)
-{
-    return !(lhs == rhs);
-}
-
 bool operator ==(const TNamedValue::TComposite& lhs, const TNamedValue::TComposite& rhs)
 {
     return lhs.Value == rhs.Value;
 }
 
-bool operator !=(const TNamedValue::TComposite& lhs, const TNamedValue::TComposite& rhs)
-{
-    return !(lhs.Value == rhs.Value);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT
diff --git a/yt/yt/library/named_value/named_value.h b/yt/yt/library/named_value/named_value.h
index 9ac205c7021..3a763465892 100644
--- a/yt/yt/library/named_value/named_value.h
+++ b/yt/yt/library/named_value/named_value.h
@@ -93,10 +93,7 @@ private:
 ////////////////////////////////////////////////////////////////////////////////
 
 bool operator ==(const TNamedValue::TAny& lhs, const TNamedValue::TAny& rhs);
-bool operator !=(const TNamedValue::TAny& lhs, const TNamedValue::TAny& rhs);
-
 bool operator ==(const TNamedValue::TComposite& lhs, const TNamedValue::TComposite& rhs);
-bool operator !=(const TNamedValue::TComposite& lhs, const TNamedValue::TComposite& rhs);
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/yt/yt/library/numeric/double_array.h b/yt/yt/library/numeric/double_array.h
index 14168517074..f618e682778 100644
--- a/yt/yt/library/numeric/double_array.h
+++ b/yt/yt/library/numeric/double_array.h
@@ -311,12 +311,6 @@ constexpr bool operator==(const TDerived& lhs, const TDerived& rhs)
 }
 
 template <class TDerived, class = std::enable_if_t<IsDoubleArray<TDerived>>>
-constexpr bool operator!=(const TDerived& lhs, const TDerived& rhs)
-{
-    return !(lhs == rhs);
-}
-
-template <class TDerived, class = std::enable_if_t<IsDoubleArray<TDerived>>>
 constexpr TDerived operator+(const TDerived& lhs, const TDerived& rhs)
 {
     return TDerived::Apply(lhs, rhs, [](auto x, auto y) { return x + y; });
diff --git a/yt/yt/library/profiling/histogram_snapshot.cpp b/yt/yt/library/profiling/histogram_snapshot.cpp
index 0deb9afa8c2..cb04374b91c 100644
--- a/yt/yt/library/profiling/histogram_snapshot.cpp
+++ b/yt/yt/library/profiling/histogram_snapshot.cpp
@@ -105,11 +105,6 @@ bool THistogramSnapshot::operator == (const THistogramSnapshot& other) const
     return Values == other.Values && Bounds == other.Bounds;
 }
 
-bool THistogramSnapshot::operator != (const THistogramSnapshot& other) const
-{
-    return !(*this == other);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT::NProfiling
diff --git a/yt/yt/library/profiling/histogram_snapshot.h b/yt/yt/library/profiling/histogram_snapshot.h
index 782215da14b..8fd02969426 100644
--- a/yt/yt/library/profiling/histogram_snapshot.h
+++ b/yt/yt/library/profiling/histogram_snapshot.h
@@ -17,7 +17,6 @@ struct THistogramSnapshot
     THistogramSnapshot& operator += (const THistogramSnapshot& other);
 
     bool operator == (const THistogramSnapshot& other) const;
-    bool operator != (const THistogramSnapshot& other) const;
     bool IsEmpty() const;
 };
 
diff --git a/yt/yt/library/profiling/summary-inl.h b/yt/yt/library/profiling/summary-inl.h
index 1402f1ff479..93691613e59 100644
--- a/yt/yt/library/profiling/summary-inl.h
+++ b/yt/yt/library/profiling/summary-inl.h
@@ -58,22 +58,6 @@ TSummarySnapshot<T>& TSummarySnapshot<T>::operator += (const TSummarySnapshot<T>
 }
 
 template <class T>
-bool TSummarySnapshot<T>::operator == (const TSummarySnapshot<T>& other) const
-{
-    return Sum_ == other.Sum_ &&
-        Min_ == other.Min_ &&
-        Max_ == other.Max_ &&
-        Last_ == other.Last_ &&
-        Count_ == other.Count_;
-}
-
-template <class T>
-bool TSummarySnapshot<T>::operator != (const TSummarySnapshot<T>& other) const
-{
-    return !(*this == other);
-}
-
-template <class T>
 T TSummarySnapshot<T>::Sum() const
 {
     return Sum_;
diff --git a/yt/yt/library/profiling/summary.h b/yt/yt/library/profiling/summary.h
index 29768d1e2b0..13fcee1b4a1 100644
--- a/yt/yt/library/profiling/summary.h
+++ b/yt/yt/library/profiling/summary.h
@@ -17,8 +17,7 @@ public:
     TSummarySnapshot() = default;
     TSummarySnapshot(T sum, T min, T max, T last, i64 count);
 
-    bool operator == (const TSummarySnapshot& other) const;
-    bool operator != (const TSummarySnapshot& other) const;
+    bool operator == (const TSummarySnapshot& other) const = default;
 
     T Sum() const;
     T Min() const;
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index 9cab02e7278..3782b5e9fb8 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -590,6 +590,7 @@ message TReqSelectRows
     optional bool new_range_inference = 19;
     optional bool use_canonical_null_relations = 20;
     optional bool merge_versioned_rows = 21;
+    optional int32 syntax_version = 22 [default = 1];
 
     optional TSuppressableAccessTrackingOptions suppressable_access_tracking_options = 104;
 }
@@ -733,6 +734,7 @@ message TReqExplainQuery
     optional string udf_registry_path = 10;
     optional string execution_pool = 11;
     optional bool new_range_inference = 12;
+    optional int32 syntax_version = 13;
 }
 
 message TRspExplainQuery